You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/10/28 21:40:15 UTC
[01/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates. [Forced Update!]
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEM-983 4b80441bc -> eb6ab1aaf (forced update)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java b/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java
index 17105b1..ad0f516 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java
@@ -1,18 +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
+ * 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;
@@ -29,22 +27,26 @@ public class EntryNotFoundInRegion extends GemFireException {
/**
* Generates an {@link InternalGemFireError}
+ *
* @param msg the detail message
* @deprecated Do not create instances of this class.
*/
@Deprecated
public EntryNotFoundInRegion(String msg) {
- throw new InternalGemFireError(LocalizedStrings.EntryNotFoundInRegion_THIS_CLASS_IS_DEPRECATED.toLocalizedString());
+ throw new InternalGemFireError(
+ LocalizedStrings.EntryNotFoundInRegion_THIS_CLASS_IS_DEPRECATED.toLocalizedString());
}
/**
* Generates an {@link InternalGemFireError}
+ *
* @param msg the detail message
* @param cause the causal Throwable
* @deprecated do not create instances of this class.
*/
@Deprecated
public EntryNotFoundInRegion(String msg, Throwable cause) {
- throw new InternalGemFireError(LocalizedStrings.EntryNotFoundInRegion_THIS_CLASS_IS_DEPRECATED.toLocalizedString());
+ throw new InternalGemFireError(
+ LocalizedStrings.EntryNotFoundInRegion_THIS_CLASS_IS_DEPRECATED.toLocalizedString());
}
}
[73/98] [abbrv] incubator-geode git commit: GEODE-2023: update paths
to Lucene docs
Posted by ds...@apache.org.
GEODE-2023: update paths to Lucene docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/af6a18c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/af6a18c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/af6a18c0
Branch: refs/heads/feature/GEM-983
Commit: af6a18c032320814ed980c790f048a6377a4a9c5
Parents: b0d1205
Author: Dave Barnes <db...@pivotal.io>
Authored: Tue Oct 25 10:19:40 2016 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Tue Oct 25 10:19:40 2016 -0700
----------------------------------------------------------------------
geode-book/master_middleman/source/subnavs/geode-subnav.erb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af6a18c0/geode-book/master_middleman/source/subnavs/geode-subnav.erb
----------------------------------------------------------------------
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index d0eb74e..0f1292c 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -2344,16 +2344,16 @@ limitations under the License.
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/tools_modules/lucene_integration.html">Apache Lucene Integration</a>
+ <a href="/docs/guide/tools_modules/lucene_integration.html">Apache Lucene Integration</a>
<ul>
<li>
- <a href="/docs/tools_modules/lucene_integration.html#using-the-apache-lucene-integration">Using the Apache Lucene Integration</a>
+ <a href="/docs/guide/tools_modules/lucene_integration.html#using-the-apache-lucene-integration">Using the Apache Lucene Integration</a>
</li>
<li>
- <a href="/docs/tools_modules/lucene_integration.html#java-api-example">Java API Example</a>
+ <a href="/docs/guide/tools_modules/lucene_integration.html#java-api-example">Java API Example</a>
</li>
<li>
- <a href="/docs/tools_modules/lucene_integration.html#gfsh-api">Gfsh API</a>
+ <a href="/docs/guide/tools_modules/lucene_integration.html#gfsh-api">Gfsh API</a>
</li>
</ul>
</li>
[39/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
index 801c5a7..263e6c7 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -22,6 +20,7 @@ import org.apache.geode.internal.lang.ObjectUtils;
/**
* The Customer class models a customer entity.
* <p/>
+ *
* @since GemFire 8.0
*/
@@ -31,8 +30,7 @@ public class Customer implements Serializable {
private String firstName;
private String lastName;
- public Customer() {
- }
+ public Customer() {}
public Customer(final Long custId) {
this.customerId = custId;
@@ -81,8 +79,8 @@ public class Customer implements Serializable {
final Customer that = (Customer) obj;
return (ObjectUtils.equals(this.getCustomerId(), that.getCustomerId())
- && ObjectUtils.equals(this.getLastName(), that.getLastName()) && ObjectUtils
- .equals(this.getFirstName(), that.getFirstName()));
+ && ObjectUtils.equals(this.getLastName(), that.getLastName())
+ && ObjectUtils.equals(this.getFirstName(), that.getFirstName()));
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
index 1467821..2701608 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
index 774d83c..4c92aae 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Gender.java
@@ -1,29 +1,27 @@
/*
- * 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
+ * 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.rest.internal.web.controllers;
/**
* The Gender enum is a enumeration of genders (sexes).
* <p/>
+ *
* @since GemFire 8.0
*/
@SuppressWarnings("unused")
public enum Gender {
- FEMALE,
- MALE
+ FEMALE, MALE
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
index c047f12..082f69d 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetAllEntries.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -25,6 +23,7 @@ import org.apache.geode.cache.execute.FunctionContext;
/**
* The GetAllEntries is function that will return a map as a result of its execution.
* <p/>
+ *
* @since GemFire 8.0
*/
@@ -38,8 +37,8 @@ public class GetAllEntries implements Function {
myMap.put("k13", "v3");
myMap.put("k14", "v4");
myMap.put("k15", "v5");
-
- //return map as a function result
+
+ // return map as a function result
context.getResultSender().lastResult(myMap);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
index e224777..a09d7fe 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetDeliveredOrders.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -33,14 +31,15 @@ import org.apache.geode.cache.query.TypeMismatchException;
/**
-* The GetDeliveredOrders class is a gemfire function that gives details about delivered orders.
-* <p/>
-* @since GemFire 8.0
-*/
+ * The GetDeliveredOrders class is a gemfire function that gives details about delivered orders.
+ * <p/>
+ *
+ * @since GemFire 8.0
+ */
-public class GetDeliveredOrders implements Function {
+public class GetDeliveredOrders implements Function {
public void execute(FunctionContext context) {
-
+
Cache c = null;
ArrayList<Object> vals = new ArrayList<Object>();
try {
@@ -49,37 +48,46 @@ public class GetDeliveredOrders implements Function {
vals.add("NoCacheFoundResult");
context.getResultSender().lastResult(vals);
}
-
- String oql = "SELECT o.purchaseOrderNo, o.deliveryDate FROM /orders o WHERE o.deliveryDate != NULL";
+
+ String oql =
+ "SELECT o.purchaseOrderNo, o.deliveryDate FROM /orders o WHERE o.deliveryDate != NULL";
final Query query = c.getQueryService().newQuery(oql);
-
+
SelectResults result = null;
try {
result = (SelectResults) query.execute();
int resultSize = result.size();
-
- if(result instanceof Collection<?>)
- for(Object item : result){
+
+ if (result instanceof Collection<?>)
+ for (Object item : result) {
vals.add(item);
}
} catch (FunctionDomainException e) {
- if(c != null)
- c.getLogger().info("Caught FunctionDomainException while executing function GetDeliveredOrders: " + e.getMessage());
-
+ if (c != null)
+ c.getLogger()
+ .info("Caught FunctionDomainException while executing function GetDeliveredOrders: "
+ + e.getMessage());
+
} catch (TypeMismatchException e) {
- if(c != null)
- c.getLogger().info("Caught TypeMismatchException while executing function GetDeliveredOrders: " + e.getMessage());
-
+ if (c != null)
+ c.getLogger()
+ .info("Caught TypeMismatchException while executing function GetDeliveredOrders: "
+ + e.getMessage());
+
} catch (NameResolutionException e) {
- if(c != null)
- c.getLogger().info("Caught NameResolutionException while executing function GetDeliveredOrders: " + e.getMessage());
-
+ if (c != null)
+ c.getLogger()
+ .info("Caught NameResolutionException while executing function GetDeliveredOrders: "
+ + e.getMessage());
+
} catch (QueryInvocationTargetException e) {
- if(c != null)
- c.getLogger().info("Caught QueryInvocationTargetException while executing function GetDeliveredOrders: " + e.getMessage());
-
+ if (c != null)
+ c.getLogger().info(
+ "Caught QueryInvocationTargetException while executing function GetDeliveredOrders: "
+ + e.getMessage());
+
}
-
+
context.getResultSender().lastResult(vals);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
index 9e261a7..be3e90b 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetRegions.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -27,17 +25,18 @@ import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
/**
-* The GetRegions class is an gemfire function that gives data about available regions.
-* <p/>
-* @since GemFire 8.0
-*/
+ * The GetRegions class is an gemfire function that gives data about available regions.
+ * <p/>
+ *
+ * @since GemFire 8.0
+ */
-public class GetRegions implements Function {
+public class GetRegions implements Function {
public void execute(FunctionContext context) {
-
+
ArrayList<String> vals = new ArrayList<String>();
-
+
Cache c = null;
try {
c = CacheFactory.getAnyInstance();
@@ -50,7 +49,7 @@ public class GetRegions implements Function {
for (Region<?, ?> r : regionSet) {
vals.add(r.getName());
}
-
+
context.getResultSender().lastResult(vals);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
index eb461fb..a8c2f08 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/GetValueForKey.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -24,38 +22,38 @@ import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
public class GetValueForKey implements Function {
-
+
@Override
- public void execute(FunctionContext context) {
+ public void execute(FunctionContext context) {
Object args = context.getArguments();
-
+
Cache cache = null;
-
- try{
+
+ try {
cache = CacheFactory.getAnyInstance();
-
- if(args.toString().equalsIgnoreCase("1") ){
+
+ if (args.toString().equalsIgnoreCase("1")) {
Region<String, Object> r = cache.getRegion("Products");
Object result = r.get("1");
context.getResultSender().lastResult(result);
-
- }else if(args.toString().equalsIgnoreCase("2")){
+
+ } else if (args.toString().equalsIgnoreCase("2")) {
Region<String, Object> r = cache.getRegion("People");
Object result = r.get("2");
- context.getResultSender().lastResult(result);
- }else{
- //Default case
- int i=10;
+ context.getResultSender().lastResult(result);
+ } else {
+ // Default case
+ int i = 10;
context.getResultSender().lastResult(i);
}
- }catch(CacheClosedException e){
+ } catch (CacheClosedException e) {
context.getResultSender().lastResult("Error: CacheClosedException");
}
-
+
}
@Override
- public String getId() {
+ public String getId() {
return "GetValueForKey";
}
@@ -72,6 +70,6 @@ public class GetValueForKey implements Function {
@Override
public boolean isHA() {
return false;
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
index e8d4f01..9a5d070 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Item.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -26,6 +24,7 @@ import org.apache.geode.pdx.PdxWriter;
/**
* The Item class models item entity in the real world.
* <p/>
+ *
* @since GemFire 8.0
*/
@@ -86,14 +85,15 @@ public class Item implements PdxSerializable {
this.itemNo = itemNumber;
}
- public Item(final Long itemNumber, final String desc, final int qty, final float uprice, final float tprice) {
+ public Item(final Long itemNumber, final String desc, final int qty, final float uprice,
+ final float tprice) {
this.itemNo = itemNumber;
this.description = desc;
this.quantity = qty;
this.unitPrice = uprice;
this.totalPrice = tprice;
}
-
+
@Override
public boolean equals(final Object obj) {
if (obj == this) {
@@ -153,7 +153,7 @@ public class Item implements PdxSerializable {
quantity = reader.readInt("quantity");
unitPrice = reader.readFloat("unitPrice");
totalPrice = reader.readFloat("totalPrice");
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
index bcf5c3b..708b0b3 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Order.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -26,13 +24,14 @@ import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxWriter;
/**
-* The Order class is an abstraction modeling a order.
-* <p/>
-* @since GemFire 8.0
-*/
+ * The Order class is an abstraction modeling a order.
+ * <p/>
+ *
+ * @since GemFire 8.0
+ */
public class Order implements PdxSerializable {
-
+
private Long purchaseOrderNo;
private Long customerId;
private String description;
@@ -41,8 +40,8 @@ public class Order implements PdxSerializable {
private String contact;
private String email;
private String phone;
- private List<Item> items;
- private double totalPrice;
+ private List<Item> items;
+ private double totalPrice;
public Order() {
items = new ArrayList<Item>();
@@ -52,9 +51,9 @@ public class Order implements PdxSerializable {
this.purchaseOrderNo = orderNo;
}
- public Order(final Long orderNo, final Long custId, final String desc,
- final Date odate, final Date ddate, final String contact, final String email,
- final String phone, final List<Item> items, final double tprice) {
+ public Order(final Long orderNo, final Long custId, final String desc, final Date odate,
+ final Date ddate, final String contact, final String email, final String phone,
+ final List<Item> items, final double tprice) {
this.purchaseOrderNo = orderNo;
this.customerId = custId;
this.description = desc;
@@ -131,11 +130,11 @@ public class Order implements PdxSerializable {
public List<Item> getItems() {
return items;
}
-
+
public void setItems(List<Item> items) {
- if(this.items == null)
+ if (this.items == null)
this.items = new ArrayList<Item>();
-
+
for (Item it : items)
this.items.add(it);
}
@@ -180,9 +179,9 @@ public class Order implements PdxSerializable {
contact = reader.readString("contact");
email = reader.readString("email");
phone = reader.readString("phone");
- items = (List<Item>)reader.readObject("items");
+ items = (List<Item>) reader.readObject("items");
totalPrice = reader.readDouble("totalPrice");
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
index b995ec2..be465f9 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Person.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -25,39 +23,39 @@ import org.apache.geode.pdx.PdxWriter;
import java.io.Serializable;
/**
-* The Person class is an abstraction modeling a person.
-* <p/>
-* @since GemFire 8.0
-*/
+ * The Person class is an abstraction modeling a person.
+ * <p/>
+ *
+ * @since GemFire 8.0
+ */
@SuppressWarnings("unused")
public class Person implements PdxSerializable {
private static final long serialVersionUID = 42108163264l;
-
+
protected static final String DOB_FORMAT_PATTERN = "MM/dd/yyyy";
-
- private Long id;
-
+
+ private Long id;
+
private Date birthDate;
-
+
private Gender gender;
-
+
private String firstName;
private String middleName;
private String lastName;
-
- public Person() {
- }
-
+
+ public Person() {}
+
public Person(final Long id) {
this.id = id;
}
-
+
public Person(final String firstName, final String lastName) {
this.firstName = firstName;
this.lastName = lastName;
}
-
+
public Person(Long id, String fn, String mn, String ln, Date bDate, Gender g) {
this.id = id;
this.firstName = fn;
@@ -66,73 +64,73 @@ public class Person implements PdxSerializable {
this.birthDate = bDate;
this.gender = g;
}
-
+
public Long getId() {
return id;
}
-
+
public void setId(final Long id) {
this.id = id;
}
-
+
public String getFirstName() {
return firstName;
}
-
+
public void setFirstName(final String firstName) {
this.firstName = firstName;
}
-
+
public String getLastName() {
return lastName;
}
-
+
public void setLastName(final String lastName) {
this.lastName = lastName;
}
-
+
public String getMiddleName() {
return middleName;
}
-
+
public void setMiddleName(final String middleName) {
this.middleName = middleName;
}
-
+
public Date getBirthDate() {
return birthDate;
}
-
+
public void setBirthDate(final Date birthDate) {
this.birthDate = birthDate;
}
-
+
public Gender getGender() {
return gender;
}
-
+
public void setGender(final Gender gender) {
this.gender = gender;
}
-
+
@Override
public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
-
+
if (!(obj instanceof Person)) {
return false;
}
-
+
final Person that = (Person) obj;
-
+
return (ObjectUtils.equals(this.getId(), that.getId())
- || (ObjectUtils.equals(this.getBirthDate(), that.getBirthDate())
- && ObjectUtils.equals(this.getLastName(), that.getLastName())
- && ObjectUtils.equals(this.getFirstName(), that.getFirstName())));
+ || (ObjectUtils.equals(this.getBirthDate(), that.getBirthDate())
+ && ObjectUtils.equals(this.getLastName(), that.getLastName())
+ && ObjectUtils.equals(this.getFirstName(), that.getFirstName())));
}
-
+
@Override
public int hashCode() {
int hashValue = 17;
@@ -142,7 +140,7 @@ public class Person implements PdxSerializable {
hashValue = 37 * hashValue + ObjectUtils.hashCode(getFirstName());
return hashValue;
}
-
+
@Override
public String toString() {
final StringBuilder buffer = new StringBuilder("{ type = ");
@@ -151,12 +149,13 @@ public class Person implements PdxSerializable {
buffer.append(", firstName = ").append(getFirstName());
buffer.append(", middleName = ").append(getMiddleName());
buffer.append(", lastName = ").append(getLastName());
- buffer.append(", birthDate = ").append(DateTimeUtils.format(getBirthDate(), DOB_FORMAT_PATTERN));
+ buffer.append(", birthDate = ")
+ .append(DateTimeUtils.format(getBirthDate(), DOB_FORMAT_PATTERN));
buffer.append(", gender = ").append(getGender());
buffer.append(" }");
return buffer.toString();
}
-
+
@Override
public void toData(PdxWriter writer) {
writer.writeString("@type", getClass().getName());
@@ -166,9 +165,9 @@ public class Person implements PdxSerializable {
writer.writeString("lastName", lastName);
writer.writeObject("gender", gender);
writer.writeDate("birthDate", birthDate);
-
+
}
-
+
@Override
public void fromData(PdxReader reader) {
String type = reader.readString("@type");
@@ -176,9 +175,9 @@ public class Person implements PdxSerializable {
firstName = reader.readString("firstName");
middleName = reader.readString("middleName");
lastName = reader.readString("lastName");
- gender = (Gender)reader.readObject("gender");
+ gender = (Gender) reader.readObject("gender");
birthDate = reader.readDate("birthDate");
-
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
index ab0f7d0..0275961 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/PutKeyFunction.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -25,8 +23,7 @@ import org.apache.geode.cache.execute.RegionFunctionContext;
/**
- * Function that puts the value from the argument at the key passed in through
- * the filter.
+ * Function that puts the value from the argument at the key passed in through the filter.
*/
public class PutKeyFunction implements Function {
@@ -34,7 +31,7 @@ public class PutKeyFunction implements Function {
private static final String ID = "PutKeyFunction";
public void execute(FunctionContext context) {
- RegionFunctionContext regionContext = (RegionFunctionContext)context;
+ RegionFunctionContext regionContext = (RegionFunctionContext) context;
Region dataSet = regionContext.getDataSet();
Object key = regionContext.getFilter().iterator().next();
Object value = regionContext.getArguments();
@@ -50,12 +47,12 @@ public class PutKeyFunction implements Function {
return true;
}
- public void init(Properties p) {
- }
+ public void init(Properties p) {}
public boolean optimizeForWrite() {
return true;
}
+
public boolean isHA() {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
index b45b683..5cae692 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIOnRegionFunctionExecutionDUnitTest.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -57,6 +55,7 @@ import org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
/**
* Dunit Test to validate OnRegion function execution with REST APIs
+ *
* @since GemFire 8.0
*/
@@ -86,7 +85,8 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setDataPolicy(policy);
- Region region = CacheFactory.getAnyInstance().createRegion(REPLICATE_REGION_NAME, factory.create());
+ Region region =
+ CacheFactory.getAnyInstance().createRegion(REPLICATE_REGION_NAME, factory.create());
org.apache.geode.test.dunit.LogWriterUtils.getLogWriter().info("Region Created :" + region);
assertNotNull(region);
}
@@ -106,7 +106,8 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
}
private void populatePRRegion() {
- PartitionedRegion pr = (PartitionedRegion) CacheFactory.getAnyInstance().getRegion(PR_REGION_NAME);
+ PartitionedRegion pr =
+ (PartitionedRegion) CacheFactory.getAnyInstance().getRegion(PR_REGION_NAME);
DistributedSystem.setThreadsSocketPolicy(false);
for (int i = (pr.getTotalNumberOfBuckets() * 3); i > 0; i--) {
@@ -139,19 +140,23 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
}
private void createCacheAndRegisterFunction() {
- restURLs.add(vm0.invoke("createCacheWithGroups", () -> createCacheWithGroups(vm0.getHost()
- .getHostName(), null, urlContext)));
- restURLs.add(vm1.invoke("createCacheWithGroups", () -> createCacheWithGroups(vm1.getHost()
- .getHostName(), null, urlContext)));
- restURLs.add(vm2.invoke("createCacheWithGroups", () -> createCacheWithGroups(vm2.getHost()
- .getHostName(), null, urlContext)));
- restURLs.add(vm3.invoke("createCacheWithGroups", () -> createCacheWithGroups(vm3.getHost()
- .getHostName(), null, urlContext)));
-
- vm0.invoke("registerFunction(new SampleFunction())", () -> FunctionService.registerFunction(new SampleFunction()));
- vm1.invoke("registerFunction(new SampleFunction())", () -> FunctionService.registerFunction(new SampleFunction()));
- vm2.invoke("registerFunction(new SampleFunction())", () -> FunctionService.registerFunction(new SampleFunction()));
- vm3.invoke("registerFunction(new SampleFunction())", () -> FunctionService.registerFunction(new SampleFunction()));
+ restURLs.add(vm0.invoke("createCacheWithGroups",
+ () -> createCacheWithGroups(vm0.getHost().getHostName(), null, urlContext)));
+ restURLs.add(vm1.invoke("createCacheWithGroups",
+ () -> createCacheWithGroups(vm1.getHost().getHostName(), null, urlContext)));
+ restURLs.add(vm2.invoke("createCacheWithGroups",
+ () -> createCacheWithGroups(vm2.getHost().getHostName(), null, urlContext)));
+ restURLs.add(vm3.invoke("createCacheWithGroups",
+ () -> createCacheWithGroups(vm3.getHost().getHostName(), null, urlContext)));
+
+ vm0.invoke("registerFunction(new SampleFunction())",
+ () -> FunctionService.registerFunction(new SampleFunction()));
+ vm1.invoke("registerFunction(new SampleFunction())",
+ () -> FunctionService.registerFunction(new SampleFunction()));
+ vm2.invoke("registerFunction(new SampleFunction())",
+ () -> FunctionService.registerFunction(new SampleFunction()));
+ vm3.invoke("registerFunction(new SampleFunction())",
+ () -> FunctionService.registerFunction(new SampleFunction()));
}
@Test
@@ -165,7 +170,8 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
vm3.invoke("populateRRRegion", () -> populateRRRegion());
- CloseableHttpResponse response = executeFunctionThroughRestCall("SampleFunction", REPLICATE_REGION_NAME, null, null, null, null);
+ CloseableHttpResponse response = executeFunctionThroughRestCall("SampleFunction",
+ REPLICATE_REGION_NAME, null, null, null, null);
assertEquals(200, response.getStatusLine().getStatusCode());
assertNotNull(response.getEntity());
@@ -183,7 +189,8 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
vm3.invoke("populatePRRegion", () -> populatePRRegion());
- CloseableHttpResponse response = executeFunctionThroughRestCall("SampleFunction", PR_REGION_NAME, null, null, null, null);
+ CloseableHttpResponse response =
+ executeFunctionThroughRestCall("SampleFunction", PR_REGION_NAME, null, null, null, null);
assertEquals(200, response.getStatusLine().getStatusCode());
assertNotNull(response.getEntity());
@@ -200,7 +207,8 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
vm3.invoke("populatePRRegion", () -> populatePRRegion());
- CloseableHttpResponse response = executeFunctionThroughRestCall("SampleFunction", PR_REGION_NAME, "key2", null, null, null);
+ CloseableHttpResponse response =
+ executeFunctionThroughRestCall("SampleFunction", PR_REGION_NAME, "key2", null, null, null);
assertEquals(200, response.getStatusLine().getStatusCode());
assertNotNull(response.getEntity());
@@ -223,20 +231,28 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
vm3.invoke("populatePRRegion", () -> populatePRRegion());
- String jsonBody = "[" + "{\"@type\": \"double\",\"@value\": 210}" + ",{\"@type\":\"org.apache.geode.rest.internal.web.controllers.Item\"," + "\"itemNo\":\"599\",\"description\":\"Part X Free on Bumper Offer\"," + "\"quantity\":\"2\"," + "\"unitprice\":\"5\"," + "\"totalprice\":\"10.00\"}" + "]";
+ String jsonBody = "[" + "{\"@type\": \"double\",\"@value\": 210}"
+ + ",{\"@type\":\"org.apache.geode.rest.internal.web.controllers.Item\","
+ + "\"itemNo\":\"599\",\"description\":\"Part X Free on Bumper Offer\","
+ + "\"quantity\":\"2\"," + "\"unitprice\":\"5\"," + "\"totalprice\":\"10.00\"}" + "]";
- CloseableHttpResponse response = executeFunctionThroughRestCall("SampleFunction", PR_REGION_NAME, null, jsonBody, null, null);
+ CloseableHttpResponse response = executeFunctionThroughRestCall("SampleFunction",
+ PR_REGION_NAME, null, jsonBody, null, null);
assertEquals(200, response.getStatusLine().getStatusCode());
assertNotNull(response.getEntity());
// Assert that only 1 node has executed the function.
assertCorrectInvocationCount(4, vm0, vm1, vm2, vm3);
- jsonBody = "[" + "{\"@type\": \"double\",\"@value\": 220}" + ",{\"@type\":\"org.apache.geode.rest.internal.web.controllers.Item\"," + "\"itemNo\":\"609\",\"description\":\"Part X Free on Bumper Offer\"," + "\"quantity\":\"3\"," + "\"unitprice\":\"9\"," + "\"totalprice\":\"12.00\"}" + "]";
+ jsonBody = "[" + "{\"@type\": \"double\",\"@value\": 220}"
+ + ",{\"@type\":\"org.apache.geode.rest.internal.web.controllers.Item\","
+ + "\"itemNo\":\"609\",\"description\":\"Part X Free on Bumper Offer\","
+ + "\"quantity\":\"3\"," + "\"unitprice\":\"9\"," + "\"totalprice\":\"12.00\"}" + "]";
resetInvocationCounts(vm0, vm1, vm2, vm3);
- response = executeFunctionThroughRestCall("SampleFunction", PR_REGION_NAME, "key2", jsonBody, null, null);
+ response = executeFunctionThroughRestCall("SampleFunction", PR_REGION_NAME, "key2", jsonBody,
+ null, null);
assertEquals(200, response.getStatusLine().getStatusCode());
assertNotNull(response.getEntity());
@@ -255,19 +271,16 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
invocationCount++;
if (context instanceof RegionFunctionContext) {
RegionFunctionContext rfContext = (RegionFunctionContext) context;
- rfContext.getDataSet()
- .getCache()
- .getLogger()
- .info("Executing function : SampleFunction.execute(hasResult=true) with filter: " + rfContext.getFilter() + " " + rfContext);
+ rfContext.getDataSet().getCache().getLogger()
+ .info("Executing function : SampleFunction.execute(hasResult=true) with filter: "
+ + rfContext.getFilter() + " " + rfContext);
if (rfContext.getArguments() instanceof Boolean) {
/* return rfContext.getArguments(); */
if (hasResult()) {
rfContext.getResultSender().lastResult((Serializable) rfContext.getArguments());
} else {
- rfContext.getDataSet()
- .getCache()
- .getLogger()
- .info("Executing function : SampleFunction.execute(hasResult=false) " + rfContext);
+ rfContext.getDataSet().getCache().getLogger()
+ .info("Executing function : SampleFunction.execute(hasResult=false) " + rfContext);
while (!rfContext.getDataSet().isDestroyed()) {
rfContext.getDataSet().getCache().getLogger().info("For Bug43513 ");
try {
@@ -285,17 +298,17 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
- rfContext.getDataSet().getCache().getLogger().warning("Got Exception : Thread Interrupted" + e);
+ rfContext.getDataSet().getCache().getLogger()
+ .warning("Got Exception : Thread Interrupted" + e);
}
}
if (PartitionRegionHelper.isPartitionedRegion(rfContext.getDataSet())) {
/*
- * return
- * (Serializable)PartitionRegionHelper.getLocalDataForContext(
+ * return (Serializable)PartitionRegionHelper.getLocalDataForContext(
* rfContext).get(key);
*/
- rfContext.getResultSender()
- .lastResult((Serializable) PartitionRegionHelper.getLocalDataForContext(rfContext).get(key));
+ rfContext.getResultSender().lastResult(
+ (Serializable) PartitionRegionHelper.getLocalDataForContext(rfContext).get(key));
} else {
rfContext.getResultSender().lastResult((Serializable) rfContext.getDataSet().get(key));
}
@@ -313,7 +326,7 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
/* return vals; */
} else if (rfContext.getArguments() instanceof HashMap) {
HashMap putData = (HashMap) rfContext.getArguments();
- for (Iterator i = putData.entrySet().iterator(); i.hasNext(); ) {
+ for (Iterator i = putData.entrySet().iterator(); i.hasNext();) {
Map.Entry me = (Map.Entry) i.next();
rfContext.getDataSet().put(me.getKey(), me.getValue());
}
@@ -327,7 +340,8 @@ public class RestAPIOnRegionFunctionExecutionDUnitTest extends RestAPITestBase {
} else {
DistributedSystem ds = InternalDistributedSystem.getAnyInstance();
LogWriter logger = ds.getLogWriter();
- logger.info("Executing in SampleFunction on Server : " + ds.getDistributedMember() + "with Context : " + context);
+ logger.info("Executing in SampleFunction on Server : " + ds.getDistributedMember()
+ + "with Context : " + context);
while (ds.isConnected()) {
logger.fine("Just executing function in infinite loop for Bug43513");
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
index d35744f..b1b490e 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.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
+ * 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.rest.internal.web.controllers;
@@ -83,8 +80,7 @@ class RestAPITestBase extends JUnit4DistributedTestCase {
postSetUpRestAPITestBase();
}
- private void postSetUpRestAPITestBase() throws Exception {
- }
+ private void postSetUpRestAPITestBase() throws Exception {}
/**
* close the clients and teh servers
@@ -129,16 +125,13 @@ class RestAPITestBase extends JUnit4DistributedTestCase {
}
private int getInvocationCount() {
- RestFunctionTemplate function = (RestFunctionTemplate) FunctionService.getFunction(getFunctionID());
+ RestFunctionTemplate function =
+ (RestFunctionTemplate) FunctionService.getFunction(getFunctionID());
return function.invocationCount;
}
- CloseableHttpResponse executeFunctionThroughRestCall(String function,
- String regionName,
- String filter,
- String jsonBody,
- String groups,
- String members) {
+ CloseableHttpResponse executeFunctionThroughRestCall(String function, String regionName,
+ String filter, String jsonBody, String groups, String members) {
System.out.println("Entering executeFunctionThroughRestCall");
CloseableHttpResponse value = null;
try {
@@ -146,7 +139,8 @@ class RestAPITestBase extends JUnit4DistributedTestCase {
Random randomGenerator = new Random();
int restURLIndex = randomGenerator.nextInt(restURLs.size());
- HttpPost post = createHTTPPost(function, regionName, filter, restURLIndex, groups, members, jsonBody);
+ HttpPost post =
+ createHTTPPost(function, regionName, filter, restURLIndex, groups, members, jsonBody);
System.out.println("Request: POST " + post.toString());
value = httpclient.execute(post);
@@ -156,15 +150,11 @@ class RestAPITestBase extends JUnit4DistributedTestCase {
return value;
}
- private HttpPost createHTTPPost(String function,
- String regionName,
- String filter,
- int restUrlIndex,
- String groups,
- String members,
- String jsonBody) {
+ private HttpPost createHTTPPost(String function, String regionName, String filter,
+ int restUrlIndex, String groups, String members, String jsonBody) {
StringBuilder restURLBuilder = new StringBuilder();
- restURLBuilder.append(restURLs.get(restUrlIndex)).append("/functions/").append(function).append("?");
+ restURLBuilder.append(restURLs.get(restUrlIndex)).append("/functions/").append(function)
+ .append("?");
if (regionName != null && !regionName.isEmpty()) {
restURLBuilder.append("onRegion=").append(regionName);
} else if (groups != null && !groups.isEmpty()) {
@@ -190,20 +180,21 @@ class RestAPITestBase extends JUnit4DistributedTestCase {
throw new RuntimeException("This method should be overridden");
}
- void assertHttpResponse(CloseableHttpResponse response, int httpCode, int expectedServerResponses) {
+ void assertHttpResponse(CloseableHttpResponse response, int httpCode,
+ int expectedServerResponses) {
assertEquals(httpCode, response.getStatusLine().getStatusCode());
- //verify response has body flag, expected is true.
+ // verify response has body flag, expected is true.
assertNotNull(response.getEntity());
try {
String httpResponseString = processHttpResponse(response);
response.close();
System.out.println("Response : " + httpResponseString);
- //verify function execution result
+ // verify function execution result
JSONArray resultArray = new JSONArray(httpResponseString);
assertEquals(expectedServerResponses, resultArray.length());
} catch (Exception e) {
- //fail("exception", e);
+ // fail("exception", e);
}
}
[84/98] [abbrv] incubator-geode git commit: [GEODE-2037] Update pulse
documentation links
Posted by ds...@apache.org.
[GEODE-2037] Update pulse documentation links
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/69a0877a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/69a0877a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/69a0877a
Branch: refs/heads/feature/GEM-983
Commit: 69a0877abf1c789d58913cfb152f85ac5ba9d965
Parents: f73a4e3
Author: Anthony Baker <ab...@apache.org>
Authored: Wed Oct 26 07:59:42 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Wed Oct 26 10:14:11 2016 -0700
----------------------------------------------------------------------
geode-pulse/src/main/webapp/DataBrowser.html | 2 +-
geode-pulse/src/main/webapp/MemberDetails.html | 2 +-
geode-pulse/src/main/webapp/QueryStatistics.html | 2 +-
geode-pulse/src/main/webapp/clusterDetail.html | 2 +-
geode-pulse/src/main/webapp/properties/gemfire.properties | 2 +-
geode-pulse/src/main/webapp/properties/gemfire_en.properties | 2 +-
geode-pulse/src/main/webapp/regionDetail.html | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/DataBrowser.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/DataBrowser.html b/geode-pulse/src/main/webapp/DataBrowser.html
index 165fa6f..1695a83 100644
--- a/geode-pulse/src/main/webapp/DataBrowser.html
+++ b/geode-pulse/src/main/webapp/DataBrowser.html
@@ -137,7 +137,7 @@
</div>
</div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a target="_blank" href="http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks">Help</a></div>
+ <div class="left"><a target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/MemberDetails.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/MemberDetails.html b/geode-pulse/src/main/webapp/MemberDetails.html
index b416926..1ce2a4c 100644
--- a/geode-pulse/src/main/webapp/MemberDetails.html
+++ b/geode-pulse/src/main/webapp/MemberDetails.html
@@ -128,7 +128,7 @@
</div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
+ <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/QueryStatistics.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/QueryStatistics.html b/geode-pulse/src/main/webapp/QueryStatistics.html
index 07f61c6..21ece3f 100644
--- a/geode-pulse/src/main/webapp/QueryStatistics.html
+++ b/geode-pulse/src/main/webapp/QueryStatistics.html
@@ -150,7 +150,7 @@
<div class="left headerTopSeperator"></div>
<div class="left">
<a data-prod-custom="pulse-help-custom" target="_blank"
- href="http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html"
+ href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html"
class="left headerTopLinks">Help</a>
</div>
<div class="left headerTopSeperator"></div>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/clusterDetail.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/clusterDetail.html b/geode-pulse/src/main/webapp/clusterDetail.html
index 211e366..0b1f562 100644
--- a/geode-pulse/src/main/webapp/clusterDetail.html
+++ b/geode-pulse/src/main/webapp/clusterDetail.html
@@ -118,7 +118,7 @@
</div>
</div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
+ <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/properties/gemfire.properties
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/properties/gemfire.properties b/geode-pulse/src/main/webapp/properties/gemfire.properties
index 17e2259..db6f881 100644
--- a/geode-pulse/src/main/webapp/properties/gemfire.properties
+++ b/geode-pulse/src/main/webapp/properties/gemfire.properties
@@ -23,7 +23,7 @@ pulse-writes-custom=Writes
pulse-reads-custom=Reads
pulse-monitoring-custom=images/pulse-monitoring.png
pulse-aboutimg-custom=images/about-geode.png
-pulse-help-custom=http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html
+pulse-help-custom=http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html
pulse-about-custom=The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.
pulse-regionstableCaps-custom=Regions
pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/properties/gemfire_en.properties
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/properties/gemfire_en.properties b/geode-pulse/src/main/webapp/properties/gemfire_en.properties
index 17e2259..db6f881 100644
--- a/geode-pulse/src/main/webapp/properties/gemfire_en.properties
+++ b/geode-pulse/src/main/webapp/properties/gemfire_en.properties
@@ -23,7 +23,7 @@ pulse-writes-custom=Writes
pulse-reads-custom=Reads
pulse-monitoring-custom=images/pulse-monitoring.png
pulse-aboutimg-custom=images/about-geode.png
-pulse-help-custom=http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html
+pulse-help-custom=http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html
pulse-about-custom=The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.
pulse-regionstableCaps-custom=Regions
pulse-rtSummaryBySize-custom=Regions Summary - By Entry Count
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/regionDetail.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/regionDetail.html b/geode-pulse/src/main/webapp/regionDetail.html
index 98404cb..0323cd1 100644
--- a/geode-pulse/src/main/webapp/regionDetail.html
+++ b/geode-pulse/src/main/webapp/regionDetail.html
@@ -210,7 +210,7 @@
<!-- Version Details Popup -->
</div>
<div class="left headerTopSeperator"></div>
- <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks">Help</a></div>
+ <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks">Help</a></div>
<div class="left headerTopSeperator"></div>
<div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
<div class="left headerTopLinks textbold font-size12" id="userName"></div>
[21/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java b/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
index 20871d8..59e8386 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -35,35 +33,28 @@ import java.util.Properties;
import static org.apache.geode.distributed.ConfigurationProperties.*;
/**
- * Implements the actual administration (starting, stopping, etc.) of
- * GemFire {@link ManagedEntity}s. It {@link Runtime#exec(java.lang.String) executes}
- * commands to administer the entities based on information provided
- * by the {@link InternalManagedEntity} object. Note that it does not
- * use <code>SystemAdmin</code> to manage "local" entities; it always
- * execs the scripts.
+ * Implements the actual administration (starting, stopping, etc.) of GemFire
+ * {@link ManagedEntity}s. It {@link Runtime#exec(java.lang.String) executes} commands to administer
+ * the entities based on information provided by the {@link InternalManagedEntity} object. Note that
+ * it does not use <code>SystemAdmin</code> to manage "local" entities; it always execs the scripts.
*
* <P>
*
- * This class is a refactoring of <code>Systemcontroller</code>,
- * <code>RemoteCommand</code>, and <code>LocatorRemoteCommand</code>.
+ * This class is a refactoring of <code>Systemcontroller</code>, <code>RemoteCommand</code>, and
+ * <code>LocatorRemoteCommand</code>.
*
* @since GemFire 4.0
*/
class EnabledManagedEntityController implements ManagedEntityController {
private static final Logger logger = LogService.getLogger();
-// /** A lock to ensure that only entity is managed at a time. See bug
-// * 31374. */
-// private static Object startStopLock = new Object();
+ // /** A lock to ensure that only entity is managed at a time. See bug
+ // * 31374. */
+ // private static Object startStopLock = new Object();
/** Known strings found in output indicating error. */
- private static final String[] ERROR_OUTPUTS = new String[] {
- "No such file or directory",
- "The system cannot find the file specified.",
- "Access is denied.",
- "cannot open",
- "ERROR"
- };
+ private static final String[] ERROR_OUTPUTS = new String[] {"No such file or directory",
+ "The system cannot find the file specified.", "Access is denied.", "cannot open", "ERROR"};
/** Token in command prefix to be replaced with actual HOST */
private static final String HOST = "{HOST}";
@@ -71,39 +62,41 @@ class EnabledManagedEntityController implements ManagedEntityController {
/** Token in command prefix to be replaced with actual execution CMD */
private static final String CMD = "{CMD}";
- ////////////////////// Instance Fields //////////////////////
+ ////////////////////// Instance Fields //////////////////////
- /** The thread group in which threads launched by this system
- * controller reside. */
+ /**
+ * The thread group in which threads launched by this system controller reside.
+ */
private final ThreadGroup threadGroup;
/** System to which the managed entities belong */
private final AdminDistributedSystem system;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>ManagedEntityController</code> for entities
- * in the given distributed system.
+ * Creates a new <code>ManagedEntityController</code> for entities in the given distributed
+ * system.
*/
EnabledManagedEntityController(AdminDistributedSystem system) {
this.system = system;
this.threadGroup =
- LoggingThreadGroup.createThreadGroup("ManagedEntityController threads", logger);
+ LoggingThreadGroup.createThreadGroup("ManagedEntityController threads", logger);
}
- ///////////////////// Instance Methods /////////////////////
+ ///////////////////// Instance Methods /////////////////////
/**
- * Returns <code>true</code> if the <code>output</code> string
- * contains a known error message.
+ * Returns <code>true</code> if the <code>output</code> string contains a known error message.
*/
private boolean outputIsError(String output) {
- if (output == null) return false;
+ if (output == null)
+ return false;
boolean error = false;
for (int i = 0; i < ERROR_OUTPUTS.length; i++) {
error = output.indexOf(ERROR_OUTPUTS[i]) > -1;
- if (error) return error;
+ if (error)
+ return error;
}
return error;
}
@@ -111,41 +104,47 @@ class EnabledManagedEntityController implements ManagedEntityController {
/**
* Executes a command using {@link Runtime#exec(java.lang.String)}.
*
- * @param command
- * The full command to remotely execute
+ * @param command The full command to remotely execute
*
- * @return Output from the command that was executed or
- * <code>null</code> if the executing the command failed.
+ * @return Output from the command that was executed or <code>null</code> if the executing the
+ * command failed.
*/
- protected String execute(String command,
- InternalManagedEntity entity) {
- /* TODO: this is getting ugly... clients of this method really need to
- have the ability to do their own parsing/checking of 'output' */
+ protected String execute(String command, InternalManagedEntity entity) {
+ /*
+ * TODO: this is getting ugly... clients of this method really need to have the ability to do
+ * their own parsing/checking of 'output'
+ */
if (command == null || command.length() == 0) {
- throw new IllegalArgumentException(LocalizedStrings.ManagedEntityController_EXECUTION_COMMAND_IS_EMPTY.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.ManagedEntityController_EXECUTION_COMMAND_IS_EMPTY.toLocalizedString());
}
- File workingDir =
- new File(entity.getEntityConfig().getWorkingDirectory());
- logger.info(LocalizedMessage.create(LocalizedStrings.ManagedEntityController_EXECUTING_REMOTE_COMMAND_0_IN_DIRECTORY_1, new Object[] {command, workingDir}));
+ File workingDir = new File(entity.getEntityConfig().getWorkingDirectory());
+ logger.info(LocalizedMessage.create(
+ LocalizedStrings.ManagedEntityController_EXECUTING_REMOTE_COMMAND_0_IN_DIRECTORY_1,
+ new Object[] {command, workingDir}));
Process p = null;
try {
- p = Runtime.getRuntime().exec(command, null /* env */,
- workingDir);
+ p = Runtime.getRuntime().exec(command, null /* env */, workingDir);
} catch (java.io.IOException e) {
- logger.fatal(LocalizedMessage.create(LocalizedStrings.ManagedEntityController_WHILE_EXECUTING_0, command), e);
+ logger.fatal(LocalizedMessage
+ .create(LocalizedStrings.ManagedEntityController_WHILE_EXECUTING_0, command), e);
return null;
}
final ProcessOutputReader pos = new ProcessOutputReader(p);
int retCode = pos.getExitCode();
final String output = pos.getOutput();
- logger.info(LocalizedMessage.create(LocalizedStrings.ManagedEntityController_RESULT_OF_EXECUTING_0_IS_1, new Object[] {command, Integer.valueOf(retCode)}));
- logger.info(LocalizedMessage.create(LocalizedStrings.ManagedEntityController_OUTPUT_OF_0_IS_1, new Object[] {command, output}));
+ logger.info(
+ LocalizedMessage.create(LocalizedStrings.ManagedEntityController_RESULT_OF_EXECUTING_0_IS_1,
+ new Object[] {command, Integer.valueOf(retCode)}));
+ logger.info(LocalizedMessage.create(LocalizedStrings.ManagedEntityController_OUTPUT_OF_0_IS_1,
+ new Object[] {command, output}));
if (retCode != 0 || outputIsError(output)) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.ManagedEntityController_REMOTE_EXECUTION_OF_0_FAILED, command));
+ logger.warn(LocalizedMessage
+ .create(LocalizedStrings.ManagedEntityController_REMOTE_EXECUTION_OF_0_FAILED, command));
return null;
}
@@ -166,30 +165,27 @@ class EnabledManagedEntityController implements ManagedEntityController {
}
}
-// /** Returns true if the path is on Windows. */
-// private boolean pathIsWindows(File path) {
-// return pathIsWindows(path.toString());
-// }
+ // /** Returns true if the path is on Windows. */
+ // private boolean pathIsWindows(File path) {
+ // return pathIsWindows(path.toString());
+ // }
/** Returns true if the path is on Windows. */
private boolean pathIsWindows(String path) {
if (path != null && path.length() > 1) {
- return (Character.isLetter(path.charAt(0)) && path.charAt(1) == ':') ||
- (path.startsWith("//") || path.startsWith("\\\\"));
+ return (Character.isLetter(path.charAt(0)) && path.charAt(1) == ':')
+ || (path.startsWith("//") || path.startsWith("\\\\"));
}
return false;
}
/**
- * If the managed entity resides on a remote host, then
- * <code>command</code> is munged to take the remote command into account.
+ * If the managed entity resides on a remote host, then <code>command</code> is munged to take the
+ * remote command into account.
*
- * @throws IllegalStateException
- * If a remote command is required, but one has not been
- * specified.
+ * @throws IllegalStateException If a remote command is required, but one has not been specified.
*/
- private String arrangeRemoteCommand(InternalManagedEntity entity,
- String cmd) {
+ private String arrangeRemoteCommand(InternalManagedEntity entity, String cmd) {
String host = entity.getEntityConfig().getHost();
if (InetAddressUtil.isLocalHost(host)) {
@@ -203,8 +199,9 @@ class EnabledManagedEntityController implements ManagedEntityController {
}
if (prefix == null || prefix.length() <= 0) {
- throw new IllegalStateException(LocalizedStrings.ManagedEntityController_A_REMOTE_COMMAND_MUST_BE_SPECIFIED_TO_OPERATE_ON_A_MANAGED_ENTITY_ON_HOST_0
- .toLocalizedString(host));
+ throw new IllegalStateException(
+ LocalizedStrings.ManagedEntityController_A_REMOTE_COMMAND_MUST_BE_SPECIFIED_TO_OPERATE_ON_A_MANAGED_ENTITY_ON_HOST_0
+ .toLocalizedString(host));
}
int hostIdx = prefix.indexOf(HOST);
@@ -222,7 +219,7 @@ class EnabledManagedEntityController implements ManagedEntityController {
end = prefix.substring(hostIdx + HOST.length());
}
prefix = start + host + end;
- cmdIdx = prefix.indexOf(CMD); //recalculate;
+ cmdIdx = prefix.indexOf(CMD); // recalculate;
}
if (cmdIdx >= 0) {
@@ -239,27 +236,22 @@ class EnabledManagedEntityController implements ManagedEntityController {
}
/**
- * Returns the full path to the executable in
- * <code>$GEMFIRE/bin</code> taking into account the {@linkplain
- * ManagedEntityConfig#getProductDirectory product directory} and the
- * platform's file separator.
+ * Returns the full path to the executable in <code>$GEMFIRE/bin</code> taking into account the
+ * {@linkplain ManagedEntityConfig#getProductDirectory product directory} and the platform's file
+ * separator.
*
* <P>
*
- * Note: we should probably do a better job of determine whether or
- * not the machine on which the entity runs is Windows or Linux.
+ * Note: we should probably do a better job of determine whether or not the machine on which the
+ * entity runs is Windows or Linux.
*
- * @param executable
- * The name of the executable that resides in
- * <code>$GEMFIRE/bin</code>.
+ * @param executable The name of the executable that resides in <code>$GEMFIRE/bin</code>.
*/
- public String getProductExecutable(InternalManagedEntity entity,
- String executable) {
- String productDirectory =
- entity.getEntityConfig().getProductDirectory();
+ public String getProductExecutable(InternalManagedEntity entity, String executable) {
+ String productDirectory = entity.getEntityConfig().getProductDirectory();
String path = null;
File productDir = new File(productDirectory);
-// if (productDir != null) (cannot be null)
+ // if (productDir != null) (cannot be null)
{
path = productDir.getPath();
if (!endsWithSeparator(path)) {
@@ -267,9 +259,9 @@ class EnabledManagedEntityController implements ManagedEntityController {
}
path += "bin" + File.separator;
}
-// else {
-// path = "";
-// }
+ // else {
+ // path = "";
+ // }
String bat = "";
if (pathIsWindows(path)) {
@@ -279,12 +271,13 @@ class EnabledManagedEntityController implements ManagedEntityController {
}
/**
- * Builds optional SSL command-line arguments. Returns null if SSL is not
- * enabled for the distributed system.
+ * Builds optional SSL command-line arguments. Returns null if SSL is not enabled for the
+ * distributed system.
*/
public String buildSSLArguments(DistributedSystemConfig config) {
Properties sslProps = buildSSLProperties(config, true);
- if (sslProps == null) return null;
+ if (sslProps == null)
+ return null;
StringBuffer sb = new StringBuffer();
for (Iterator iter = sslProps.keySet().iterator(); iter.hasNext();) {
@@ -297,38 +290,28 @@ class EnabledManagedEntityController implements ManagedEntityController {
}
/**
- * Builds optional SSL properties for DistributionLocator. Returns null if SSL
- * is not enabled for the distributed system.
+ * Builds optional SSL properties for DistributionLocator. Returns null if SSL is not enabled for
+ * the distributed system.
*
- * @param forCommandLine
- * true indicates that
- * {@link DistributionConfig#GEMFIRE_PREFIX} should be
- * prepended so the argument will become -Dgemfire.xxxx
+ * @param forCommandLine true indicates that {@link DistributionConfig#GEMFIRE_PREFIX} should be
+ * prepended so the argument will become -Dgemfire.xxxx
*/
- private Properties buildSSLProperties(DistributedSystemConfig config,
- boolean forCommandLine) {
- if (!config.isSSLEnabled()) return null;
+ private Properties buildSSLProperties(DistributedSystemConfig config, boolean forCommandLine) {
+ if (!config.isSSLEnabled())
+ return null;
String prefix = "";
- if (forCommandLine) prefix = DistributionConfig.GEMFIRE_PREFIX;
+ if (forCommandLine)
+ prefix = DistributionConfig.GEMFIRE_PREFIX;
Properties sslProps = (Properties) config.getSSLProperties().clone();
// add ssl-enabled, etc...
- sslProps.setProperty(prefix +
- MCAST_PORT,
- "0");
- sslProps.setProperty(prefix +
- CLUSTER_SSL_ENABLED,
- String.valueOf(config.isSSLEnabled()));
- sslProps.setProperty(prefix +
- CLUSTER_SSL_CIPHERS,
- config.getSSLCiphers());
- sslProps.setProperty(prefix +
- CLUSTER_SSL_PROTOCOLS,
- config.getSSLProtocols());
- sslProps.setProperty(prefix +
- CLUSTER_SSL_REQUIRE_AUTHENTICATION,
- String.valueOf(config.isSSLAuthenticationRequired()));
+ sslProps.setProperty(prefix + MCAST_PORT, "0");
+ sslProps.setProperty(prefix + CLUSTER_SSL_ENABLED, String.valueOf(config.isSSLEnabled()));
+ sslProps.setProperty(prefix + CLUSTER_SSL_CIPHERS, config.getSSLCiphers());
+ sslProps.setProperty(prefix + CLUSTER_SSL_PROTOCOLS, config.getSSLProtocols());
+ sslProps.setProperty(prefix + CLUSTER_SSL_REQUIRE_AUTHENTICATION,
+ String.valueOf(config.isSSLAuthenticationRequired()));
return sslProps;
}
@@ -337,13 +320,12 @@ class EnabledManagedEntityController implements ManagedEntityController {
* Starts a managed entity.
*/
public void start(final InternalManagedEntity entity) {
- final String command =
- arrangeRemoteCommand(entity, entity.getStartCommand());
+ final String command = arrangeRemoteCommand(entity, entity.getStartCommand());
Thread start = new Thread(this.threadGroup, new Runnable() {
- public void run() {
- execute(command, entity);
- }
- }, "Start " + entity.getEntityType());
+ public void run() {
+ execute(command, entity);
+ }
+ }, "Start " + entity.getEntityType());
start.start();
}
@@ -351,13 +333,12 @@ class EnabledManagedEntityController implements ManagedEntityController {
* Stops a managed entity.
*/
public void stop(final InternalManagedEntity entity) {
- final String command =
- arrangeRemoteCommand(entity, entity.getStopCommand());
+ final String command = arrangeRemoteCommand(entity, entity.getStopCommand());
Thread stop = new Thread(this.threadGroup, new Runnable() {
- public void run() {
- execute(command, entity);
- }
- }, "Stop " + entity.getEntityType());
+ public void run() {
+ execute(command, entity);
+ }
+ }, "Stop " + entity.getEntityType());
stop.start();
}
@@ -365,47 +346,40 @@ class EnabledManagedEntityController implements ManagedEntityController {
* Returns whether or not a managed entity is running
*/
public boolean isRunning(InternalManagedEntity entity) {
- final String command =
- arrangeRemoteCommand(entity, entity.getIsRunningCommand());
+ final String command = arrangeRemoteCommand(entity, entity.getIsRunningCommand());
String output = execute(command, entity);
- if (output == null ||
- (output.indexOf("stop" /* "ing" "ped" */) != -1) ||
- (output.indexOf("killed") != -1) ||
- (output.indexOf("starting") != -1)) {
+ if (output == null || (output.indexOf("stop" /* "ing" "ped" */) != -1)
+ || (output.indexOf("killed") != -1) || (output.indexOf("starting") != -1)) {
return false;
} else if (output.indexOf("running") != -1) {
return true;
} else {
- throw new IllegalStateException(LocalizedStrings.ManagedEntityController_COULD_NOT_DETERMINE_IF_MANAGED_ENTITY_WAS_RUNNING_0
- .toLocalizedString(output));
+ throw new IllegalStateException(
+ LocalizedStrings.ManagedEntityController_COULD_NOT_DETERMINE_IF_MANAGED_ENTITY_WAS_RUNNING_0
+ .toLocalizedString(output));
}
}
/**
- * Returns the contents of a locator's log file. Other APIs are
- * used to get the log file of managed entities that are also system
- * members.
+ * Returns the contents of a locator's log file. Other APIs are used to get the log file of
+ * managed entities that are also system members.
*/
public String getLog(DistributionLocatorImpl locator) {
- String command =
- arrangeRemoteCommand(locator, locator.getLogCommand());
+ String command = arrangeRemoteCommand(locator, locator.getLogCommand());
return execute(command, locator);
}
/**
- * Returns the contents of the given directory using the given
- * managed entity to determine the host and remote command.
+ * Returns the contents of the given directory using the given managed entity to determine the
+ * host and remote command.
*/
- private String listDirectory(InternalManagedEntity entity,
- String dir) {
+ private String listDirectory(InternalManagedEntity entity, String dir) {
ManagedEntityConfig config = entity.getEntityConfig();
- String listFile =
- pathIsWindows(config.getProductDirectory()) ? "dir " : "ls ";
- String command =
- arrangeRemoteCommand(entity, listFile + dir);
+ String listFile = pathIsWindows(config.getProductDirectory()) ? "dir " : "ls ";
+ String command = arrangeRemoteCommand(entity, listFile + dir);
return execute(command, entity);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
index 2de4b08..25abd7e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupRequest.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -47,30 +45,31 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- * A request send from an admin VM to all of the peers to indicate
- * that that should complete the backup operation.
+ * A request send from an admin VM to all of the peers to indicate that that should complete the
+ * backup operation.
*
*
*/
-public class FinishBackupRequest extends CliLegacyMessage {
+public class FinishBackupRequest extends CliLegacyMessage {
private static final Logger logger = LogService.getLogger();
-
+
private File targetDir;
private File baselineDir;
private boolean abort;
-
+
public FinishBackupRequest() {
super();
}
- public FinishBackupRequest(File targetDir,File baselineDir, boolean abort) {
+ public FinishBackupRequest(File targetDir, File baselineDir, boolean abort) {
this.targetDir = targetDir;
this.baselineDir = baselineDir;
this.abort = abort;
}
-
- public static Map<DistributedMember, Set<PersistentID>> send(DM dm, Set recipients, File targetDir, File baselineDir, boolean abort) {
- FinishBackupRequest request = new FinishBackupRequest(targetDir,baselineDir, abort);
+
+ public static Map<DistributedMember, Set<PersistentID>> send(DM dm, Set recipients,
+ File targetDir, File baselineDir, boolean abort) {
+ FinishBackupRequest request = new FinishBackupRequest(targetDir, baselineDir, abort);
request.setRecipients(recipients);
FinishBackupReplyProcessor replyProcessor = new FinishBackupReplyProcessor(dm, recipients);
@@ -79,40 +78,41 @@ public class FinishBackupRequest extends CliLegacyMessage {
try {
replyProcessor.waitForReplies();
} catch (ReplyException e) {
- if(!(e.getCause() instanceof CancelException)) {
+ if (!(e.getCause() instanceof CancelException)) {
throw e;
}
} catch (InterruptedException e) {
e.printStackTrace();
}
- AdminResponse response = request.createResponse((DistributionManager)dm);
+ AdminResponse response = request.createResponse((DistributionManager) dm);
response.setSender(dm.getDistributionManagerId());
replyProcessor.process(response);
return replyProcessor.results;
}
-
+
@Override
protected AdminResponse createResponse(DistributionManager dm) {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
HashSet<PersistentID> persistentIds;
- if(cache == null || cache.getBackupManager() == null) {
+ if (cache == null || cache.getBackupManager() == null) {
persistentIds = new HashSet<PersistentID>();
} else {
try {
persistentIds = cache.getBackupManager().finishBackup(targetDir, baselineDir, abort);
} catch (IOException e) {
- logger.error(LocalizedMessage.create(LocalizedStrings.CliLegacyMessage_ERROR, this.getClass()), e);
+ logger.error(
+ LocalizedMessage.create(LocalizedStrings.CliLegacyMessage_ERROR, this.getClass()), e);
return AdminFailureResponse.create(dm, getSender(), e);
}
}
-
+
return new FinishBackupResponse(this.getSender(), persistentIds);
}
public int getDSFID() {
return FINISH_BACKUP_REQUEST;
}
-
+
@Override
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
@@ -130,42 +130,44 @@ public class FinishBackupRequest extends CliLegacyMessage {
}
private static class FinishBackupReplyProcessor extends AdminMultipleReplyProcessor {
- Map<DistributedMember, Set<PersistentID>> results = Collections.synchronizedMap(new HashMap<DistributedMember, Set<PersistentID>>());
+ Map<DistributedMember, Set<PersistentID>> results =
+ Collections.synchronizedMap(new HashMap<DistributedMember, Set<PersistentID>>());
+
public FinishBackupReplyProcessor(DM dm, Collection initMembers) {
super(dm, initMembers);
}
-
+
@Override
protected boolean stopBecauseOfExceptions() {
return false;
}
-
-
+
+
@Override
protected int getAckWaitThreshold() {
- //Disable the 15 second warning if the backup is taking a long time
+ // Disable the 15 second warning if the backup is taking a long time
return 0;
}
@Override
public long getAckSevereAlertThresholdMS() {
- //Don't log severe alerts for backups either
+ // Don't log severe alerts for backups either
return Long.MAX_VALUE;
}
@Override
protected void process(DistributionMessage msg, boolean warn) {
- if(msg instanceof FinishBackupResponse) {
+ if (msg instanceof FinishBackupResponse) {
final HashSet<PersistentID> persistentIds = ((FinishBackupResponse) msg).getPersistentIds();
- if(persistentIds != null && !persistentIds.isEmpty()) {
+ if (persistentIds != null && !persistentIds.isEmpty()) {
results.put(msg.getSender(), persistentIds);
}
}
super.process(msg, warn);
}
-
-
+
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java
index d3595ef..ab032b7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/FinishBackupResponse.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -27,25 +25,25 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.admin.remote.AdminResponse;
/**
- * The reply for a {@link FinishBackupRequest}. The
- * reply contains the persistent ids of the disk stores
- * that were backed up on this member.
+ * The reply for a {@link FinishBackupRequest}. The reply contains the persistent ids of the disk
+ * stores that were backed up on this member.
*
*
*/
public class FinishBackupResponse extends AdminResponse {
-
+
private HashSet<PersistentID> persistentIds;
-
+
public FinishBackupResponse() {
super();
}
- public FinishBackupResponse(InternalDistributedMember sender, HashSet<PersistentID> persistentIds) {
+ public FinishBackupResponse(InternalDistributedMember sender,
+ HashSet<PersistentID> persistentIds) {
this.setRecipient(sender);
this.persistentIds = persistentIds;
}
-
+
public HashSet<PersistentID> getPersistentIds() {
return persistentIds;
}
@@ -70,7 +68,7 @@ public class FinishBackupResponse extends AdminResponse {
public int getDSFID() {
return FINISH_BACKUP_RESPONSE;
}
-
+
@Override
public String toString() {
return getClass().getName() + ": " + persistentIds;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java b/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java
index 2232377..ff6dd9d 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskRequest.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -32,19 +30,18 @@ import org.apache.geode.internal.cache.DiskStoreImpl;
import org.apache.geode.internal.cache.GemFireCacheImpl;
/**
- * A request to from an admin VM to all non admin members
- * to start a backup. In the prepare phase of the backup,
- * the members will suspend bucket destroys to make sure
- * buckets aren't missed during the backup.
+ * A request to from an admin VM to all non admin members to start a backup. In the prepare phase of
+ * the backup, the members will suspend bucket destroys to make sure buckets aren't missed during
+ * the backup.
*
*
*/
-public class FlushToDiskRequest extends CliLegacyMessage {
-
+public class FlushToDiskRequest extends CliLegacyMessage {
+
public FlushToDiskRequest() {
-
+
}
-
+
public static void send(DM dm, Set recipients) {
FlushToDiskRequest request = new FlushToDiskRequest();
request.setRecipients(recipients);
@@ -55,40 +52,40 @@ public class FlushToDiskRequest extends CliLegacyMessage {
try {
replyProcessor.waitForReplies();
} catch (ReplyException e) {
- if(!(e.getCause() instanceof CancelException)) {
+ if (!(e.getCause() instanceof CancelException)) {
throw e;
}
} catch (InterruptedException e) {
e.printStackTrace();
}
- AdminResponse response = request.createResponse((DistributionManager)dm);
+ AdminResponse response = request.createResponse((DistributionManager) dm);
response.setSender(dm.getDistributionManagerId());
replyProcessor.process(response);
}
-
+
@Override
protected AdminResponse createResponse(DistributionManager dm) {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
HashSet<PersistentID> persistentIds;
- if(cache != null) {
+ if (cache != null) {
Collection<DiskStoreImpl> diskStores = cache.listDiskStoresIncludingRegionOwned();
- for(DiskStoreImpl store : diskStores) {
+ for (DiskStoreImpl store : diskStores) {
store.flush();
}
}
-
+
return new FlushToDiskResponse(this.getSender());
}
public int getDSFID() {
return FLUSH_TO_DISK_REQUEST;
}
-
+
private static class FlushToDiskProcessor extends AdminMultipleReplyProcessor {
public FlushToDiskProcessor(DM dm, Collection initMembers) {
super(dm, initMembers);
}
-
+
@Override
protected boolean stopBecauseOfExceptions() {
return false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskResponse.java b/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskResponse.java
index 622abd3..5461ebb 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/FlushToDiskResponse.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -33,11 +31,11 @@ public class FlushToDiskResponse extends AdminResponse {
public FlushToDiskResponse(InternalDistributedMember sender) {
this.setRecipient(sender);
}
-
+
public int getDSFID() {
return FLUSH_TO_DISK_RESPONSE;
}
-
+
@Override
public String toString() {
return getClass().getName();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
index 754b0fb..4bf0305 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthConfigImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -28,35 +26,32 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* @since GemFire 3.5
*/
-public class GemFireHealthConfigImpl
- extends CacheHealthConfigImpl
- implements GemFireHealthConfig {
+public class GemFireHealthConfigImpl extends CacheHealthConfigImpl implements GemFireHealthConfig {
private static final long serialVersionUID = -6797673296902808018L;
/** The name of the host to which this configuration applies. */
private String hostName;
- /** The number of seconds to wait between evaluating the health of
- * GemFire. */
+ /**
+ * The number of seconds to wait between evaluating the health of GemFire.
+ */
private int interval = DEFAULT_HEALTH_EVALUATION_INTERVAL;
- //////////////////////// Constructors ////////////////////////
+ //////////////////////// Constructors ////////////////////////
/**
- * Creates a new <code>GemFireHealthConfigImpl</code> that applies
- * to the host with the given name.
+ * Creates a new <code>GemFireHealthConfigImpl</code> that applies to the host with the given
+ * name.
*
- * @param hostName
- * The name of the host to which this configuration applies.
- * If <code>null</code>, then this is the "default"
- * configuration.
+ * @param hostName The name of the host to which this configuration applies. If <code>null</code>,
+ * then this is the "default" configuration.
*/
public GemFireHealthConfigImpl(String hostName) {
this.hostName = hostName;
}
- /////////////////////// Instance Methods ///////////////////////
+ /////////////////////// Instance Methods ///////////////////////
public String getHostName() {
return this.hostName;
@@ -73,10 +68,12 @@ public class GemFireHealthConfigImpl
@Override
public String toString() {
if (this.hostName == null) {
- return LocalizedStrings.GemFireHealthConfigImpl_DEFAULT_GEMFIRE_HEALTH_CONFIGURATION.toLocalizedString();
+ return LocalizedStrings.GemFireHealthConfigImpl_DEFAULT_GEMFIRE_HEALTH_CONFIGURATION
+ .toLocalizedString();
} else {
- return LocalizedStrings.GemFireHealthConfigImpl_GEMFIRE_HEALTH_CONFIGURATION_FOR_HOST_0.toLocalizedString(this.hostName);
+ return LocalizedStrings.GemFireHealthConfigImpl_GEMFIRE_HEALTH_CONFIGURATION_FOR_HOST_0
+ .toLocalizedString(this.hostName);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthEvaluator.java
index f07cb2c..1573ca7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthEvaluator.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -30,14 +28,13 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
/**
- * Evaluates the health of various GemFire components in the VM
- * according to a {@link GemFireHealthConfig}.
+ * Evaluates the health of various GemFire components in the VM according to a
+ * {@link GemFireHealthConfig}.
*
* <P>
*
- * Note that evaluators never reside in the administration VM, they
- * only in member VMs. They are not <code>Serializable</code> and
- * aren't meant to be.
+ * Note that evaluators never reside in the administration VM, they only in member VMs. They are not
+ * <code>Serializable</code> and aren't meant to be.
*
* @see MemberHealthEvaluator
* @see CacheHealthEvaluator
@@ -48,7 +45,7 @@ import org.apache.geode.internal.logging.LogService;
public class GemFireHealthEvaluator {
private static final Logger logger = LogService.getLogger();
-
+
/** Determines how the health of GemFire is determined */
private GemFireHealthConfig config;
@@ -58,29 +55,28 @@ public class GemFireHealthEvaluator {
/** Evaluates the health of the Cache hosted in this VM */
private CacheHealthEvaluator cacheHealth;
- /** The most recent <code>OKAY_HEALTH</code> diagnoses of the
- * GemFire system */
+ /**
+ * The most recent <code>OKAY_HEALTH</code> diagnoses of the GemFire system
+ */
private List okayDiagnoses;
- /** The most recent <code>POOR_HEALTH</code> diagnoses of the
- * GemFire system */
+ /**
+ * The most recent <code>POOR_HEALTH</code> diagnoses of the GemFire system
+ */
private List poorDiagnoses;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
* Creates a new <code>GemFireHealthEvaluator</code>
*
- * @param config
- * The configuration that determines whether or GemFire is
- * healthy
- * @param dm
- * The distribution manager
+ * @param config The configuration that determines whether or GemFire is healthy
+ * @param dm The distribution manager
*/
- public GemFireHealthEvaluator(GemFireHealthConfig config,
- DistributionManager dm) {
+ public GemFireHealthEvaluator(GemFireHealthConfig config, DistributionManager dm) {
if (config == null) {
- throw new NullPointerException(LocalizedStrings.GemFireHealthEvaluator_NULL_GEMFIREHEALTHCONFIG.toLocalizedString());
+ throw new NullPointerException(
+ LocalizedStrings.GemFireHealthEvaluator_NULL_GEMFIREHEALTHCONFIG.toLocalizedString());
}
this.config = config;
@@ -90,13 +86,13 @@ public class GemFireHealthEvaluator {
this.poorDiagnoses = new ArrayList();
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
* Evaluates the health of the GemFire components in this VM.
*
- * @return The aggregate health code (such as {@link
- * GemFireHealth#OKAY_HEALTH}) of the GemFire components.
+ * @return The aggregate health code (such as {@link GemFireHealth#OKAY_HEALTH}) of the GemFire
+ * components.
*/
public GemFireHealth.Health evaluate() {
List status = new ArrayList();
@@ -107,9 +103,9 @@ public class GemFireHealthEvaluator {
this.okayDiagnoses.clear();
this.poorDiagnoses.clear();
- for (Iterator iter = status.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = status.iterator(); iter.hasNext();) {
AbstractHealthEvaluator.HealthStatus health =
- (AbstractHealthEvaluator.HealthStatus) iter.next();
+ (AbstractHealthEvaluator.HealthStatus) iter.next();
if (overallHealth == GemFireHealth.GOOD_HEALTH) {
if ((health.getHealthCode() != GemFireHealth.GOOD_HEALTH)) {
overallHealth = health.getHealthCode();
@@ -137,10 +133,9 @@ public class GemFireHealthEvaluator {
}
/**
- * Returns detailed information explaining the current health status.
- * Each array element is a different cause for the current status.
- * An empty array will be returned if the current status is {@link
- * GemFireHealth#GOOD_HEALTH}.
+ * Returns detailed information explaining the current health status. Each array element is a
+ * different cause for the current status. An empty array will be returned if the current status
+ * is {@link GemFireHealth#GOOD_HEALTH}.
*/
public String[] getDiagnosis(GemFireHealth.Health healthCode) {
if (healthCode == GemFireHealth.GOOD_HEALTH) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
index f944482..efeee66 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/GemFireHealthImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -27,17 +25,14 @@ import java.net.UnknownHostException;
import java.util.*;
/**
- * Provides the implementation of the <code>GemFireHealth</code>
- * administration API. This class is responsible for {@linkplain
- * GemFireVM#addHealthListener sending} the {@link
- * GemFireHealthConfig}s to the remote member VM in which the health
- * is calcualted.
+ * Provides the implementation of the <code>GemFireHealth</code> administration API. This class is
+ * responsible for {@linkplain GemFireVM#addHealthListener sending} the {@link GemFireHealthConfig}s
+ * to the remote member VM in which the health is calcualted.
*
*
* @since GemFire 3.5
*/
-public class GemFireHealthImpl
- implements GemFireHealth, JoinLeaveListener, HealthListener {
+public class GemFireHealthImpl implements GemFireHealth, JoinLeaveListener, HealthListener {
/** The distributed system whose health is being monitored */
private final GfManagerAgent agent;
@@ -45,12 +40,15 @@ public class GemFireHealthImpl
/** The default configuration for checking GemFire health */
protected GemFireHealthConfig defaultConfig;
- /** Maps the name of a host to its <code>GemFireHealthConfig</code>.
- * Note that the mappings are created lazily. */
+ /**
+ * Maps the name of a host to its <code>GemFireHealthConfig</code>. Note that the mappings are
+ * created lazily.
+ */
private final Map hostConfigs;
- /** Maps the name of a host to all of the members
- * (<code>GemFireVM</code>s) that run on that host. */
+ /**
+ * Maps the name of a host to all of the members (<code>GemFireVM</code>s) that run on that host.
+ */
private final Map hostMembers;
/** The members that are known to be in {@link #OKAY_HEALTH}. */
@@ -65,28 +63,29 @@ public class GemFireHealthImpl
/** Is this GemFireHealthImpl closed? */
private boolean isClosed;
- /** The configuration specifying how the health of the distributed
- * system should be computed. */
+ /**
+ * The configuration specifying how the health of the distributed system should be computed.
+ */
protected volatile DistributedSystemHealthConfig dsHealthConfig;
/** Monitors the health of the entire distributed system */
private DistributedSystemHealthMonitor dsHealthMonitor = null;
- /** The distributed system whose health is monitored by this
- * <Code>GemFireHealth</code>. */
+ /**
+ * The distributed system whose health is monitored by this <Code>GemFireHealth</code>.
+ */
private final AdminDistributedSystem system;
-
- /////////////////////// Constructors ///////////////////////
+
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>GemFireHealthImpl</code> that monitors the
- * health of member of the given distributed system.
+ * Creates a new <code>GemFireHealthImpl</code> that monitors the health of member of the given
+ * distributed system.
*/
- protected GemFireHealthImpl(GfManagerAgent agent,
- AdminDistributedSystem system) {
-// agent.getDM().getLogger().info("Creating GemFireHealthImpl",
-// new Exception("Stack trace"));
+ protected GemFireHealthImpl(GfManagerAgent agent, AdminDistributedSystem system) {
+ // agent.getDM().getLogger().info("Creating GemFireHealthImpl",
+ // new Exception("Stack trace"));
this.agent = agent;
this.system = system;
@@ -120,58 +119,53 @@ public class GemFireHealthImpl
sb.append("; diagnosis=" + getDiagnosis());
return sb.toString();
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Returns the <code>DistributedSystem</code> whose health this
- * <code>GemFireHealth</code> monitors.
+ * Returns the <code>DistributedSystem</code> whose health this <code>GemFireHealth</code>
+ * monitors.
*/
public AdminDistributedSystem getDistributedSystem() {
return this.system;
}
/**
- * A "template factory" method for creating a
- * <code>DistributedSystemHealthConfig</code>. It can be overridden
- * by subclasses to produce instances of different
+ * A "template factory" method for creating a <code>DistributedSystemHealthConfig</code>. It can
+ * be overridden by subclasses to produce instances of different
* <code>DistributedSystemHealthConfig</code> implementations.
*/
- protected DistributedSystemHealthConfig
- createDistributedSystemHealthConfig() {
+ protected DistributedSystemHealthConfig createDistributedSystemHealthConfig() {
return new DistributedSystemHealthConfigImpl();
}
/**
- * A "template factory" method for creating a
- * <code>GemFireHealthConfig</code>. It can be overridden by
- * subclasses to produce instances of different
- * <code>GemFireHealthConfig</code> implementations.
+ * A "template factory" method for creating a <code>GemFireHealthConfig</code>. It can be
+ * overridden by subclasses to produce instances of different <code>GemFireHealthConfig</code>
+ * implementations.
*
- * @param hostName
- * The host whose health we are configuring
+ * @param hostName The host whose health we are configuring
*/
- protected GemFireHealthConfig
- createGemFireHealthConfig(String hostName) {
+ protected GemFireHealthConfig createGemFireHealthConfig(String hostName) {
return new GemFireHealthConfigImpl(hostName);
}
/**
- * Throws an {@link IllegalStateException} if this
- * <code>GemFireHealthImpl</code> is closed.
+ * Throws an {@link IllegalStateException} if this <code>GemFireHealthImpl</code> is closed.
*/
private void checkClosed() {
if (this.isClosed) {
- throw new IllegalStateException(LocalizedStrings.GemFireHealthImpl_CANNOT_ACCESS_A_CLOSED_GEMFIREHEALTH_INSTANCE.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.GemFireHealthImpl_CANNOT_ACCESS_A_CLOSED_GEMFIREHEALTH_INSTANCE
+ .toLocalizedString());
}
}
/**
- * Returns the overall health of GemFire. Note that this method
- * does not contact any of the member VMs. Instead, it relies on
- * the members to alert it of changes in its health via a {@link
- * HealthListener}.
+ * Returns the overall health of GemFire. Note that this method does not contact any of the member
+ * VMs. Instead, it relies on the members to alert it of changes in its health via a
+ * {@link HealthListener}.
*/
public GemFireHealth.Health getHealth() {
checkClosed();
@@ -179,8 +173,8 @@ public class GemFireHealthImpl
}
/**
- * Resets the overall health to be {@link #GOOD_HEALTH}. It also
- * resets the health in the member VMs.
+ * Resets the overall health to be {@link #GOOD_HEALTH}. It also resets the health in the member
+ * VMs.
*
* @see GemFireVM#resetHealthStatus
*/
@@ -192,10 +186,9 @@ public class GemFireHealthImpl
this.poorHealth.clear();
synchronized (this) {
- for (Iterator iter = hostMembers.values().iterator();
- iter.hasNext(); ) {
+ for (Iterator iter = hostMembers.values().iterator(); iter.hasNext();) {
List members = (List) iter.next();
- for (Iterator iter2 = members.iterator(); iter2.hasNext(); ) {
+ for (Iterator iter2 = members.iterator(); iter2.hasNext();) {
GemFireVM member = (GemFireVM) iter2.next();
member.resetHealthStatus();
}
@@ -204,8 +197,7 @@ public class GemFireHealthImpl
}
/**
- * Aggregates the diagnoses from all members of the distributed
- * system.
+ * Aggregates the diagnoses from all members of the distributed system.
*/
public String getDiagnosis() {
checkClosed();
@@ -213,13 +205,11 @@ public class GemFireHealthImpl
StringBuffer sb = new StringBuffer();
synchronized (this) {
- for (Iterator iter = hostMembers.values().iterator();
- iter.hasNext(); ) {
+ for (Iterator iter = hostMembers.values().iterator(); iter.hasNext();) {
List members = (List) iter.next();
- for (Iterator iter2 = members.iterator(); iter2.hasNext(); ) {
+ for (Iterator iter2 = members.iterator(); iter2.hasNext();) {
GemFireVM member = (GemFireVM) iter2.next();
- String[] diagnoses =
- member.getHealthDiagnosis(this.overallHealth);
+ String[] diagnoses = member.getHealthDiagnosis(this.overallHealth);
for (int i = 0; i < diagnoses.length; i++) {
sb.append(diagnoses[i]).append("\n");;
}
@@ -233,8 +223,7 @@ public class GemFireHealthImpl
/**
* Starts a new {@link DistributedSystemHealthMonitor}
*/
- public void setDistributedSystemHealthConfig(DistributedSystemHealthConfig
- config) {
+ public void setDistributedSystemHealthConfig(DistributedSystemHealthConfig config) {
synchronized (this.hostConfigs) {
// If too many threads are changing the health config, then we
// will might get an OutOfMemoryError trying to start a new
@@ -247,17 +236,14 @@ public class GemFireHealthImpl
this.dsHealthConfig = config;
DistributedSystemHealthEvaluator eval =
- new DistributedSystemHealthEvaluator(config, this.agent.getDM());
- int interval =
- this.getDefaultGemFireHealthConfig().getHealthEvaluationInterval();
- this.dsHealthMonitor =
- new DistributedSystemHealthMonitor(eval, this, interval);
+ new DistributedSystemHealthEvaluator(config, this.agent.getDM());
+ int interval = this.getDefaultGemFireHealthConfig().getHealthEvaluationInterval();
+ this.dsHealthMonitor = new DistributedSystemHealthMonitor(eval, this, interval);
this.dsHealthMonitor.start();
}
}
- public DistributedSystemHealthConfig
- getDistributedSystemHealthConfig() {
+ public DistributedSystemHealthConfig getDistributedSystemHealthConfig() {
checkClosed();
return this.dsHealthConfig;
@@ -272,25 +258,25 @@ public class GemFireHealthImpl
checkClosed();
if (config.getHostName() != null) {
- throw new IllegalArgumentException(LocalizedStrings.GemFireHealthImpl_THE_GEMFIREHEALTHCONFIG_FOR_FOR_0_CANNOT_SERVE_AS_THE_DEFAULT_HEALTH_CONFIG.toLocalizedString(config.getHostName()));
+ throw new IllegalArgumentException(
+ LocalizedStrings.GemFireHealthImpl_THE_GEMFIREHEALTHCONFIG_FOR_FOR_0_CANNOT_SERVE_AS_THE_DEFAULT_HEALTH_CONFIG
+ .toLocalizedString(config.getHostName()));
}
this.defaultConfig = config;
synchronized (this) {
- for (Iterator iter = this.hostMembers.entrySet().iterator();
- iter.hasNext(); ) {
+ for (Iterator iter = this.hostMembers.entrySet().iterator(); iter.hasNext();) {
Map.Entry entry = (Map.Entry) iter.next();
InetAddress hostIpAddress = (InetAddress) entry.getKey();
List members = (List) entry.getValue();
- GemFireHealthConfig hostConfig =
- (GemFireHealthConfig) hostConfigs.get(hostIpAddress);
+ GemFireHealthConfig hostConfig = (GemFireHealthConfig) hostConfigs.get(hostIpAddress);
if (hostConfig == null) {
hostConfig = config;
}
- for (Iterator iter2 = members.iterator(); iter2.hasNext(); ) {
+ for (Iterator iter2 = members.iterator(); iter2.hasNext();) {
GemFireVM member = (GemFireVM) iter2.next();
Assert.assertTrue(member.getHost().equals(hostIpAddress));
member.addHealthListener(this, hostConfig);
@@ -299,7 +285,7 @@ public class GemFireHealthImpl
}
// We only need to do this if the health monitoring interval has
- // change. This is probably not the most efficient way of doing
+ // change. This is probably not the most efficient way of doing
// things.
if (this.dsHealthConfig != null) {
setDistributedSystemHealthConfig(this.dsHealthConfig);
@@ -309,14 +295,11 @@ public class GemFireHealthImpl
/**
* Returns the GemFireHealthConfig object for the given host name.
*
- * @param hostName
- * host name for which the GemFire Health Config is needed
+ * @param hostName host name for which the GemFire Health Config is needed
*
- * @throws IllegalArgumentException
- * if host with given name could not be found
+ * @throws IllegalArgumentException if host with given name could not be found
*/
- public synchronized GemFireHealthConfig
- getGemFireHealthConfig(String hostName){
+ public synchronized GemFireHealthConfig getGemFireHealthConfig(String hostName) {
checkClosed();
@@ -326,11 +309,11 @@ public class GemFireHealthImpl
} catch (UnknownHostException e) {
throw new IllegalArgumentException(
LocalizedStrings.GemFireHealthImpl_COULD_NOT_FIND_A_HOST_WITH_NAME_0
- .toLocalizedString(hostName), e);
+ .toLocalizedString(hostName),
+ e);
}
-
- GemFireHealthConfig config =
- (GemFireHealthConfig) this.hostConfigs.get(hostIpAddress);
+
+ GemFireHealthConfig config = (GemFireHealthConfig) this.hostConfigs.get(hostIpAddress);
if (config == null) {
config = createGemFireHealthConfig(hostName);
this.hostConfigs.put(hostIpAddress, config);
@@ -342,18 +325,14 @@ public class GemFireHealthImpl
/**
* Sets the GemFireHealthConfig object for the given host name.
*
- * @param hostName
- * host name for which the GemFire Health Config is needed
- * @param config
- * GemFireHealthConfig object to set
+ * @param hostName host name for which the GemFire Health Config is needed
+ * @param config GemFireHealthConfig object to set
*
- * @throws IllegalArgumentException
- * if (1) given host name & the host name in the given config do not
- * match OR (2) host with given name could not be found OR (3) there
- * are no GemFire components running on the given host
+ * @throws IllegalArgumentException if (1) given host name & the host name in the given config do
+ * not match OR (2) host with given name could not be found OR (3) there are no GemFire
+ * components running on the given host
*/
- public void setGemFireHealthConfig(String hostName,
- GemFireHealthConfig config) {
+ public void setGemFireHealthConfig(String hostName, GemFireHealthConfig config) {
checkClosed();
synchronized (this) {
@@ -378,9 +357,10 @@ public class GemFireHealthImpl
} catch (UnknownHostException e) {
throw new IllegalArgumentException(
LocalizedStrings.GemFireHealthImpl_COULD_NOT_FIND_A_HOST_WITH_NAME_0
- .toLocalizedString(hostName), e);
+ .toLocalizedString(hostName),
+ e);
}
-
+
List members = (List) this.hostMembers.get(hostIpAddress);
if (members == null || members.isEmpty()) {
throw new IllegalArgumentException(
@@ -388,7 +368,7 @@ public class GemFireHealthImpl
.toLocalizedString(hostName));
}
- for (Iterator iter = members.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = members.iterator(); iter.hasNext();) {
GemFireVM member = (GemFireVM) iter.next();
member.addHealthListener(this, config);
}
@@ -396,14 +376,14 @@ public class GemFireHealthImpl
}
/**
- * Tells the members of the distributed system that we are no longer
- * interested in monitoring their health.
+ * Tells the members of the distributed system that we are no longer interested in monitoring
+ * their health.
*
* @see GemFireVM#removeHealthListener
*/
- public void close(){
+ public void close() {
this.agent.removeJoinLeaveListener(this);
-
+
synchronized (this) {
if (this.isClosed) {
return;
@@ -417,10 +397,9 @@ public class GemFireHealthImpl
}
try {
- for (Iterator iter = hostMembers.values().iterator();
- iter.hasNext(); ) {
+ for (Iterator iter = hostMembers.values().iterator(); iter.hasNext();) {
List members = (List) iter.next();
- for (Iterator iter2 = members.iterator(); iter2.hasNext(); ) {
+ for (Iterator iter2 = members.iterator(); iter2.hasNext();) {
GemFireVM member = (GemFireVM) iter2.next();
member.removeHealthListener();
}
@@ -454,14 +433,12 @@ public class GemFireHealthImpl
}
- public synchronized void nodeJoined(GfManagerAgent source,
- GemFireVM joined) {
+ public synchronized void nodeJoined(GfManagerAgent source, GemFireVM joined) {
noteNewMember(joined);
InetAddress hostIpAddress = joined.getHost();
- GemFireHealthConfig config =
- (GemFireHealthConfig) this.hostConfigs.get(hostIpAddress);
+ GemFireHealthConfig config = (GemFireHealthConfig) this.hostConfigs.get(hostIpAddress);
if (config == null) {
config = this.getDefaultGemFireHealthConfig();
}
@@ -471,8 +448,7 @@ public class GemFireHealthImpl
/**
* Makes note of the newly-left member
*/
- public synchronized void nodeLeft(GfManagerAgent source,
- GemFireVM left) {
+ public synchronized void nodeLeft(GfManagerAgent source, GemFireVM left) {
InetAddress hostIpAddress = left.getHost();
List members = (List) this.hostMembers.get(hostIpAddress);
if (members != null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java b/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
index 698a627..17d1535 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/InetAddressUtil.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -31,31 +29,30 @@ import org.apache.geode.internal.logging.LogService;
/**
- * Provides static utilities for manipulating, validating, and converting
- * InetAddresses and host strings.
+ * Provides static utilities for manipulating, validating, and converting InetAddresses and host
+ * strings.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
@Deprecated
public class InetAddressUtil {
-
+
private static final Logger logger = LogService.getLogger();
-
- /** InetAddress instance representing the local host */
+
+ /** InetAddress instance representing the local host */
public static final InetAddress LOCALHOST = createLocalHost();
-
- public static final String LOOPBACK_ADDRESS =
- SocketCreator.preferIPv6Addresses() ? "::1" : "127.0.0.1";
-
- public static final InetAddress LOOPBACK =
- InetAddressUtil.toInetAddress(LOOPBACK_ADDRESS);
-
+
+ public static final String LOOPBACK_ADDRESS =
+ SocketCreator.preferIPv6Addresses() ? "::1" : "127.0.0.1";
+
+ public static final InetAddress LOOPBACK = InetAddressUtil.toInetAddress(LOOPBACK_ADDRESS);
+
/** Disallows InetAddressUtil instantiation. */
private InetAddressUtil() {}
- /**
- * Returns a string version of InetAddress which can be converted back to an
- * InetAddress later. Essentially any leading slash is trimmed.
+ /**
+ * Returns a string version of InetAddress which can be converted back to an InetAddress later.
+ * Essentially any leading slash is trimmed.
*
* @param val the InetAddress or String to return a formatted string of
* @return string version the InetAddress minus any leading slash
@@ -71,16 +68,15 @@ public class InetAddressUtil {
return trimLeadingSlash(val.toString());
}
}
-
- /**
- * Converts the string host to an instance of InetAddress. Returns null if
- * the string is empty. Fails Assertion if the conversion would result in
- * <code>java.lang.UnknownHostException</code>.
+
+ /**
+ * Converts the string host to an instance of InetAddress. Returns null if the string is empty.
+ * Fails Assertion if the conversion would result in <code>java.lang.UnknownHostException</code>.
* <p>
* Any leading slashes on host will be ignored.
*
- * @param host string version the InetAddress
- * @return the host converted to InetAddress instance
+ * @param host string version the InetAddress
+ * @return the host converted to InetAddress instance
*/
public static InetAddress toInetAddress(String host) {
if (host == null || host.length() == 0) {
@@ -89,8 +85,7 @@ public class InetAddressUtil {
try {
if (host.indexOf("/") > -1) {
return InetAddress.getByName(host.substring(host.indexOf("/") + 1));
- }
- else {
+ } else {
return InetAddress.getByName(host);
}
} catch (java.net.UnknownHostException e) {
@@ -100,10 +95,10 @@ public class InetAddressUtil {
}
}
- /**
- * Creates an InetAddress representing the local host. The checked exception
- * <code>java.lang.UnknownHostException</code> is captured and results in
- * an Assertion failure instead.
+ /**
+ * Creates an InetAddress representing the local host. The checked exception
+ * <code>java.lang.UnknownHostException</code> is captured and results in an Assertion failure
+ * instead.
*
* @return InetAddress instance representing the local host
*/
@@ -117,24 +112,24 @@ public class InetAddressUtil {
}
}
- /**
- * Validates the host by making sure it can successfully be used to get an
- * instance of InetAddress. If the host string is null, empty or would result
- * in <code>java.lang.UnknownHostException</code> then null is returned.
+ /**
+ * Validates the host by making sure it can successfully be used to get an instance of
+ * InetAddress. If the host string is null, empty or would result in
+ * <code>java.lang.UnknownHostException</code> then null is returned.
* <p>
* Any leading slashes on host will be ignored.
*
- * @param host string version the InetAddress
- * @return the host converted to InetAddress instance
+ * @param host string version the InetAddress
+ * @return the host converted to InetAddress instance
*/
public static String validateHost(String host) {
if (host == null || host.length() == 0) {
- return null;
+ return null;
}
try {
InetAddress.getByName(trimLeadingSlash(host));
return host;
- } catch (java.net.UnknownHostException e) {
+ } catch (java.net.UnknownHostException e) {
logStackTrace(e);
return null;
}
@@ -145,45 +140,45 @@ public class InetAddressUtil {
if (host instanceof InetAddress) {
if (LOCALHOST.equals(host)) {
return true;
- }
- else {
-// InetAddress hostAddr = (InetAddress)host;
+ } else {
+ // InetAddress hostAddr = (InetAddress)host;
try {
- Enumeration en=NetworkInterface.getNetworkInterfaces();
- while(en.hasMoreElements()) {
- NetworkInterface i=(NetworkInterface)en.nextElement();
- for(Enumeration en2=i.getInetAddresses(); en2.hasMoreElements();) {
- InetAddress addr=(InetAddress)en2.nextElement();
+ Enumeration en = NetworkInterface.getNetworkInterfaces();
+ while (en.hasMoreElements()) {
+ NetworkInterface i = (NetworkInterface) en.nextElement();
+ for (Enumeration en2 = i.getInetAddresses(); en2.hasMoreElements();) {
+ InetAddress addr = (InetAddress) en2.nextElement();
if (host.equals(addr)) {
return true;
}
}
}
return false;
- }
- catch (SocketException e) {
- throw new GemFireIOException(LocalizedStrings.InetAddressUtil_UNABLE_TO_QUERY_NETWORK_INTERFACE.toLocalizedString(), e);
+ } catch (SocketException e) {
+ throw new GemFireIOException(
+ LocalizedStrings.InetAddressUtil_UNABLE_TO_QUERY_NETWORK_INTERFACE
+ .toLocalizedString(),
+ e);
}
}
- }
- else {
+ } else {
return isLocalHost(InetAddressUtil.toInetAddress(host.toString()));
}
}
-
+
/** Returns true if host matches the LOOPBACK (127.0.0.1). */
public static boolean isLoopback(Object host) {
if (host instanceof InetAddress) {
return LOOPBACK.equals(host);
- }
- else {
+ } else {
return isLoopback(InetAddressUtil.toInetAddress(host.toString()));
}
}
-
+
/** Returns a version of the value after removing any leading slashes */
private static String trimLeadingSlash(String value) {
- if (value == null) return "";
+ if (value == null)
+ return "";
while (value.indexOf("/") > -1) {
value = value.substring(value.indexOf("/") + 1);
}
@@ -191,19 +186,16 @@ public class InetAddressUtil {
}
/**
- * Logs the stack trace for the given Throwable if logger is initialized else
- * prints the stack trace using System.out. If logged the logs are logged at
- * WARNING level.
+ * Logs the stack trace for the given Throwable if logger is initialized else prints the stack
+ * trace using System.out. If logged the logs are logged at WARNING level.
*
- * @param throwable
- * Throwable to log stack trace for
+ * @param throwable Throwable to log stack trace for
*/
private static void logStackTrace(Throwable throwable) {
- AdminDistributedSystemImpl adminDS =
- AdminDistributedSystemImpl.getConnectedInstance();
+ AdminDistributedSystemImpl adminDS = AdminDistributedSystemImpl.getConnectedInstance();
logger.warn(throwable.getMessage(), throwable);
- }
-
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java b/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java
index d963a21..6211aea 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/InternalManagedEntity.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -21,9 +19,8 @@ import org.apache.geode.admin.ManagedEntity;
import org.apache.geode.admin.ManagedEntityConfig;
/**
- * Provides internal-only functionality that is expected of all
- * <code>ManagedEntity<code>s. This functionality is used by the
- * {@link ManagedEntityController} to manage the entity.
+ * Provides internal-only functionality that is expected of all <code>ManagedEntity<code>s. This
+ * functionality is used by the {@link ManagedEntityController} to manage the entity.
*
* @since GemFire 4.0
*/
@@ -44,57 +41,51 @@ public interface InternalManagedEntity extends ManagedEntity {
/** A managed entity is running (is started) */
public static final int RUNNING = 14;
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Returns the <code>ManagedEntityConfig</code> for this
- * <code>ManagedEntity</code>.
+ * Returns the <code>ManagedEntityConfig</code> for this <code>ManagedEntity</code>.
*/
public ManagedEntityConfig getEntityConfig();
/**
- * Returns a brief description (such as "locator") of this managed
- * entity.
+ * Returns a brief description (such as "locator") of this managed entity.
*/
public String getEntityType();
/**
- * Returns the (local) command to execute in order to start this
- * managed entity. The command includes the full path to the
- * executable (include <code>$GEMFIRE/bin</code>) and any
- * command-line arguments. It does not take the {@linkplain
- * ManagedEntityConfig#getRemoteCommand remote command} into account.
+ * Returns the (local) command to execute in order to start this managed entity. The command
+ * includes the full path to the executable (include <code>$GEMFIRE/bin</code>) and any
+ * command-line arguments. It does not take the {@linkplain ManagedEntityConfig#getRemoteCommand
+ * remote command} into account.
*/
public String getStartCommand();
/**
- * Returns the (local) command to execute in order to stop this
- * managed entity.
+ * Returns the (local) command to execute in order to stop this managed entity.
*/
public String getStopCommand();
/**
- * Returns the (local) command to execute in order to determine
- * whether or not this managed entity is runing.
+ * Returns the (local) command to execute in order to determine whether or not this managed entity
+ * is runing.
*/
public String getIsRunningCommand();
/**
- * Returns a descriptive, one-word, unique id for a newly-created
- * <code>ManagedEntity</code>. This ensures that we do not have
- * collisions in the ids of entities.
+ * Returns a descriptive, one-word, unique id for a newly-created <code>ManagedEntity</code>. This
+ * ensures that we do not have collisions in the ids of entities.
*/
public String getNewId();
/**
- * Returns the distributed system to which this managed entity
- * belongs.
+ * Returns the distributed system to which this managed entity belongs.
*/
public AdminDistributedSystem getDistributedSystem();
/**
- * Sets the state of this managed entity and informs threads that
- * are waiting for a state change. See bug 32455.
+ * Sets the state of this managed entity and informs threads that are waiting for a state change.
+ * See bug 32455.
*
* @return The previous state of this managed entity.
*
[32/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/LogWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/LogWriter.java b/geode-core/src/main/java/org/apache/geode/LogWriter.java
index 17e23e0..242433f 100644
--- a/geode-core/src/main/java/org/apache/geode/LogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/LogWriter.java
@@ -1,18 +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
+ * 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;
@@ -23,278 +21,278 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.i18n.LogWriterI18n;
/**
- * Defines methods available to clients that want to write a log message
- * to their GemFire distributed system log file.
- * <p>
- * Instances of this interface can be obtained by calling
- * {@link DistributedSystem#getLogWriter}.
- * <p>
- * For any logged message the log file will contain:
- * <ul>
- * <li> The message's level.
- * <li> The time the message was logged.
- * <li> The id of the thread that logged the message.
- * <li> The message itself which can be a string and/or an exception
- * including the exception's stack trace.
- * </ul>
- * <p>
- * A message always has a level.
- * Logging levels are ordered. Enabling logging at a given level also
- * enables logging at higher levels. The higher the level the more
- * important and urgent the message.
- * <p>
- * The levels, in descending order, are:
- * <ul>
- * <li> <code>severe</code> (highest value) is a message level indicating a serious failure.
- * In general <code>severe</code> messages should describe events that
- * are of considerable importance and which will prevent normal program
- * execution. They should be reasonably intelligible to end users and
- * to information managers.
- * <li> <code>error</code>
- * In general <code>error</code> messages should describe events that
- * are of considerable importance but will not prevent normal program
- * execution. They should be reasonably intelligible to end users and
- * to information managers. They are weaker than <code>severe</code> and
- * stronger than <code>warning</code>.
- * <li> <code>warning</code> is a message level indicating a potential problem.
- * In general <code>warning</code> messages should describe events that
- * will be of interest to end users or information managers, or which indicate
- * potential problems.
- * <li> <code>info</code> is a message level for informational messages.
- * Typically <code>info</code> messages should be reasonably significant
- * and should make sense to end users and system administrators.
- * <li> <code>config</code> is a message level for static configuration messages.
- * <code>config</code> messages are intended to provide a variety of static
- * configuration information, to assist in debugging problems that may be
- * associated with particular configurations.
- * <li> <code>fine</code> is a message level providing tracing information.
- * In general the <code>fine</code> level should be used for information
- * that will be broadly interesting to developers. This level is for
- * the lowest volume, and most important, tracing messages.
- * <li> <code>finer</code> indicates a fairly detailed tracing message.
- * Logging calls for entering, returning, or throwing an exception
- * are traced at the <code>finer</code> level.
- * <li> <code>finest</code> (lowest value) indicates a highly detailed tracing message.
- * In general the <code>finest</code> level should be used for the most
- * voluminous detailed tracing messages.
- * </ul>
- * <p>
- * For each level methods exist that will request a message, at that
- * level, to be logged. These methods are all named after their level.
- * <p>
- * For each level a method exists that returns a boolean indicating
- * if messages at that level will currently be logged. The names
- * of these methods are of the form: <em>level</em><code>Enabled</code>.
- *
- */
+ * Defines methods available to clients that want to write a log message to their GemFire
+ * distributed system log file.
+ * <p>
+ * Instances of this interface can be obtained by calling {@link DistributedSystem#getLogWriter}.
+ * <p>
+ * For any logged message the log file will contain:
+ * <ul>
+ * <li>The message's level.
+ * <li>The time the message was logged.
+ * <li>The id of the thread that logged the message.
+ * <li>The message itself which can be a string and/or an exception including the exception's stack
+ * trace.
+ * </ul>
+ * <p>
+ * A message always has a level. Logging levels are ordered. Enabling logging at a given level also
+ * enables logging at higher levels. The higher the level the more important and urgent the message.
+ * <p>
+ * The levels, in descending order, are:
+ * <ul>
+ * <li><code>severe</code> (highest value) is a message level indicating a serious failure. In
+ * general <code>severe</code> messages should describe events that are of considerable importance
+ * and which will prevent normal program execution. They should be reasonably intelligible to end
+ * users and to information managers.
+ * <li><code>error</code> In general <code>error</code> messages should describe events that are of
+ * considerable importance but will not prevent normal program execution. They should be reasonably
+ * intelligible to end users and to information managers. They are weaker than <code>severe</code>
+ * and stronger than <code>warning</code>.
+ * <li><code>warning</code> is a message level indicating a potential problem. In general
+ * <code>warning</code> messages should describe events that will be of interest to end users or
+ * information managers, or which indicate potential problems.
+ * <li><code>info</code> is a message level for informational messages. Typically <code>info</code>
+ * messages should be reasonably significant and should make sense to end users and system
+ * administrators.
+ * <li><code>config</code> is a message level for static configuration messages. <code>config</code>
+ * messages are intended to provide a variety of static configuration information, to assist in
+ * debugging problems that may be associated with particular configurations.
+ * <li><code>fine</code> is a message level providing tracing information. In general the
+ * <code>fine</code> level should be used for information that will be broadly interesting to
+ * developers. This level is for the lowest volume, and most important, tracing messages.
+ * <li><code>finer</code> indicates a fairly detailed tracing message. Logging calls for entering,
+ * returning, or throwing an exception are traced at the <code>finer</code> level.
+ * <li><code>finest</code> (lowest value) indicates a highly detailed tracing message. In general
+ * the <code>finest</code> level should be used for the most voluminous detailed tracing messages.
+ * </ul>
+ * <p>
+ * For each level methods exist that will request a message, at that level, to be logged. These
+ * methods are all named after their level.
+ * <p>
+ * For each level a method exists that returns a boolean indicating if messages at that level will
+ * currently be logged. The names of these methods are of the form:
+ * <em>level</em><code>Enabled</code>.
+ *
+ */
public interface LogWriter {
-
- /**
- * Returns true if "severe" log messages are enabled.
- * Returns false if "severe" log messages are disabled.
- */
- public boolean severeEnabled();
- /**
- * Writes both a message and exception to this writer.
- * The message level is "severe".
- */
- public void severe(String msg, Throwable ex);
- /**
- * Writes a message to this writer.
- * The message level is "severe".
- */
- public void severe(String msg);
- /**
- * Writes an exception to this writer.
- * The exception level is "severe".
- */
- public void severe(Throwable ex);
- /**
- * Returns true if "error" log messages are enabled.
- * Returns false if "error" log messages are disabled.
- */
- public boolean errorEnabled();
- /**
- * Writes both a message and exception to this writer.
- * The message level is "error".
- */
- public void error(String msg, Throwable ex);
- /**
- * Writes a message to this writer.
- * The message level is "error".
- */
- public void error(String msg);
- /**
- * Writes an exception to this writer.
- * The exception level is "error".
- */
- public void error(Throwable ex);
- /**
- * Returns true if "warning" log messages are enabled.
- * Returns false if "warning" log messages are disabled.
- */
- public boolean warningEnabled();
- /**
- * Writes both a message and exception to this writer.
- * The message level is "warning".
- */
- public void warning(String msg, Throwable ex);
- /**
- * Writes a message to this writer.
- * The message level is "warning".
- */
- public void warning(String msg);
- /**
- * Writes an exception to this writer.
- * The exception level is "warning".
- */
- public void warning(Throwable ex);
- /**
- * Returns true if "info" log messages are enabled.
- * Returns false if "info" log messages are disabled.
- */
- public boolean infoEnabled();
- /**
- * Writes both a message and exception to this writer.
- * The message level is "information".
- */
- public void info(String msg, Throwable ex);
- /**
- * Writes a message to this writer.
- * The message level is "information".
- */
- public void info(String msg);
- /**
- * Writes an exception to this writer.
- * The exception level is "information".
- */
- public void info(Throwable ex);
- /**
- * Returns true if "config" log messages are enabled.
- * Returns false if "config" log messages are disabled.
- */
- public boolean configEnabled();
- /**
- * Writes both a message and exception to this writer.
- * The message level is "config".
- */
- public void config(String msg, Throwable ex);
- /**
- * Writes a message to this writer.
- * The message level is "config".
- */
- public void config(String msg);
- /**
- * Writes an exception to this writer.
- * The exception level is "config".
- */
- public void config(Throwable ex);
- /**
- * Returns true if "fine" log messages are enabled.
- * Returns false if "fine" log messages are disabled.
- */
- public boolean fineEnabled();
- /**
- * Writes both a message and exception to this writer.
- * The message level is "fine".
- */
- public void fine(String msg, Throwable ex);
- /**
- * Writes a message to this writer.
- * The message level is "fine".
- */
- public void fine(String msg);
- /**
- * Writes an exception to this writer.
- * The exception level is "fine".
- */
- public void fine(Throwable ex);
- /**
- * Returns true if "finer" log messages are enabled.
- * Returns false if "finer" log messages are disabled.
- */
- public boolean finerEnabled();
- /**
- * Writes both a message and exception to this writer.
- * The message level is "finer".
- */
- public void finer(String msg, Throwable ex);
- /**
- * Writes a message to this writer.
- * The message level is "finer".
- */
- public void finer(String msg);
- /**
- * Writes an exception to this writer.
- * The exception level is "finer".
- */
- public void finer(Throwable ex);
- /**
- * Log a method entry.
- * <p>The logging is done using the <code>finer</code> level.
- * The string message will start with <code>"ENTRY"</code> and
- * include the class and method names.
- * @param sourceClass Name of class that issued the logging request.
- * @param sourceMethod Name of the method that issued the logging request.
- */
- public void entering(String sourceClass, String sourceMethod);
- /**
- * Log a method return.
- * <p>The logging is done using the <code>finer</code> level.
- * The string message will start with <code>"RETURN"</code> and
- * include the class and method names.
- * @param sourceClass Name of class that issued the logging request.
- * @param sourceMethod Name of the method that issued the logging request.
- */
- public void exiting(String sourceClass, String sourceMethod);
- /**
- * Log throwing an exception.
- * <p> Use to log that a method is
- * terminating by throwing an exception. The logging is done using
- * the <code>finer</code> level.
- * <p> This is a convenience method that could be done
- * instead by calling {@link #finer(String, Throwable)}.
- * The string message will start with <code>"THROW"</code> and
- * include the class and method names.
- * @param sourceClass Name of class that issued the logging request.
- * @param sourceMethod Name of the method that issued the logging request.
- * @param thrown The Throwable that is being thrown.
- */
- public void throwing(String sourceClass, String sourceMethod,
- Throwable thrown);
- /**
- * Returns true if "finest" log messages are enabled.
- * Returns false if "finest" log messages are disabled.
- */
- public boolean finestEnabled();
- /**
- * Writes both a message and exception to this writer.
- * The message level is "finest".
- */
- public void finest(String msg, Throwable ex);
- /**
- * Writes a message to this writer.
- * The message level is "finest".
- */
- public void finest(String msg);
- /**
- * Writes an exception to this writer.
- * The exception level is "finest".
- */
- public void finest(Throwable ex);
-
- /**
- * Returns a 1.4 logging handler that can be used to direct application
- * output to this GemFire logger using the standard JDK logger APIs.
- * Each time this method is called it creates a new instance of a
- * Handler so care should be taken to not call this method too often.
- */
- public Handler getHandler();
-
- /**
- * A mechanism for accessing the abstraction layer used for
- * internationalization.
- * @return LogWriterI18n
- */
- public LogWriterI18n convertToLogWriterI18n();
+
+ /**
+ * Returns true if "severe" log messages are enabled. Returns false if "severe" log messages are
+ * disabled.
+ */
+ public boolean severeEnabled();
+
+ /**
+ * Writes both a message and exception to this writer. The message level is "severe".
+ */
+ public void severe(String msg, Throwable ex);
+
+ /**
+ * Writes a message to this writer. The message level is "severe".
+ */
+ public void severe(String msg);
+
+ /**
+ * Writes an exception to this writer. The exception level is "severe".
+ */
+ public void severe(Throwable ex);
+
+ /**
+ * Returns true if "error" log messages are enabled. Returns false if "error" log messages are
+ * disabled.
+ */
+ public boolean errorEnabled();
+
+ /**
+ * Writes both a message and exception to this writer. The message level is "error".
+ */
+ public void error(String msg, Throwable ex);
+
+ /**
+ * Writes a message to this writer. The message level is "error".
+ */
+ public void error(String msg);
+
+ /**
+ * Writes an exception to this writer. The exception level is "error".
+ */
+ public void error(Throwable ex);
+
+ /**
+ * Returns true if "warning" log messages are enabled. Returns false if "warning" log messages are
+ * disabled.
+ */
+ public boolean warningEnabled();
+
+ /**
+ * Writes both a message and exception to this writer. The message level is "warning".
+ */
+ public void warning(String msg, Throwable ex);
+
+ /**
+ * Writes a message to this writer. The message level is "warning".
+ */
+ public void warning(String msg);
+
+ /**
+ * Writes an exception to this writer. The exception level is "warning".
+ */
+ public void warning(Throwable ex);
+
+ /**
+ * Returns true if "info" log messages are enabled. Returns false if "info" log messages are
+ * disabled.
+ */
+ public boolean infoEnabled();
+
+ /**
+ * Writes both a message and exception to this writer. The message level is "information".
+ */
+ public void info(String msg, Throwable ex);
+
+ /**
+ * Writes a message to this writer. The message level is "information".
+ */
+ public void info(String msg);
+
+ /**
+ * Writes an exception to this writer. The exception level is "information".
+ */
+ public void info(Throwable ex);
+
+ /**
+ * Returns true if "config" log messages are enabled. Returns false if "config" log messages are
+ * disabled.
+ */
+ public boolean configEnabled();
+
+ /**
+ * Writes both a message and exception to this writer. The message level is "config".
+ */
+ public void config(String msg, Throwable ex);
+
+ /**
+ * Writes a message to this writer. The message level is "config".
+ */
+ public void config(String msg);
+
+ /**
+ * Writes an exception to this writer. The exception level is "config".
+ */
+ public void config(Throwable ex);
+
+ /**
+ * Returns true if "fine" log messages are enabled. Returns false if "fine" log messages are
+ * disabled.
+ */
+ public boolean fineEnabled();
+
+ /**
+ * Writes both a message and exception to this writer. The message level is "fine".
+ */
+ public void fine(String msg, Throwable ex);
+
+ /**
+ * Writes a message to this writer. The message level is "fine".
+ */
+ public void fine(String msg);
+
+ /**
+ * Writes an exception to this writer. The exception level is "fine".
+ */
+ public void fine(Throwable ex);
+
+ /**
+ * Returns true if "finer" log messages are enabled. Returns false if "finer" log messages are
+ * disabled.
+ */
+ public boolean finerEnabled();
+
+ /**
+ * Writes both a message and exception to this writer. The message level is "finer".
+ */
+ public void finer(String msg, Throwable ex);
+
+ /**
+ * Writes a message to this writer. The message level is "finer".
+ */
+ public void finer(String msg);
+
+ /**
+ * Writes an exception to this writer. The exception level is "finer".
+ */
+ public void finer(Throwable ex);
+
+ /**
+ * Log a method entry.
+ * <p>
+ * The logging is done using the <code>finer</code> level. The string message will start with
+ * <code>"ENTRY"</code> and include the class and method names.
+ *
+ * @param sourceClass Name of class that issued the logging request.
+ * @param sourceMethod Name of the method that issued the logging request.
+ */
+ public void entering(String sourceClass, String sourceMethod);
+
+ /**
+ * Log a method return.
+ * <p>
+ * The logging is done using the <code>finer</code> level. The string message will start with
+ * <code>"RETURN"</code> and include the class and method names.
+ *
+ * @param sourceClass Name of class that issued the logging request.
+ * @param sourceMethod Name of the method that issued the logging request.
+ */
+ public void exiting(String sourceClass, String sourceMethod);
+
+ /**
+ * Log throwing an exception.
+ * <p>
+ * Use to log that a method is terminating by throwing an exception. The logging is done using the
+ * <code>finer</code> level.
+ * <p>
+ * This is a convenience method that could be done instead by calling
+ * {@link #finer(String, Throwable)}. The string message will start with <code>"THROW"</code> and
+ * include the class and method names.
+ *
+ * @param sourceClass Name of class that issued the logging request.
+ * @param sourceMethod Name of the method that issued the logging request.
+ * @param thrown The Throwable that is being thrown.
+ */
+ public void throwing(String sourceClass, String sourceMethod, Throwable thrown);
+
+ /**
+ * Returns true if "finest" log messages are enabled. Returns false if "finest" log messages are
+ * disabled.
+ */
+ public boolean finestEnabled();
+
+ /**
+ * Writes both a message and exception to this writer. The message level is "finest".
+ */
+ public void finest(String msg, Throwable ex);
+
+ /**
+ * Writes a message to this writer. The message level is "finest".
+ */
+ public void finest(String msg);
+
+ /**
+ * Writes an exception to this writer. The exception level is "finest".
+ */
+ public void finest(Throwable ex);
+
+ /**
+ * Returns a 1.4 logging handler that can be used to direct application output to this GemFire
+ * logger using the standard JDK logger APIs. Each time this method is called it creates a new
+ * instance of a Handler so care should be taken to not call this method too often.
+ */
+ public Handler getHandler();
+
+ /**
+ * A mechanism for accessing the abstraction layer used for internationalization.
+ *
+ * @return LogWriterI18n
+ */
+ public LogWriterI18n convertToLogWriterI18n();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/NoSystemException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/NoSystemException.java b/geode-core/src/main/java/org/apache/geode/NoSystemException.java
index 215e157..07b3c0e 100644
--- a/geode-core/src/main/java/org/apache/geode/NoSystemException.java
+++ b/geode-core/src/main/java/org/apache/geode/NoSystemException.java
@@ -1,36 +1,33 @@
/*
- * 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
+ * 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;
/**
- * A <code>NoSystemException</code> is thrown when a
- * locator can not be found or connected to.
- * In most cases one of the following subclasses is used instead
- * of <code>NoSystemException</code>:
+ * A <code>NoSystemException</code> is thrown when a locator can not be found or connected to. In
+ * most cases one of the following subclasses is used instead of <code>NoSystemException</code>:
* <ul>
- * <li> {@link UncreatedSystemException}
- * <li> {@link UnstartedSystemException}
+ * <li>{@link UncreatedSystemException}
+ * <li>{@link UnstartedSystemException}
* </ul>
- * <p>As of GemFire 5.0 this exception should be named NoLocatorException.
+ * <p>
+ * As of GemFire 5.0 this exception should be named NoLocatorException.
*/
public class NoSystemException extends GemFireException {
-private static final long serialVersionUID = -101890149467219630L;
+ private static final long serialVersionUID = -101890149467219630L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>NoSystemException</code>.
@@ -38,11 +35,11 @@ private static final long serialVersionUID = -101890149467219630L;
public NoSystemException(String message) {
super(message);
}
+
/**
- * Creates a new <code>NoSystemException</code> with the given message
- * and cause.
+ * Creates a new <code>NoSystemException</code> with the given message and cause.
*/
public NoSystemException(String message, Throwable cause) {
- super(message, cause);
+ super(message, cause);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java b/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
index 2dc105c..323cd84 100755
--- a/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
+++ b/geode-core/src/main/java/org/apache/geode/OutOfOffHeapMemoryException.java
@@ -1,25 +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
+ * 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;
/**
- * Indicates that attempts to allocate more objects in off-heap memory has
- * failed and the Cache will be closed to prevent it from losing distributed
- * consistency.
+ * Indicates that attempts to allocate more objects in off-heap memory has failed and the Cache will
+ * be closed to prevent it from losing distributed consistency.
*
*/
public class OutOfOffHeapMemoryException extends CancelException {
@@ -28,14 +25,12 @@ public class OutOfOffHeapMemoryException extends CancelException {
/**
* Constructs an <code>OutOfOffHeapMemoryError</code> with no detail message.
*/
- public OutOfOffHeapMemoryException() {
- }
+ public OutOfOffHeapMemoryException() {}
/**
- * Constructs an <code>OutOfOffHeapMemoryError</code> with the specified
- * detail message.
+ * Constructs an <code>OutOfOffHeapMemoryError</code> with the specified detail message.
*
- * @param message the detail message.
+ * @param message the detail message.
*/
public OutOfOffHeapMemoryException(String message) {
super(message);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/SerializationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/SerializationException.java b/geode-core/src/main/java/org/apache/geode/SerializationException.java
index 592ff38..4e82b26 100644
--- a/geode-core/src/main/java/org/apache/geode/SerializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/SerializationException.java
@@ -1,18 +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
+ * 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;
@@ -20,13 +18,16 @@ import org.apache.geode.GemFireIOException;
/**
* An exception indicating that a serialization or deserialization failed.
+ *
* @since GemFire 5.7
*/
public class SerializationException extends GemFireIOException {
-private static final long serialVersionUID = 7783018024920098997L;
+ private static final long serialVersionUID = 7783018024920098997L;
+
/**
*
* Create a new instance of SerializationException with a detail message
+ *
* @param message the detail message
*/
public SerializationException(String message) {
@@ -35,6 +36,7 @@ private static final long serialVersionUID = 7783018024920098997L;
/**
* Create a new instance of SerializationException with a detail message and cause
+ *
* @param message the detail message
* @param cause the cause
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java b/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
index 010565c..fba2878 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticDescriptor.java
@@ -1,32 +1,28 @@
/*
- * 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
+ * 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;
-//import org.apache.geode.internal.Assert;
-//import org.apache.geode.internal.FieldInfo;
+// import org.apache.geode.internal.Assert;
+// import org.apache.geode.internal.FieldInfo;
/**
- * Describes an individual statistic whose value is updated by an
- * application and may be archived by GemFire. These descriptions are
- * gathered together in a {@link StatisticsType}.
+ * Describes an individual statistic whose value is updated by an application and may be archived by
+ * GemFire. These descriptions are gathered together in a {@link StatisticsType}.
*
* <P>
- * To get an instance of this interface use an instance of
- * {@link StatisticsFactory}.
+ * To get an instance of this interface use an instance of {@link StatisticsFactory}.
* <P>
* <code>StatisticDescriptor</code>s are naturally ordered by their name.
*
@@ -35,15 +31,13 @@ package org.apache.geode;
*/
public interface StatisticDescriptor extends Comparable<StatisticDescriptor> {
- //////////////////// Instance Methods ////////////////////
+ //////////////////// Instance Methods ////////////////////
/**
- * Returns the id of this statistic in a {@link StatisticsType
- * statistics type}. The id is initialized when its statistics
- * type is created.
+ * Returns the id of this statistic in a {@link StatisticsType statistics type}. The id is
+ * initialized when its statistics type is created.
*
- * @throws IllegalStateException
- * The id has not been initialized yet
+ * @throws IllegalStateException The id has not been initialized yet
*/
public int getId();
@@ -63,9 +57,8 @@ public interface StatisticDescriptor extends Comparable<StatisticDescriptor> {
public Class<?> getType();
/**
- * Returns true if this statistic is a counter; false if its a gauge.
- * Counter statistics have values that always increase.
- * Gauge statistics have unconstrained values.
+ * Returns true if this statistic is a counter; false if its a gauge. Counter statistics have
+ * values that always increase. Gauge statistics have unconstrained values.
*/
public boolean isCounter();
@@ -73,6 +66,7 @@ public interface StatisticDescriptor extends Comparable<StatisticDescriptor> {
* Returns true if a larger statistic value indicates better performance.
*/
public boolean isLargerBetter();
+
/**
* Returns the unit in which this statistic is measured
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/Statistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/Statistics.java b/geode-core/src/main/java/org/apache/geode/Statistics.java
index b8ffc06..cd37648 100644
--- a/geode-core/src/main/java/org/apache/geode/Statistics.java
+++ b/geode-core/src/main/java/org/apache/geode/Statistics.java
@@ -1,51 +1,45 @@
/*
- * 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
+ * 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;
-//import org.apache.geode.distributed.DistributedSystem;
+// import org.apache.geode.distributed.DistributedSystem;
import java.util.function.DoubleSupplier;
import java.util.function.IntSupplier;
import java.util.function.LongSupplier;
/**
- * Instances of this interface maintain the values of various application-defined
- * statistics. The statistics themselves are described by an instance
- * of {@link StatisticsType}.
+ * Instances of this interface maintain the values of various application-defined statistics. The
+ * statistics themselves are described by an instance of {@link StatisticsType}.
*
* <P>
- * To get an instance of this interface use an instance of
- * {@link StatisticsFactory}.
+ * To get an instance of this interface use an instance of {@link StatisticsFactory}.
* <P>
*
- * For improved performance, each statistic may be referred to by
- * its {@link #nameToDescriptor descriptor}.
+ * For improved performance, each statistic may be referred to by its {@link #nameToDescriptor
+ * descriptor}.
* <P>
- * For optimal performance, each statistic may be referred to by
- * its {@link #nameToId id} in the statistics object. Note that
- * ids can not be mapped back to their name and methods that take ids
- * are unsafe. It is important to call the correct type of method
- * for the given id. For example if your stat is a long then incLong
- * must be called instead of incInt.
- * <p>Note that as of the 5.1 release the <code>incInt</code>,
- * <code>incLong</code>, and <code>incDouble</code> methods no longer
- * return the new value of the statistic. They now return <code>void</code>.
- * This incompatible change was made
- * to allow for a more efficient concurrent increment implementation.
+ * For optimal performance, each statistic may be referred to by its {@link #nameToId id} in the
+ * statistics object. Note that ids can not be mapped back to their name and methods that take ids
+ * are unsafe. It is important to call the correct type of method for the given id. For example if
+ * your stat is a long then incLong must be called instead of incInt.
+ * <p>
+ * Note that as of the 5.1 release the <code>incInt</code>, <code>incLong</code>, and
+ * <code>incDouble</code> methods no longer return the new value of the statistic. They now return
+ * <code>void</code>. This incompatible change was made to allow for a more efficient concurrent
+ * increment implementation.
* <P>
*
* @see <A href="package-summary.html#statistics">Package introduction</A>
@@ -57,35 +51,30 @@ import java.util.function.LongSupplier;
public interface Statistics {
/**
- * Closes these statistics. After statistics have been closed, they
- * are no longer archived.
- * A value access on a closed statistics always results in zero.
- * A value modification on a closed statistics is ignored.
+ * Closes these statistics. After statistics have been closed, they are no longer archived. A
+ * value access on a closed statistics always results in zero. A value modification on a closed
+ * statistics is ignored.
*/
public void close();
- //////////////////////// accessor Methods ///////////////////////
+ //////////////////////// accessor Methods ///////////////////////
/**
- * Returns the id of the statistic with the given name in this
- * statistics instance.
+ * Returns the id of the statistic with the given name in this statistics instance.
*
- * @throws IllegalArgumentException
- * No statistic named <code>name</code> exists in this
- * statistics instance.
+ * @throws IllegalArgumentException No statistic named <code>name</code> exists in this statistics
+ * instance.
*
* @see StatisticsType#nameToId
*/
public int nameToId(String name);
-
+
/**
- * Returns the descriptor of the statistic with the given name in this
- * statistics instance.
+ * Returns the descriptor of the statistic with the given name in this statistics instance.
*
- * @throws IllegalArgumentException
- * No statistic named <code>name</code> exists in this
- * statistics instance.
+ * @throws IllegalArgumentException No statistic named <code>name</code> exists in this statistics
+ * instance.
*
* @see StatisticsType#nameToDescriptor
*/
@@ -100,160 +89,139 @@ public interface Statistics {
* Gets the {@link StatisticsType} of this instance.
*/
public StatisticsType getType();
+
/**
* Gets the text associated with this instance that helps identify it.
*/
public String getTextId();
+
/**
* Gets the number associated with this instance that helps identify it.
*/
public long getNumericId();
+
/**
- * Returns true if modifications are atomic. This means that multiple threads,
- * can safely modify this instance without extra synchronization.
+ * Returns true if modifications are atomic. This means that multiple threads, can safely modify
+ * this instance without extra synchronization.
* <p>
- * Returns false if modifications are not atomic. This means that modifications
- * to this instance are cheaper but not thread safe.
+ * Returns false if modifications are not atomic. This means that modifications to this instance
+ * are cheaper but not thread safe.
*/
public boolean isAtomic();
+
/**
* Returns true if the instance has been {@link #close closed}.
*/
public boolean isClosed();
-
- //////////////////////// set() Methods ///////////////////////
+
+ //////////////////////// set() Methods ///////////////////////
/**
- * Sets the value of a statistic with the given <code>id</code>
- * whose type is <code>int</code>.
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
+ * Sets the value of a statistic with the given <code>id</code> whose type is <code>int</code>.
+ *
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
*
- * @throws ArrayIndexOutOfBoundsException
- * If the id is invalid.
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
*/
public void setInt(int id, int value);
/**
* Sets the value of a named statistic of type <code>int</code>
*
- * @throws IllegalArgumentException
- * If no statistic exists named <code>name</code> or
- * if the statistic with name <code>name</code> is not of
- * type <code>int</code>.
+ * @throws IllegalArgumentException If no statistic exists named <code>name</code> or if the
+ * statistic with name <code>name</code> is not of type <code>int</code>.
*/
public void setInt(String name, int value);
/**
* Sets the value of a described statistic of type <code>int</code>
*
- * @throws IllegalArgumentException
- * If no statistic exists for the given <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>int</code>.
+ * @throws IllegalArgumentException If no statistic exists for the given <code>descriptor</code>
+ * or if the described statistic is not of type <code>int</code>.
*/
public void setInt(StatisticDescriptor descriptor, int value);
/**
- * Sets the value of a statistic with the given <code>id</code>
- * whose type is <code>long</code>.
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
+ * Sets the value of a statistic with the given <code>id</code> whose type is <code>long</code>.
+ *
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
*
- * @throws ArrayIndexOutOfBoundsException
- * If the id is invalid.
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
*/
public void setLong(int id, long value);
/**
* Sets the value of a described statistic of type <code>long</code>
*
- * @throws IllegalArgumentException
- * If no statistic exists for the given <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>long</code>.
+ * @throws IllegalArgumentException If no statistic exists for the given <code>descriptor</code>
+ * or if the described statistic is not of type <code>long</code>.
*/
public void setLong(StatisticDescriptor descriptor, long value);
/**
* Sets the value of a named statistic of type <code>long</code>.
*
- * @throws IllegalArgumentException
- * If no statistic exists named <code>name</code> or
- * if the statistic with name <code>name</code> is not of
- * type <code>long</code>.
+ * @throws IllegalArgumentException If no statistic exists named <code>name</code> or if the
+ * statistic with name <code>name</code> is not of type <code>long</code>.
*/
public void setLong(String name, long value);
/**
- * Sets the value of a statistic with the given <code>id</code>
- * whose type is <code>double</code>.
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
+ * Sets the value of a statistic with the given <code>id</code> whose type is <code>double</code>.
+ *
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
*
- * @throws ArrayIndexOutOfBoundsException
- * If the id is invalid.
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
*/
public void setDouble(int id, double value);
/**
* Sets the value of a described statistic of type <code>double</code>
*
- * @throws IllegalArgumentException
- * If no statistic exists for the given <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>double</code>.
+ * @throws IllegalArgumentException If no statistic exists for the given <code>descriptor</code>
+ * or if the described statistic is not of type <code>double</code>.
*/
public void setDouble(StatisticDescriptor descriptor, double value);
+
/**
* Sets the value of a named statistic of type <code>double</code>.
*
- * @throws IllegalArgumentException
- * If no statistic exists named <code>name</code> or
- * if the statistic with name <code>name</code> is not of
- * type <code>double</code>.
+ * @throws IllegalArgumentException If no statistic exists named <code>name</code> or if the
+ * statistic with name <code>name</code> is not of type <code>double</code>.
*/
public void setDouble(String name, double value);
- /////////////////////// get() Methods ///////////////////////
+ /////////////////////// get() Methods ///////////////////////
/**
* Returns the value of the identified statistic of type <code>int</code>.
*
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
- * @throws ArrayIndexOutOfBoundsException
- * If the id is invalid.
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
*/
public int getInt(int id);
/**
* Returns the value of the described statistic of type <code>int</code>.
*
- * @throws IllegalArgumentException
- * If no statistic exists with the specified <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>int</code>.
+ * @throws IllegalArgumentException If no statistic exists with the specified
+ * <code>descriptor</code> or if the described statistic is not of type <code>int</code>.
*/
public int getInt(StatisticDescriptor descriptor);
+
/**
- * Returns the value of the statistic of type <code>int</code> at
- * the given name.
+ * Returns the value of the statistic of type <code>int</code> at the given name.
*
- * @throws IllegalArgumentException
- * If no statistic exists with name <code>name</code> or
- * if the statistic named <code>name</code> is not of
- * type <code>int</code>.
+ * @throws IllegalArgumentException If no statistic exists with name <code>name</code> or if the
+ * statistic named <code>name</code> is not of type <code>int</code>.
*/
public int getInt(String name);
/**
* Returns the value of the identified statistic of type <code>long</code>.
*
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
- * @throws ArrayIndexOutOfBoundsException
- * If the id is invalid.
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
*/
public long getLong(int id);
@@ -261,426 +229,387 @@ public interface Statistics {
/**
* Returns the value of the described statistic of type <code>long</code>.
*
- * @throws IllegalArgumentException
- * If no statistic exists with the specified <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>long</code>.
+ * @throws IllegalArgumentException If no statistic exists with the specified
+ * <code>descriptor</code> or if the described statistic is not of type <code>long</code>.
*/
public long getLong(StatisticDescriptor descriptor);
+
/**
- * Returns the value of the statistic of type <code>long</code> at
- * the given name.
+ * Returns the value of the statistic of type <code>long</code> at the given name.
*
- * @throws IllegalArgumentException
- * If no statistic exists with name <code>name</code> or
- * if the statistic named <code>name</code> is not of
- * type <code>long</code>.
+ * @throws IllegalArgumentException If no statistic exists with name <code>name</code> or if the
+ * statistic named <code>name</code> is not of type <code>long</code>.
*/
public long getLong(String name);
/**
* Returns the value of the identified statistic of type <code>double</code>.
*
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
- * @throws ArrayIndexOutOfBoundsException
- * If the id is invalid.
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
*/
public double getDouble(int id);
/**
* Returns the value of the described statistic of type <code>double</code>.
*
- * @throws IllegalArgumentException
- * If no statistic exists with the specified <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>double</code>.
+ * @throws IllegalArgumentException If no statistic exists with the specified
+ * <code>descriptor</code> or if the described statistic is not of type
+ * <code>double</code>.
*/
public double getDouble(StatisticDescriptor descriptor);
+
/**
- * Returns the value of the statistic of type <code>double</code> at
- * the given name.
+ * Returns the value of the statistic of type <code>double</code> at the given name.
*
- * @throws IllegalArgumentException
- * If no statistic exists with name <code>name</code> or
- * if the statistic named <code>name</code> is not of
- * type <code>double</code>.
+ * @throws IllegalArgumentException If no statistic exists with name <code>name</code> or if the
+ * statistic named <code>name</code> is not of type <code>double</code>.
*/
public double getDouble(String name);
/**
* Returns the value of the identified statistic.
*
- * @param descriptor a statistic descriptor obtained with {@link #nameToDescriptor}
- * or {@link StatisticsType#nameToDescriptor}.
- * @throws IllegalArgumentException
- * If the described statistic does not exist
+ * @param descriptor a statistic descriptor obtained with {@link #nameToDescriptor} or
+ * {@link StatisticsType#nameToDescriptor}.
+ * @throws IllegalArgumentException If the described statistic does not exist
*/
public Number get(StatisticDescriptor descriptor);
/**
* Returns the value of the named statistic.
*
- * @throws IllegalArgumentException
- * If the named statistic does not exist
+ * @throws IllegalArgumentException If the named statistic does not exist
*/
public Number get(String name);
/**
* Returns the bits that represent the raw value of the described statistic.
*
- * @param descriptor a statistic descriptor obtained with {@link #nameToDescriptor}
- * or {@link StatisticsType#nameToDescriptor}.
- * @throws IllegalArgumentException
- * If the described statistic does not exist
+ * @param descriptor a statistic descriptor obtained with {@link #nameToDescriptor} or
+ * {@link StatisticsType#nameToDescriptor}.
+ * @throws IllegalArgumentException If the described statistic does not exist
*/
public long getRawBits(StatisticDescriptor descriptor);
/**
* Returns the bits that represent the raw value of the named statistic.
*
- * @throws IllegalArgumentException
- * If the named statistic does not exist
+ * @throws IllegalArgumentException If the named statistic does not exist
*/
public long getRawBits(String name);
- //////////////////////// inc() Methods ////////////////////////
+ //////////////////////// inc() Methods ////////////////////////
/**
- * Increments the value of the identified statistic of type <code>int</code>
- * by the given amount.
+ * Increments the value of the identified statistic of type <code>int</code> by the given amount.
*
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
*
- * @throws ArrayIndexOutOfBoundsException
- * If the id is invalid.
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
*/
public void incInt(int id, int delta);
/**
- * Increments the value of the described statistic of type <code>int</code>
- * by the given amount.
+ * Increments the value of the described statistic of type <code>int</code> by the given amount.
*
- * @throws IllegalArgumentException
- * If no statistic exists with the given <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>int</code>.
+ * @throws IllegalArgumentException If no statistic exists with the given <code>descriptor</code>
+ * or if the described statistic is not of type <code>int</code>.
*/
public void incInt(StatisticDescriptor descriptor, int delta);
/**
- * Increments the value of the statistic of type <code>int</code> with
- * the given name by a given amount.
+ * Increments the value of the statistic of type <code>int</code> with the given name by a given
+ * amount.
*
- * @throws IllegalArgumentException
- * If no statistic exists with name <code>name</code> or
- * if the statistic named <code>name</code> is not of
- * type <code>int</code>.
+ * @throws IllegalArgumentException If no statistic exists with name <code>name</code> or if the
+ * statistic named <code>name</code> is not of type <code>int</code>.
*/
public void incInt(String name, int delta);
/**
- * Increments the value of the identified statistic of type <code>long</code>
- * by the given amount.
+ * Increments the value of the identified statistic of type <code>long</code> by the given amount.
*
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
*
- * @throws ArrayIndexOutOfBoundsException
- * If the id is invalid.
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
*/
public void incLong(int id, long delta);
/**
- * Increments the value of the described statistic of type <code>long</code>
- * by the given amount.
+ * Increments the value of the described statistic of type <code>long</code> by the given amount.
*
- * @throws IllegalArgumentException
- * If no statistic exists with the given <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>long</code>.
+ * @throws IllegalArgumentException If no statistic exists with the given <code>descriptor</code>
+ * or if the described statistic is not of type <code>long</code>.
*/
public void incLong(StatisticDescriptor descriptor, long delta);
+
/**
- * Increments the value of the statistic of type <code>long</code> with
- * the given name by a given amount.
+ * Increments the value of the statistic of type <code>long</code> with the given name by a given
+ * amount.
*
- * @throws IllegalArgumentException
- * If no statistic exists with name <code>name</code> or
- * if the statistic named <code>name</code> is not of
- * type <code>long</code>.
+ * @throws IllegalArgumentException If no statistic exists with name <code>name</code> or if the
+ * statistic named <code>name</code> is not of type <code>long</code>.
*/
public void incLong(String name, long delta);
/**
- * Increments the value of the identified statistic of type <code>double</code>
- * by the given amount.
+ * Increments the value of the identified statistic of type <code>double</code> by the given
+ * amount.
*
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
*
- * @throws ArrayIndexOutOfBoundsException
- * If the id is invalid.
+ * @throws ArrayIndexOutOfBoundsException If the id is invalid.
*/
public void incDouble(int id, double delta);
/**
- * Increments the value of the described statistic of type <code>double</code>
- * by the given amount.
+ * Increments the value of the described statistic of type <code>double</code> by the given
+ * amount.
*
- * @throws IllegalArgumentException
- * If no statistic exists with the given <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>double</code>.
+ * @throws IllegalArgumentException If no statistic exists with the given <code>descriptor</code>
+ * or if the described statistic is not of type <code>double</code>.
*/
public void incDouble(StatisticDescriptor descriptor, double delta);
+
/**
- * Increments the value of the statistic of type <code>double</code> with
- * the given name by a given amount.
+ * Increments the value of the statistic of type <code>double</code> with the given name by a
+ * given amount.
*
- * @throws IllegalArgumentException
- * If no statistic exists with name <code>name</code> or
- * if the statistic named <code>name</code> is not of
- * type <code>double</code>.
+ * @throws IllegalArgumentException If no statistic exists with name <code>name</code> or if the
+ * statistic named <code>name</code> is not of type <code>double</code>.
*/
public void incDouble(String name, double delta);
/**
- * Provide a callback to compute the value of this statistic
- * every sample interval and use that as the value of the stat.
+ * Provide a callback to compute the value of this statistic every sample interval and use that as
+ * the value of the stat.
* <p>
- * The callback should return quickly because it is invoked on a shared thread.
- * It should not do any expensive computations, network calls, or access any resources
- * under locks that may be locked by long running processes.
+ * The callback should return quickly because it is invoked on a shared thread. It should not do
+ * any expensive computations, network calls, or access any resources under locks that may be
+ * locked by long running processes.
* <p>
* This callback will only be invoked if the distributed system property
- * statistic-sampling-enabled is set to true, and it will be invoked at intervals
- * determined by the statistic-sampling-rate.
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals determined by
+ * the statistic-sampling-rate.
* <p>
- * Get methods are not guaranteed to recompute a new value, they may return
- * the last sampled value
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
- * @param supplier a callback that will return the value of the stat. This
- * replaces any previously registered supplier. If the passed in supplier is null, it
- * will remove any existing supplier
- * @return the previously registered supplier, or null if there was no previously registered supplier
+ * Get methods are not guaranteed to recompute a new value, they may return the last sampled value
+ *
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
+ * @param supplier a callback that will return the value of the stat. This replaces any previously
+ * registered supplier. If the passed in supplier is null, it will remove any existing
+ * supplier
+ * @return the previously registered supplier, or null if there was no previously registered
+ * supplier
* @throws IllegalArgumentException If the id is invalid.
* @since Geode 1.0
*/
public IntSupplier setIntSupplier(int id, IntSupplier supplier);
/**
- * Provide a callback to compute the value of this statistic
- * every sample interval and use that as the value of the stat.
+ * Provide a callback to compute the value of this statistic every sample interval and use that as
+ * the value of the stat.
* <p>
- * The callback should return quickly because it is invoked on a shared thread.
- * It should not do any expensive computations, network calls, or access any resources
- * under locks that may be locked by long running processes.
+ * The callback should return quickly because it is invoked on a shared thread. It should not do
+ * any expensive computations, network calls, or access any resources under locks that may be
+ * locked by long running processes.
* <p>
* This callback will only be invoked if the distributed system property
- * statistic-sampling-enabled is set to true, and it will be invoked at intervals
- * determined by the statistic-sampling-rate.
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals determined by
+ * the statistic-sampling-rate.
* <p>
- * Get methods are not guaranteed to recompute a new value, they may return
- * the last sampled value
+ * Get methods are not guaranteed to recompute a new value, they may return the last sampled value
+ *
* @param name the name of the statistic to update
- * @param supplier a callback that will return the value of the stat. This
- * replaces any previously registered supplier. If the passed in supplier is null, it
- * will remove any existing supplier
- * @return the previously registered supplier, or null if there was no previously registered supplier
- * @throws IllegalArgumentException
- * If no statistic exists with name <code>name</code> or
- * if the statistic named <code>name</code> is not of
- * type <code>int</code>.
+ * @param supplier a callback that will return the value of the stat. This replaces any previously
+ * registered supplier. If the passed in supplier is null, it will remove any existing
+ * supplier
+ * @return the previously registered supplier, or null if there was no previously registered
+ * supplier
+ * @throws IllegalArgumentException If no statistic exists with name <code>name</code> or if the
+ * statistic named <code>name</code> is not of type <code>int</code>.
* @since Geode 1.0
*/
public IntSupplier setIntSupplier(String name, IntSupplier supplier);
/**
- * Provide a callback to compute the value of this statistic
- * every sample interval and use that as the value of the stat.
+ * Provide a callback to compute the value of this statistic every sample interval and use that as
+ * the value of the stat.
* <p>
- * The callback should return quickly because it is invoked on a shared thread.
- * It should not do any expensive computations, network calls, or access any resources
- * under locks that may be locked by long running processes.
+ * The callback should return quickly because it is invoked on a shared thread. It should not do
+ * any expensive computations, network calls, or access any resources under locks that may be
+ * locked by long running processes.
* <p>
* This callback will only be invoked if the distributed system property
- * statistic-sampling-enabled is set to true, and it will be invoked at intervals
- * determined by the statistic-sampling-rate.
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals determined by
+ * the statistic-sampling-rate.
* <p>
- * Get methods are not guaranteed to recompute a new value, they may return
- * the last sampled value
+ * Get methods are not guaranteed to recompute a new value, they may return the last sampled value
+ *
* @param descriptor the descriptor of the statistic to update
- * @param supplier a callback that will return the value of the stat. This
- * replaces any previously registered supplier. If the passed in supplier is null, it
- * will remove any existing supplier
- * @return the previously registered supplier, or null if there was no previously registered supplier
- * @throws IllegalArgumentException
- * If no statistic exists with the given <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>int</code>.
+ * @param supplier a callback that will return the value of the stat. This replaces any previously
+ * registered supplier. If the passed in supplier is null, it will remove any existing
+ * supplier
+ * @return the previously registered supplier, or null if there was no previously registered
+ * supplier
+ * @throws IllegalArgumentException If no statistic exists with the given <code>descriptor</code>
+ * or if the described statistic is not of type <code>int</code>.
* @since Geode 1.0
*/
public IntSupplier setIntSupplier(StatisticDescriptor descriptor, IntSupplier supplier);
/**
- * Provide a callback to compute the value of this statistic
- * every sample interval and use that as the value of the stat.
+ * Provide a callback to compute the value of this statistic every sample interval and use that as
+ * the value of the stat.
* <p>
- * The callback should return quickly because it is invoked on a shared thread.
- * It should not do any expensive computations, network calls, or access any resources
- * under locks that may be locked by long running processes.
+ * The callback should return quickly because it is invoked on a shared thread. It should not do
+ * any expensive computations, network calls, or access any resources under locks that may be
+ * locked by long running processes.
* <p>
* This callback will only be invoked if the distributed system property
- * statistic-sampling-enabled is set to true, and it will be invoked at intervals
- * determined by the statistic-sampling-rate.
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals determined by
+ * the statistic-sampling-rate.
* <p>
- * Get methods are not guaranteed to recompute a new value, they may return
- * the last sampled value
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
- * @param supplier a callback that will return the value of the stat. This
- * replaces any previously registered supplier. If the passed in supplier is null, it
- * will remove any existing supplier
- * @return the previously registered supplier, or null if there was no previously registered supplier
+ * Get methods are not guaranteed to recompute a new value, they may return the last sampled value
+ *
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
+ * @param supplier a callback that will return the value of the stat. This replaces any previously
+ * registered supplier. If the passed in supplier is null, it will remove any existing
+ * supplier
+ * @return the previously registered supplier, or null if there was no previously registered
+ * supplier
* @throws IllegalArgumentException If the id is invalid.
* @since Geode 1.0
*/
public LongSupplier setLongSupplier(int id, LongSupplier supplier);
/**
- * Provide a callback to compute the value of this statistic
- * every sample interval and use that as the value of the stat.
+ * Provide a callback to compute the value of this statistic every sample interval and use that as
+ * the value of the stat.
* <p>
- * The callback should return quickly because it is invoked on a shared thread.
- * It should not do any expensive computations, network calls, or access any resources
- * under locks that may be locked by long running processes.
+ * The callback should return quickly because it is invoked on a shared thread. It should not do
+ * any expensive computations, network calls, or access any resources under locks that may be
+ * locked by long running processes.
* <p>
* This callback will only be invoked if the distributed system property
- * statistic-sampling-enabled is set to true, and it will be invoked at intervals
- * determined by the statistic-sampling-rate.
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals determined by
+ * the statistic-sampling-rate.
* <p>
- * Get methods are not guaranteed to recompute a new value, they may return
- * the last sampled value
+ * Get methods are not guaranteed to recompute a new value, they may return the last sampled value
+ *
* @param name the name of the statistic to update
- * @param supplier a callback that will return the value of the stat. This
- * replaces any previously registered supplier. If the passed in supplier is null, it
- * will remove any existing supplier
- * @return the previously registered supplier, or null if there was no previously registered supplier
- * @throws IllegalArgumentException
- * If no statistic exists with name <code>name</code> or
- * if the statistic named <code>name</code> is not of
- * type <code>long</code>.
+ * @param supplier a callback that will return the value of the stat. This replaces any previously
+ * registered supplier. If the passed in supplier is null, it will remove any existing
+ * supplier
+ * @return the previously registered supplier, or null if there was no previously registered
+ * supplier
+ * @throws IllegalArgumentException If no statistic exists with name <code>name</code> or if the
+ * statistic named <code>name</code> is not of type <code>long</code>.
*/
public LongSupplier setLongSupplier(String name, LongSupplier supplier);
/**
- * Provide a callback to compute the value of this statistic
- * every sample interval and use that as the value of the stat.
+ * Provide a callback to compute the value of this statistic every sample interval and use that as
+ * the value of the stat.
* <p>
- * The callback should return quickly because it is invoked on a shared thread.
- * It should not do any expensive computations, network calls, or access any resources
- * under locks that may be locked by long running processes.
+ * The callback should return quickly because it is invoked on a shared thread. It should not do
+ * any expensive computations, network calls, or access any resources under locks that may be
+ * locked by long running processes.
* <p>
* This callback will only be invoked if the distributed system property
- * statistic-sampling-enabled is set to true, and it will be invoked at intervals
- * determined by the statistic-sampling-rate.
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals determined by
+ * the statistic-sampling-rate.
* <p>
- * Get methods are not guaranteed to recompute a new value, they may return
- * the last sampled value
+ * Get methods are not guaranteed to recompute a new value, they may return the last sampled value
+ *
* @param descriptor the descriptor of the statistic to update
- * @param supplier a callback that will return the value of the stat. This
- * replaces any previously registered supplier. If the passed in supplier is null, it
- * will remove any existing supplier
- * @return the previously registered supplier, or null if there was no previously registered supplier
- * @throws IllegalArgumentException
- * If no statistic exists with the given <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>long</code>.
+ * @param supplier a callback that will return the value of the stat. This replaces any previously
+ * registered supplier. If the passed in supplier is null, it will remove any existing
+ * supplier
+ * @return the previously registered supplier, or null if there was no previously registered
+ * supplier
+ * @throws IllegalArgumentException If no statistic exists with the given <code>descriptor</code>
+ * or if the described statistic is not of type <code>long</code>.
* @since Geode 1.0
*/
public LongSupplier setLongSupplier(StatisticDescriptor descriptor, LongSupplier supplier);
/**
- * Provide a callback to compute the value of this statistic
- * every sample interval and use that as the value of the stat.
+ * Provide a callback to compute the value of this statistic every sample interval and use that as
+ * the value of the stat.
* <p>
- * The callback should return quickly because it is invoked on a shared thread.
- * It should not do any expensive computations, network calls, or access any resources
- * under locks that may be locked by double running processes.
+ * The callback should return quickly because it is invoked on a shared thread. It should not do
+ * any expensive computations, network calls, or access any resources under locks that may be
+ * locked by double running processes.
* <p>
* This callback will only be invoked if the distributed system property
- * statistic-sampling-enabled is set to true, and it will be invoked at intervals
- * determined by the statistic-sampling-rate.
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals determined by
+ * the statistic-sampling-rate.
* <p>
- * Get methods are not guaranteed to recompute a new value, they may return
- * the last sampled value
- * @param id a statistic id obtained with {@link #nameToId}
- * or {@link StatisticsType#nameToId}.
- * @param supplier a callback that will return the value of the stat. This
- * replaces any previously registered supplier. If the passed in supplier is null, it
- * will remove any existing supplier
- * @return the previously registered supplier, or null if there was no previously registered supplier
+ * Get methods are not guaranteed to recompute a new value, they may return the last sampled value
+ *
+ * @param id a statistic id obtained with {@link #nameToId} or {@link StatisticsType#nameToId}.
+ * @param supplier a callback that will return the value of the stat. This replaces any previously
+ * registered supplier. If the passed in supplier is null, it will remove any existing
+ * supplier
+ * @return the previously registered supplier, or null if there was no previously registered
+ * supplier
* @throws IllegalArgumentException If the id is invalid.
* @since Geode 1.0
*/
public DoubleSupplier setDoubleSupplier(int id, DoubleSupplier supplier);
/**
- * Provide a callback to compute the value of this statistic
- * every sample interval and use that as the value of the stat.
+ * Provide a callback to compute the value of this statistic every sample interval and use that as
+ * the value of the stat.
* <p>
- * The callback should return quickly because it is invoked on a shared thread.
- * It should not do any expensive computations, network calls, or access any resources
- * under locks that may be locked by double running processes.
+ * The callback should return quickly because it is invoked on a shared thread. It should not do
+ * any expensive computations, network calls, or access any resources under locks that may be
+ * locked by double running processes.
* <p>
* This callback will only be invoked if the distributed system property
- * statistic-sampling-enabled is set to true, and it will be invoked at intervals
- * determined by the statistic-sampling-rate.
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals determined by
+ * the statistic-sampling-rate.
* <p>
- * Get methods are not guaranteed to recompute a new value, they may return
- * the last sampled value
+ * Get methods are not guaranteed to recompute a new value, they may return the last sampled value
+ *
* @param name the name of the statistic to update
- * @param supplier a callback that will return the value of the stat. This
- * replaces any previously registered supplier. If the passed in supplier is null, it
- * will remove any existing supplier
- * @return the previously registered supplier, or null if there was no previously registered supplier
- * @throws IllegalArgumentException
- * If no statistic exists with name <code>name</code> or
- * if the statistic named <code>name</code> is not of
- * type <code>double</code>.
+ * @param supplier a callback that will return the value of the stat. This replaces any previously
+ * registered supplier. If the passed in supplier is null, it will remove any existing
+ * supplier
+ * @return the previously registered supplier, or null if there was no previously registered
+ * supplier
+ * @throws IllegalArgumentException If no statistic exists with name <code>name</code> or if the
+ * statistic named <code>name</code> is not of type <code>double</code>.
* @since Geode 1.0
*/
public DoubleSupplier setDoubleSupplier(String name, DoubleSupplier supplier);
/**
- * Provide a callback to compute the value of this statistic
- * every sample interval and use that as the value of the stat.
+ * Provide a callback to compute the value of this statistic every sample interval and use that as
+ * the value of the stat.
* <p>
- * The callback should return quickly because it is invoked on a shared thread.
- * It should not do any expensive computations, network calls, or access any resources
- * under locks that may be locked by double running processes.
+ * The callback should return quickly because it is invoked on a shared thread. It should not do
+ * any expensive computations, network calls, or access any resources under locks that may be
+ * locked by double running processes.
* <p>
* This callback will only be invoked if the distributed system property
- * statistic-sampling-enabled is set to true, and it will be invoked at intervals
- * determined by the statistic-sampling-rate.
+ * statistic-sampling-enabled is set to true, and it will be invoked at intervals determined by
+ * the statistic-sampling-rate.
* <p>
- * Get methods are not guaranteed to recompute a new value, they may return
- * the last sampled value
+ * Get methods are not guaranteed to recompute a new value, they may return the last sampled value
+ *
* @param descriptor the descriptor of the statistic to update
- * @param supplier a callback that will return the value of the stat. This
- * replaces any previously registered supplier. If the passed in supplier is null, it
- * will remove any existing supplier
- * @return the previously registered supplier, or null if there was no previously registered supplier
- * @throws IllegalArgumentException
- * If no statistic exists with the given <code>descriptor</code> or
- * if the described statistic is not of
- * type <code>double</code>.
+ * @param supplier a callback that will return the value of the stat. This replaces any previously
+ * registered supplier. If the passed in supplier is null, it will remove any existing
+ * supplier
+ * @return the previously registered supplier, or null if there was no previously registered
+ * supplier
+ * @throws IllegalArgumentException If no statistic exists with the given <code>descriptor</code>
+ * or if the described statistic is not of type <code>double</code>.
* @since Geode 1.0
*/
public DoubleSupplier setDoubleSupplier(StatisticDescriptor descriptor, DoubleSupplier supplier);
[57/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/shred.bundle.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/shred.bundle.js b/geode-web-api/src/main/webapp/docs/lib/shred.bundle.js
deleted file mode 100644
index 72f06ae..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/shred.bundle.js
+++ /dev/null
@@ -1,2765 +0,0 @@
-var require = function (file, cwd) {
- var resolved = require.resolve(file, cwd || '/');
- var mod = require.modules[resolved];
- if (!mod) throw new Error(
- 'Failed to resolve module ' + file + ', tried ' + resolved
- );
- var res = mod._cached ? mod._cached : mod();
- return res;
-}
-
-require.paths = [];
-require.modules = {};
-require.extensions = [".js",".coffee"];
-
-require._core = {
- 'assert': true,
- 'events': true,
- 'fs': true,
- 'path': true,
- 'vm': true
-};
-
-require.resolve = (function () {
- return function (x, cwd) {
- if (!cwd) cwd = '/';
-
- if (require._core[x]) return x;
- var path = require.modules.path();
- var y = cwd || '.';
-
- if (x.match(/^(?:\.\.?\/|\/)/)) {
- var m = loadAsFileSync(path.resolve(y, x))
- || loadAsDirectorySync(path.resolve(y, x));
- if (m) return m;
- }
-
- var n = loadNodeModulesSync(x, y);
- if (n) return n;
-
- throw new Error("Cannot find module '" + x + "'");
-
- function loadAsFileSync (x) {
- if (require.modules[x]) {
- return x;
- }
-
- for (var i = 0; i < require.extensions.length; i++) {
- var ext = require.extensions[i];
- if (require.modules[x + ext]) return x + ext;
- }
- }
-
- function loadAsDirectorySync (x) {
- x = x.replace(/\/+$/, '');
- var pkgfile = x + '/package.json';
- if (require.modules[pkgfile]) {
- var pkg = require.modules[pkgfile]();
- var b = pkg.browserify;
- if (typeof b === 'object' && b.main) {
- var m = loadAsFileSync(path.resolve(x, b.main));
- if (m) return m;
- }
- else if (typeof b === 'string') {
- var m = loadAsFileSync(path.resolve(x, b));
- if (m) return m;
- }
- else if (pkg.main) {
- var m = loadAsFileSync(path.resolve(x, pkg.main));
- if (m) return m;
- }
- }
-
- return loadAsFileSync(x + '/index');
- }
-
- function loadNodeModulesSync (x, start) {
- var dirs = nodeModulesPathsSync(start);
- for (var i = 0; i < dirs.length; i++) {
- var dir = dirs[i];
- var m = loadAsFileSync(dir + '/' + x);
- if (m) return m;
- var n = loadAsDirectorySync(dir + '/' + x);
- if (n) return n;
- }
-
- var m = loadAsFileSync(x);
- if (m) return m;
- }
-
- function nodeModulesPathsSync (start) {
- var parts;
- if (start === '/') parts = [ '' ];
- else parts = path.normalize(start).split('/');
-
- var dirs = [];
- for (var i = parts.length - 1; i >= 0; i--) {
- if (parts[i] === 'node_modules') continue;
- var dir = parts.slice(0, i + 1).join('/') + '/node_modules';
- dirs.push(dir);
- }
-
- return dirs;
- }
- };
-})();
-
-require.alias = function (from, to) {
- var path = require.modules.path();
- var res = null;
- try {
- res = require.resolve(from + '/package.json', '/');
- }
- catch (err) {
- res = require.resolve(from, '/');
- }
- var basedir = path.dirname(res);
-
- var keys = (Object.keys || function (obj) {
- var res = [];
- for (var key in obj) res.push(key)
- return res;
- })(require.modules);
-
- for (var i = 0; i < keys.length; i++) {
- var key = keys[i];
- if (key.slice(0, basedir.length + 1) === basedir + '/') {
- var f = key.slice(basedir.length);
- require.modules[to + f] = require.modules[basedir + f];
- }
- else if (key === basedir) {
- require.modules[to] = require.modules[basedir];
- }
- }
-};
-
-require.define = function (filename, fn) {
- var dirname = require._core[filename]
- ? ''
- : require.modules.path().dirname(filename)
- ;
-
- var require_ = function (file) {
- return require(file, dirname)
- };
- require_.resolve = function (name) {
- return require.resolve(name, dirname);
- };
- require_.modules = require.modules;
- require_.define = require.define;
- var module_ = { exports : {} };
-
- require.modules[filename] = function () {
- require.modules[filename]._cached = module_.exports;
- fn.call(
- module_.exports,
- require_,
- module_,
- module_.exports,
- dirname,
- filename
- );
- require.modules[filename]._cached = module_.exports;
- return module_.exports;
- };
-};
-
-if (typeof process === 'undefined') process = {};
-
-if (!process.nextTick) process.nextTick = (function () {
- var queue = [];
- var canPost = typeof window !== 'undefined'
- && window.postMessage && window.addEventListener
- ;
-
- if (canPost) {
- window.addEventListener('message', function (ev) {
- if (ev.source === window && ev.data === 'browserify-tick') {
- ev.stopPropagation();
- if (queue.length > 0) {
- var fn = queue.shift();
- fn();
- }
- }
- }, true);
- }
-
- return function (fn) {
- if (canPost) {
- queue.push(fn);
- window.postMessage('browserify-tick', '*');
- }
- else setTimeout(fn, 0);
- };
-})();
-
-if (!process.title) process.title = 'browser';
-
-if (!process.binding) process.binding = function (name) {
- if (name === 'evals') return require('vm')
- else throw new Error('No such module')
-};
-
-if (!process.cwd) process.cwd = function () { return '.' };
-
-require.define("path", function (require, module, exports, __dirname, __filename) {
- function filter (xs, fn) {
- var res = [];
- for (var i = 0; i < xs.length; i++) {
- if (fn(xs[i], i, xs)) res.push(xs[i]);
- }
- return res;
-}
-
-// resolves . and .. elements in a path array with directory names there
-// must be no slashes, empty elements, or device names (c:\) in the array
-// (so also no leading and trailing slashes - it does not distinguish
-// relative and absolute paths)
-function normalizeArray(parts, allowAboveRoot) {
- // if the path tries to go above the root, `up` ends up > 0
- var up = 0;
- for (var i = parts.length; i >= 0; i--) {
- var last = parts[i];
- if (last == '.') {
- parts.splice(i, 1);
- } else if (last === '..') {
- parts.splice(i, 1);
- up++;
- } else if (up) {
- parts.splice(i, 1);
- up--;
- }
- }
-
- // if the path is allowed to go above the root, restore leading ..s
- if (allowAboveRoot) {
- for (; up--; up) {
- parts.unshift('..');
- }
- }
-
- return parts;
-}
-
-// Regex to split a filename into [*, dir, basename, ext]
-// posix version
-var splitPathRe = /^(.+\/(?!$)|\/)?((?:.+?)?(\.[^.]*)?)$/;
-
-// path.resolve([from ...], to)
-// posix version
-exports.resolve = function() {
-var resolvedPath = '',
- resolvedAbsolute = false;
-
-for (var i = arguments.length; i >= -1 && !resolvedAbsolute; i--) {
- var path = (i >= 0)
- ? arguments[i]
- : process.cwd();
-
- // Skip empty and invalid entries
- if (typeof path !== 'string' || !path) {
- continue;
- }
-
- resolvedPath = path + '/' + resolvedPath;
- resolvedAbsolute = path.charAt(0) === '/';
-}
-
-// At this point the path should be resolved to a full absolute path, but
-// handle relative paths to be safe (might happen when process.cwd() fails)
-
-// Normalize the path
-resolvedPath = normalizeArray(filter(resolvedPath.split('/'), function(p) {
- return !!p;
- }), !resolvedAbsolute).join('/');
-
- return ((resolvedAbsolute ? '/' : '') + resolvedPath) || '.';
-};
-
-// path.normalize(path)
-// posix version
-exports.normalize = function(path) {
-var isAbsolute = path.charAt(0) === '/',
- trailingSlash = path.slice(-1) === '/';
-
-// Normalize the path
-path = normalizeArray(filter(path.split('/'), function(p) {
- return !!p;
- }), !isAbsolute).join('/');
-
- if (!path && !isAbsolute) {
- path = '.';
- }
- if (path && trailingSlash) {
- path += '/';
- }
-
- return (isAbsolute ? '/' : '') + path;
-};
-
-
-// posix version
-exports.join = function() {
- var paths = Array.prototype.slice.call(arguments, 0);
- return exports.normalize(filter(paths, function(p, index) {
- return p && typeof p === 'string';
- }).join('/'));
-};
-
-
-exports.dirname = function(path) {
- var dir = splitPathRe.exec(path)[1] || '';
- var isWindows = false;
- if (!dir) {
- // No dirname
- return '.';
- } else if (dir.length === 1 ||
- (isWindows && dir.length <= 3 && dir.charAt(1) === ':')) {
- // It is just a slash or a drive letter with a slash
- return dir;
- } else {
- // It is a full dirname, strip trailing slash
- return dir.substring(0, dir.length - 1);
- }
-};
-
-
-exports.basename = function(path, ext) {
- var f = splitPathRe.exec(path)[2] || '';
- // TODO: make this comparison case-insensitive on windows?
- if (ext && f.substr(-1 * ext.length) === ext) {
- f = f.substr(0, f.length - ext.length);
- }
- return f;
-};
-
-
-exports.extname = function(path) {
- return splitPathRe.exec(path)[3] || '';
-};
-
-});
-
-require.define("/shred.js", function (require, module, exports, __dirname, __filename) {
- // Shred is an HTTP client library intended to simplify the use of Node's
-// built-in HTTP library. In particular, we wanted to make it easier to interact
-// with HTTP-based APIs.
-//
-// See the [examples](./examples.html) for more details.
-
-// Ax is a nice logging library we wrote. You can use any logger, providing it
-// has `info`, `warn`, `debug`, and `error` methods that take a string.
-var Ax = require("ax")
- , CookieJarLib = require( "cookiejar" )
- , CookieJar = CookieJarLib.CookieJar
-;
-
-// Shred takes some options, including a logger and request defaults.
-
-var Shred = function(options) {
- options = (options||{});
- this.agent = options.agent;
- this.defaults = options.defaults||{};
- this.log = options.logger||(new Ax({ level: "info" }));
- this._sharedCookieJar = new CookieJar();
- this.logCurl = options.logCurl || false;
-};
-
-// Most of the real work is done in the request and reponse classes.
-
-Shred.Request = require("./shred/request");
-Shred.Response = require("./shred/response");
-
-// The `request` method kicks off a new request, instantiating a new `Request`
-// object and passing along whatever default options we were given.
-
-Shred.prototype = {
- request: function(options) {
- options.logger = this.log;
- options.logCurl = options.logCurl || this.logCurl;
- options.cookieJar = ( 'cookieJar' in options ) ? options.cookieJar : this._sharedCookieJar; // let them set cookieJar = null
- options.agent = options.agent || this.agent;
- // fill in default options
- for (var key in this.defaults) {
- if (this.defaults.hasOwnProperty(key) && !options[key]) {
- options[key] = this.defaults[key]
- }
- }
- return new Shred.Request(options);
- }
-};
-
-// Define a bunch of convenience methods so that you don't have to include
-// a `method` property in your request options.
-
-"get put post delete".split(" ").forEach(function(method) {
- Shred.prototype[method] = function(options) {
- options.method = method;
- return this.request(options);
- };
-});
-
-
-module.exports = Shred;
-
-});
-
-require.define("/node_modules/ax/package.json", function (require, module, exports, __dirname, __filename) {
- module.exports = {"main":"./lib/ax.js"}
-});
-
-require.define("/node_modules/ax/lib/ax.js", function (require, module, exports, __dirname, __filename) {
- var inspect = require("util").inspect
- , fs = require("fs")
-;
-
-
-// this is a quick-and-dirty logger. there are other nicer loggers out there
-// but the ones i found were also somewhat involved. this one has a Ruby
-// logger type interface
-//
-// we can easily replace this, provide the info, debug, etc. methods are the
-// same. or, we can change Haiku to use a more standard node.js interface
-
-var format = function(level,message) {
- var debug = (level=="debug"||level=="error");
- if (!message) { return message.toString(); }
- if (typeof(message) == "object") {
- if (message instanceof Error && debug) {
- return message.stack;
- } else {
- return inspect(message);
- }
- } else {
- return message.toString();
- }
-};
-
-var noOp = function(message) { return this; }
-var makeLogger = function(level,fn) {
- return function(message) {
- this.stream.write(this.format(level, message)+"\n");
- return this;
- }
-};
-
-var Logger = function(options) {
- var logger = this;
- var options = options||{};
-
- // Default options
- options.level = options.level || "info";
- options.timestamp = options.timestamp || true;
- options.prefix = options.prefix || "";
- logger.options = options;
-
- // Allows a prefix to be added to the message.
- //
- // var logger = new Ax({ module: 'Haiku' })
- // logger.warn('this is going to be awesome!');
- // //=> Haiku: this is going to be awesome!
- //
- if (logger.options.module){
- logger.options.prefix = logger.options.module;
- }
-
- // Write to stderr or a file
- if (logger.options.file){
- logger.stream = fs.createWriteStream(logger.options.file, {"flags": "a"});
- } else {
- if(process.title === "node")
- logger.stream = process.stderr;
- else if(process.title === "browser")
- logger.stream = function () {
- // Work around weird console context issue: http://code.google.com/p/chromium/issues/detail?id=48662
- return console[logger.options.level].apply(console, arguments);
- };
- }
-
- switch(logger.options.level){
- case 'debug':
- ['debug', 'info', 'warn'].forEach(function (level) {
- logger[level] = Logger.writer(level);
- });
- case 'info':
- ['info', 'warn'].forEach(function (level) {
- logger[level] = Logger.writer(level);
- });
- case 'warn':
- logger.warn = Logger.writer('warn');
- }
-}
-
-// Used to define logger methods
-Logger.writer = function(level){
- return function(message){
- var logger = this;
-
- if(process.title === "node")
- logger.stream.write(logger.format(level, message) + '\n');
- else if(process.title === "browser")
- logger.stream(logger.format(level, message) + '\n');
-
- };
-}
-
-
-Logger.prototype = {
- info: function(){},
- debug: function(){},
- warn: function(){},
- error: Logger.writer('error'),
- format: function(level, message){
- if (! message) return '';
-
- var logger = this
- , prefix = logger.options.prefix
- , timestamp = logger.options.timestamp ? " " + (new Date().toISOString()) : ""
- ;
-
- return (prefix + timestamp + ": " + message);
- }
-};
-
-module.exports = Logger;
-
-});
-
-require.define("util", function (require, module, exports, __dirname, __filename) {
- // todo
-
-});
-
-require.define("fs", function (require, module, exports, __dirname, __filename) {
- // nothing to see here... no file methods for the browser
-
-});
-
-require.define("/node_modules/cookiejar/package.json", function (require, module, exports, __dirname, __filename) {
- module.exports = {"main":"cookiejar.js"}
-});
-
-require.define("/node_modules/cookiejar/cookiejar.js", function (require, module, exports, __dirname, __filename) {
- exports.CookieAccessInfo=CookieAccessInfo=function CookieAccessInfo(domain,path,secure,script) {
- if(this instanceof CookieAccessInfo) {
- this.domain=domain||undefined;
- this.path=path||"/";
- this.secure=!!secure;
- this.script=!!script;
- return this;
- }
- else {
- return new CookieAccessInfo(domain,path,secure,script)
- }
-}
-
-exports.Cookie=Cookie=function Cookie(cookiestr) {
- if(cookiestr instanceof Cookie) {
- return cookiestr;
- }
- else {
- if(this instanceof Cookie) {
- this.name = null;
- this.value = null;
- this.expiration_date = Infinity;
- this.path = "/";
- this.domain = null;
- this.secure = false; //how to define?
- this.noscript = false; //httponly
- if(cookiestr) {
- this.parse(cookiestr)
- }
- return this;
- }
- return new Cookie(cookiestr)
- }
-}
-
-Cookie.prototype.toString = function toString() {
- var str=[this.name+"="+this.value];
- if(this.expiration_date !== Infinity) {
- str.push("expires="+(new Date(this.expiration_date)).toGMTString());
- }
- if(this.domain) {
- str.push("domain="+this.domain);
- }
- if(this.path) {
- str.push("path="+this.path);
- }
- if(this.secure) {
- str.push("secure");
- }
- if(this.noscript) {
- str.push("httponly");
- }
- return str.join("; ");
-}
-
-Cookie.prototype.toValueString = function toValueString() {
- return this.name+"="+this.value;
-}
-
-var cookie_str_splitter=/[:](?=\s*[a-zA-Z0-9_\-]+\s*[=])/g
-Cookie.prototype.parse = function parse(str) {
- if(this instanceof Cookie) {
- var parts=str.split(";")
- , pair=parts[0].match(/([^=]+)=((?:.|\n)*)/)
- , key=pair[1]
- , value=pair[2];
- this.name = key;
- this.value = value;
-
- for(var i=1;i<parts.length;i++) {
- pair=parts[i].match(/([^=]+)(?:=((?:.|\n)*))?/)
- , key=pair[1].trim().toLowerCase()
- , value=pair[2];
- switch(key) {
- case "httponly":
- this.noscript = true;
- break;
- case "expires":
- this.expiration_date = value
- ? Number(Date.parse(value))
- : Infinity;
- break;
- case "path":
- this.path = value
- ? value.trim()
- : "";
- break;
- case "domain":
- this.domain = value
- ? value.trim()
- : "";
- break;
- case "secure":
- this.secure = true;
- break
- }
- }
-
- return this;
- }
- return new Cookie().parse(str)
-}
-
-Cookie.prototype.matches = function matches(access_info) {
- if(this.noscript && access_info.script
- || this.secure && !access_info.secure
- || !this.collidesWith(access_info)) {
- return false
- }
- return true;
-}
-
-Cookie.prototype.collidesWith = function collidesWith(access_info) {
- if((this.path && !access_info.path) || (this.domain && !access_info.domain)) {
- return false
- }
- if(this.path && access_info.path.indexOf(this.path) !== 0) {
- return false;
- }
- if (this.domain===access_info.domain) {
- return true;
- }
- else if(this.domain && this.domain.charAt(0)===".")
- {
- var wildcard=access_info.domain.indexOf(this.domain.slice(1))
- if(wildcard===-1 || wildcard!==access_info.domain.length-this.domain.length+1) {
- return false;
- }
- }
- else if(this.domain){
- return false
- }
- return true;
-}
-
-exports.CookieJar=CookieJar=function CookieJar() {
- if(this instanceof CookieJar) {
- var cookies = {} //name: [Cookie]
-
- this.setCookie = function setCookie(cookie) {
- cookie = Cookie(cookie);
- //Delete the cookie if the set is past the current time
- var remove = cookie.expiration_date <= Date.now();
- if(cookie.name in cookies) {
- var cookies_list = cookies[cookie.name];
- for(var i=0;i<cookies_list.length;i++) {
- var collidable_cookie = cookies_list[i];
- if(collidable_cookie.collidesWith(cookie)) {
- if(remove) {
- cookies_list.splice(i,1);
- if(cookies_list.length===0) {
- delete cookies[cookie.name]
- }
- return false;
- }
- else {
- return cookies_list[i]=cookie;
- }
- }
- }
- if(remove) {
- return false;
- }
- cookies_list.push(cookie);
- return cookie;
- }
- else if(remove){
- return false;
- }
- else {
- return cookies[cookie.name]=[cookie];
- }
- }
- //returns a cookie
- this.getCookie = function getCookie(cookie_name,access_info) {
- var cookies_list = cookies[cookie_name];
- for(var i=0;i<cookies_list.length;i++) {
- var cookie = cookies_list[i];
- if(cookie.expiration_date <= Date.now()) {
- if(cookies_list.length===0) {
- delete cookies[cookie.name]
- }
- continue;
- }
- if(cookie.matches(access_info)) {
- return cookie;
- }
- }
- }
- //returns a list of cookies
- this.getCookies = function getCookies(access_info) {
- var matches=[];
- for(var cookie_name in cookies) {
- var cookie=this.getCookie(cookie_name,access_info);
- if (cookie) {
- matches.push(cookie);
- }
- }
- matches.toString=function toString(){return matches.join(":");}
- matches.toValueString=function() {return matches.map(function(c){return c.toValueString();}).join(';');}
- return matches;
- }
-
- return this;
- }
- return new CookieJar()
-}
-
-
-//returns list of cookies that were set correctly
-CookieJar.prototype.setCookies = function setCookies(cookies) {
- cookies=Array.isArray(cookies)
- ?cookies
- :cookies.split(cookie_str_splitter);
- var successful=[]
- for(var i=0;i<cookies.length;i++) {
- var cookie = Cookie(cookies[i]);
- if(this.setCookie(cookie)) {
- successful.push(cookie);
- }
- }
- return successful;
-}
-
-});
-
-require.define("/shred/request.js", function (require, module, exports, __dirname, __filename) {
- // The request object encapsulates a request, creating a Node.js HTTP request and
-// then handling the response.
-
-var HTTP = require("http")
- , HTTPS = require("https")
- , parseUri = require("./parseUri")
- , Emitter = require('events').EventEmitter
- , sprintf = require("sprintf").sprintf
- , Response = require("./response")
- , HeaderMixins = require("./mixins/headers")
- , Content = require("./content")
-;
-
-var STATUS_CODES = HTTP.STATUS_CODES || {
- 100 : 'Continue',
- 101 : 'Switching Protocols',
- 102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
- 200 : 'OK',
- 201 : 'Created',
- 202 : 'Accepted',
- 203 : 'Non-Authoritative Information',
- 204 : 'No Content',
- 205 : 'Reset Content',
- 206 : 'Partial Content',
- 207 : 'Multi-Status', // RFC 4918
- 300 : 'Multiple Choices',
- 301 : 'Moved Permanently',
- 302 : 'Moved Temporarily',
- 303 : 'See Other',
- 304 : 'Not Modified',
- 305 : 'Use Proxy',
- 307 : 'Temporary Redirect',
- 400 : 'Bad Request',
- 401 : 'Unauthorized',
- 402 : 'Payment Required',
- 403 : 'Forbidden',
- 404 : 'Not Found',
- 405 : 'Method Not Allowed',
- 406 : 'Not Acceptable',
- 407 : 'Proxy Authentication Required',
- 408 : 'Request Time-out',
- 409 : 'Conflict',
- 410 : 'Gone',
- 411 : 'Length Required',
- 412 : 'Precondition Failed',
- 413 : 'Request Entity Too Large',
- 414 : 'Request-URI Too Large',
- 415 : 'Unsupported Media Type',
- 416 : 'Requested Range Not Satisfiable',
- 417 : 'Expectation Failed',
- 418 : 'I\'m a teapot', // RFC 2324
- 422 : 'Unprocessable Entity', // RFC 4918
- 423 : 'Locked', // RFC 4918
- 424 : 'Failed Dependency', // RFC 4918
- 425 : 'Unordered Collection', // RFC 4918
- 426 : 'Upgrade Required', // RFC 2817
- 500 : 'Internal Server Error',
- 501 : 'Not Implemented',
- 502 : 'Bad Gateway',
- 503 : 'Service Unavailable',
- 504 : 'Gateway Time-out',
- 505 : 'HTTP Version not supported',
- 506 : 'Variant Also Negotiates', // RFC 2295
- 507 : 'Insufficient Storage', // RFC 4918
- 509 : 'Bandwidth Limit Exceeded',
- 510 : 'Not Extended' // RFC 2774
-};
-
-// The Shred object itself constructs the `Request` object. You should rarely
-// need to do this directly.
-
-var Request = function(options) {
- this.log = options.logger;
- this.cookieJar = options.cookieJar;
- this.encoding = options.encoding;
- this.logCurl = options.logCurl;
- processOptions(this,options||{});
- createRequest(this);
-};
-
-// A `Request` has a number of properties, many of which help with details like
-// URL parsing or defaulting the port for the request.
-
-Object.defineProperties(Request.prototype, {
-
-// - **url**. You can set the `url` property with a valid URL string and all the
-// URL-related properties (host, port, etc.) will be automatically set on the
-// request object.
-
- url: {
- get: function() {
- if (!this.scheme) { return null; }
- return sprintf("%s://%s:%s%s",
- this.scheme, this.host, this.port,
- (this.proxy ? "/" : this.path) +
- (this.query ? ("?" + this.query) : ""));
- },
- set: function(_url) {
- _url = parseUri(_url);
- this.scheme = _url.protocol;
- this.host = _url.host;
- this.port = _url.port;
- this.path = _url.path;
- this.query = _url.query;
- return this;
- },
- enumerable: true
- },
-
-// - **headers**. Returns a hash representing the request headers. You can't set
-// this directly, only get it. You can add or modify headers by using the
-// `setHeader` or `setHeaders` method. This ensures that the headers are
-// normalized - that is, you don't accidentally send `Content-Type` and
-// `content-type` headers. Keep in mind that if you modify the returned hash,
-// it will *not* modify the request headers.
-
- headers: {
- get: function() {
- return this.getHeaders();
- },
- enumerable: true
- },
-
-// - **port**. Unless you set the `port` explicitly or include it in the URL, it
-// will default based on the scheme.
-
- port: {
- get: function() {
- if (!this._port) {
- switch(this.scheme) {
- case "https": return this._port = 443;
- case "http":
- default: return this._port = 80;
- }
- }
- return this._port;
- },
- set: function(value) { this._port = value; return this; },
- enumerable: true
- },
-
-// - **method**. The request method - `get`, `put`, `post`, etc. that will be
-// used to make the request. Defaults to `get`.
-
- method: {
- get: function() {
- return this._method = (this._method||"GET");
- },
- set: function(value) {
- this._method = value; return this;
- },
- enumerable: true
- },
-
-// - **query**. Can be set either with a query string or a hash (object). Get
-// will always return a properly escaped query string or null if there is no
-// query component for the request.
-
- query: {
- get: function() {return this._query;},
- set: function(value) {
- var stringify = function (hash) {
- var query = "";
- for (var key in hash) {
- query += encodeURIComponent(key) + '=' + encodeURIComponent(hash[key]) + '&';
- }
- // Remove the last '&'
- query = query.slice(0, -1);
- return query;
- }
-
- if (value) {
- if (typeof value === 'object') {
- value = stringify(value);
- }
- this._query = value;
- } else {
- this._query = "";
- }
- return this;
- },
- enumerable: true
- },
-
-// - **parameters**. This will return the query parameters in the form of a hash
-// (object).
-
- parameters: {
- get: function() { return QueryString.parse(this._query||""); },
- enumerable: true
- },
-
-// - **content**. (Aliased as `body`.) Set this to add a content entity to the
-// request. Attempts to use the `content-type` header to determine what to do
-// with the content value. Get this to get back a [`Content`
-// object](./content.html).
-
- body: {
- get: function() { return this._body; },
- set: function(value) {
- this._body = new Content({
- data: value,
- type: this.getHeader("Content-Type")
- });
- this.setHeader("Content-Type",this.content.type);
- this.setHeader("Content-Length",this.content.length);
- return this;
- },
- enumerable: true
- },
-
-// - **timeout**. Used to determine how long to wait for a response. Does not
-// distinguish between connect timeouts versus request timeouts. Set either in
-// milliseconds or with an object with temporal attributes (hours, minutes,
-// seconds) and convert it into milliseconds. Get will always return
-// milliseconds.
-
- timeout: {
- get: function() { return this._timeout; }, // in milliseconds
- set: function(timeout) {
- var request = this
- , milliseconds = 0;
- ;
- if (!timeout) return this;
- if (typeof timeout==="number") { milliseconds = timeout; }
- else {
- milliseconds = (timeout.milliseconds||0) +
- (1000 * ((timeout.seconds||0) +
- (60 * ((timeout.minutes||0) +
- (60 * (timeout.hours||0))))));
- }
- this._timeout = milliseconds;
- return this;
- },
- enumerable: true
- }
-});
-
-// Alias `body` property to `content`. Since the [content object](./content.html)
-// has a `body` attribute, it's preferable to use `content` since you can then
-// access the raw content data using `content.body`.
-
-Object.defineProperty(Request.prototype,"content",
- Object.getOwnPropertyDescriptor(Request.prototype, "body"));
-
-// The `Request` object can be pretty overwhelming to view using the built-in
-// Node.js inspect method. We want to make it a bit more manageable. This
-// probably goes [too far in the other
-// direction](https://github.com/spire-io/shred/issues/2).
-
-Request.prototype.inspect = function () {
- var request = this;
- var headers = this.format_headers();
- var summary = ["<Shred Request> ", request.method.toUpperCase(),
- request.url].join(" ")
- return [ summary, "- Headers:", headers].join("\n");
-};
-
-Request.prototype.format_headers = function () {
- var array = []
- var headers = this._headers
- for (var key in headers) {
- if (headers.hasOwnProperty(key)) {
- var value = headers[key]
- array.push("\t" + key + ": " + value);
- }
- }
- return array.join("\n");
-};
-
-// Allow chainable 'on's: shred.get({ ... }).on( ... ). You can pass in a
-// single function, a pair (event, function), or a hash:
-// { event: function, event: function }
-Request.prototype.on = function (eventOrHash, listener) {
- var emitter = this.emitter;
- // Pass in a single argument as a function then make it the default response handler
- if (arguments.length === 1 && typeof(eventOrHash) === 'function') {
- emitter.on('response', eventOrHash);
- } else if (arguments.length === 1 && typeof(eventOrHash) === 'object') {
- for (var key in eventOrHash) {
- if (eventOrHash.hasOwnProperty(key)) {
- emitter.on(key, eventOrHash[key]);
- }
- }
- } else {
- emitter.on(eventOrHash, listener);
- }
- return this;
-};
-
-// Add in the header methods. Again, these ensure we don't get the same header
-// multiple times with different case conventions.
-HeaderMixins.gettersAndSetters(Request);
-
-// `processOptions` is called from the constructor to handle all the work
-// associated with making sure we do our best to ensure we have a valid request.
-
-var processOptions = function(request,options) {
-
- request.log.debug("Processing request options ..");
-
- // We'll use `request.emitter` to manage the `on` event handlers.
- request.emitter = (new Emitter);
-
- request.agent = options.agent;
-
- // Set up the handlers ...
- if (options.on) {
- for (var key in options.on) {
- if (options.on.hasOwnProperty(key)) {
- request.emitter.on(key, options.on[key]);
- }
- }
- }
-
- // Make sure we were give a URL or a host
- if (!options.url && !options.host) {
- request.emitter.emit("request_error",
- new Error("No url or url options (host, port, etc.)"));
- return;
- }
-
- // Allow for the [use of a proxy](http://www.jmarshall.com/easy/http/#proxies).
-
- if (options.url) {
- if (options.proxy) {
- request.url = options.proxy;
- request.path = options.url;
- } else {
- request.url = options.url;
- }
- }
-
- // Set the remaining options.
- request.query = options.query||options.parameters||request.query ;
- request.method = options.method;
- request.setHeader("user-agent",options.agent||"Shred");
- request.setHeaders(options.headers);
-
- if (request.cookieJar) {
- var cookies = request.cookieJar.getCookies( CookieAccessInfo( request.host, request.path ) );
- if (cookies.length) {
- var cookieString = request.getHeader('cookie')||'';
- for (var cookieIndex = 0; cookieIndex < cookies.length; ++cookieIndex) {
- if ( cookieString.length && cookieString[ cookieString.length - 1 ] != ';' )
- {
- cookieString += ';';
- }
- cookieString += cookies[ cookieIndex ].name + '=' + cookies[ cookieIndex ].value + ';';
- }
- request.setHeader("cookie", cookieString);
- }
- }
-
- // The content entity can be set either using the `body` or `content` attributes.
- if (options.body||options.content) {
- request.content = options.body||options.content;
- }
- request.timeout = options.timeout;
-
-};
-
-// `createRequest` is also called by the constructor, after `processOptions`.
-// This actually makes the request and processes the response, so `createRequest`
-// is a bit of a misnomer.
-
-var createRequest = function(request) {
- var timeout ;
-
- request.log.debug("Creating request ..");
- request.log.debug(request);
-
- var reqParams = {
- host: request.host,
- port: request.port,
- method: request.method,
- path: request.path + (request.query ? '?'+request.query : ""),
- headers: request.getHeaders(),
- // Node's HTTP/S modules will ignore this, but we are using the
- // browserify-http module in the browser for both HTTP and HTTPS, and this
- // is how you differentiate the two.
- scheme: request.scheme,
- // Use a provided agent. 'Undefined' is the default, which uses a global
- // agent.
- agent: request.agent
- };
-
- if (request.logCurl) {
- logCurl(request);
- }
-
- var http = request.scheme == "http" ? HTTP : HTTPS;
-
- // Set up the real request using the selected library. The request won't be
- // sent until we call `.end()`.
- request._raw = http.request(reqParams, function(response) {
- request.log.debug("Received response ..");
-
- // We haven't timed out and we have a response, so make sure we clear the
- // timeout so it doesn't fire while we're processing the response.
- clearTimeout(timeout);
-
- // Construct a Shred `Response` object from the response. This will stream
- // the response, thus the need for the callback. We can access the response
- // entity safely once we're in the callback.
- response = new Response(response, request, function(response) {
-
- // Set up some event magic. The precedence is given first to
- // status-specific handlers, then to responses for a given event, and then
- // finally to the more general `response` handler. In the last case, we
- // need to first make sure we're not dealing with a a redirect.
- var emit = function(event) {
- var emitter = request.emitter;
- var textStatus = STATUS_CODES[response.status] ? STATUS_CODES[response.status].toLowerCase() : null;
- if (emitter.listeners(response.status).length > 0 || emitter.listeners(textStatus).length > 0) {
- emitter.emit(response.status, response);
- emitter.emit(textStatus, response);
- } else {
- if (emitter.listeners(event).length>0) {
- emitter.emit(event, response);
- } else if (!response.isRedirect) {
- emitter.emit("response", response);
- //console.warn("Request has no event listener for status code " + response.status);
- }
- }
- };
-
- // Next, check for a redirect. We simply repeat the request with the URL
- // given in the `Location` header. We fire a `redirect` event.
- if (response.isRedirect) {
- request.log.debug("Redirecting to "
- + response.getHeader("Location"));
- request.url = response.getHeader("Location");
- emit("redirect");
- createRequest(request);
-
- // Okay, it's not a redirect. Is it an error of some kind?
- } else if (response.isError) {
- emit("error");
- } else {
- // It looks like we're good shape. Trigger the `success` event.
- emit("success");
- }
- });
- });
-
- // We're still setting up the request. Next, we're going to handle error cases
- // where we have no response. We don't emit an error event because that event
- // takes a response. We don't response handlers to have to check for a null
- // value. However, we [should introduce a different event
- // type](https://github.com/spire-io/shred/issues/3) for this type of error.
- request._raw.on("error", function(error) {
- request.emitter.emit("request_error", error);
- });
-
- request._raw.on("socket", function(socket) {
- request.emitter.emit("socket", socket);
- });
-
- // TCP timeouts should also trigger the "response_error" event.
- request._raw.on('socket', function () {
- request._raw.socket.on('timeout', function () {
- // This should trigger the "error" event on the raw request, which will
- // trigger the "response_error" on the shred request.
- request._raw.abort();
- });
- });
-
-
- // We're almost there. Next, we need to write the request entity to the
- // underlying request object.
- if (request.content) {
- request.log.debug("Streaming body: '" +
- request.content.data.slice(0,59) + "' ... ");
- request._raw.write(request.content.data);
- }
-
- // Finally, we need to set up the timeout. We do this last so that we don't
- // start the clock ticking until the last possible moment.
- if (request.timeout) {
- timeout = setTimeout(function() {
- request.log.debug("Timeout fired, aborting request ...");
- request._raw.abort();
- request.emitter.emit("timeout", request);
- },request.timeout);
- }
-
- // The `.end()` method will cause the request to fire. Technically, it might
- // have already sent the headers and body.
- request.log.debug("Sending request ...");
- request._raw.end();
-};
-
-// Logs the curl command for the request.
-var logCurl = function (req) {
- var headers = req.getHeaders();
- var headerString = "";
-
- for (var key in headers) {
- headerString += '-H "' + key + ": " + headers[key] + '" ';
- }
-
- var bodyString = ""
-
- if (req.content) {
- bodyString += "-d '" + req.content.body + "' ";
- }
-
- var query = req.query ? '?' + req.query : "";
-
- console.log("curl " +
- "-X " + req.method.toUpperCase() + " " +
- req.scheme + "://" + req.host + ":" + req.port + req.path + query + " " +
- headerString +
- bodyString
- );
-};
-
-
-module.exports = Request;
-
-});
-
-require.define("http", function (require, module, exports, __dirname, __filename) {
- // todo
-
-});
-
-require.define("https", function (require, module, exports, __dirname, __filename) {
- // todo
-
-});
-
-require.define("/shred/parseUri.js", function (require, module, exports, __dirname, __filename) {
- // parseUri 1.2.2
-// (c) Steven Levithan <stevenlevithan.com>
-// MIT License
-
-function parseUri (str) {
- var o = parseUri.options,
- m = o.parser[o.strictMode ? "strict" : "loose"].exec(str),
- uri = {},
- i = 14;
-
- while (i--) uri[o.key[i]] = m[i] || "";
-
- uri[o.q.name] = {};
- uri[o.key[12]].replace(o.q.parser, function ($0, $1, $2) {
- if ($1) uri[o.q.name][$1] = $2;
- });
-
- return uri;
-};
-
-parseUri.options = {
- strictMode: false,
- key: ["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],
- q: {
- name: "queryKey",
- parser: /(?:^|&)([^&=]*)=?([^&]*)/g
- },
- parser: {
- strict: /^(?:([^:\/?#]+):)?(?:\/\/((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?))?((((?:[^?#\/]*\/)*)([^?#]*))(?:\?([^#]*))?(?:#(.*))?)/,
- loose: /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*)(?::([^:@]*))?)?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/
- }
-};
-
-module.exports = parseUri;
-
-});
-
-require.define("events", function (require, module, exports, __dirname, __filename) {
- if (!process.EventEmitter) process.EventEmitter = function () {};
-
-var EventEmitter = exports.EventEmitter = process.EventEmitter;
-var isArray = typeof Array.isArray === 'function'
- ? Array.isArray
- : function (xs) {
- return Object.toString.call(xs) === '[object Array]'
- }
-;
-
-// By default EventEmitters will print a warning if more than
-// 10 listeners are added to it. This is a useful default which
-// helps finding memory leaks.
-//
-// Obviously not all Emitters should be limited to 10. This function allows
-// that to be increased. Set to zero for unlimited.
-var defaultMaxListeners = 10;
-EventEmitter.prototype.setMaxListeners = function(n) {
- if (!this._events) this._events = {};
- this._events.maxListeners = n;
-};
-
-
-EventEmitter.prototype.emit = function(type) {
- // If there is no 'error' event listener then throw.
- if (type === 'error') {
- if (!this._events || !this._events.error ||
- (isArray(this._events.error) && !this._events.error.length))
- {
- if (arguments[1] instanceof Error) {
- throw arguments[1]; // Unhandled 'error' event
- } else {
- throw new Error("Uncaught, unspecified 'error' event.");
- }
- return false;
- }
- }
-
- if (!this._events) return false;
- var handler = this._events[type];
- if (!handler) return false;
-
- if (typeof handler == 'function') {
- switch (arguments.length) {
- // fast cases
- case 1:
- handler.call(this);
- break;
- case 2:
- handler.call(this, arguments[1]);
- break;
- case 3:
- handler.call(this, arguments[1], arguments[2]);
- break;
- // slower
- default:
- var args = Array.prototype.slice.call(arguments, 1);
- handler.apply(this, args);
- }
- return true;
-
- } else if (isArray(handler)) {
- var args = Array.prototype.slice.call(arguments, 1);
-
- var listeners = handler.slice();
- for (var i = 0, l = listeners.length; i < l; i++) {
- listeners[i].apply(this, args);
- }
- return true;
-
- } else {
- return false;
- }
-};
-
-// EventEmitter is defined in src/node_events.cc
-// EventEmitter.prototype.emit() is also defined there.
-EventEmitter.prototype.addListener = function(type, listener) {
- if ('function' !== typeof listener) {
- throw new Error('addListener only takes instances of Function');
- }
-
- if (!this._events) this._events = {};
-
- // To avoid recursion in the case that type == "newListeners"! Before
- // adding it to the listeners, first emit "newListeners".
- this.emit('newListener', type, listener);
-
- if (!this._events[type]) {
- // Optimize the case of one listener. Don't need the extra array object.
- this._events[type] = listener;
- } else if (isArray(this._events[type])) {
-
- // Check for listener leak
- if (!this._events[type].warned) {
- var m;
- if (this._events.maxListeners !== undefined) {
- m = this._events.maxListeners;
- } else {
- m = defaultMaxListeners;
- }
-
- if (m && m > 0 && this._events[type].length > m) {
- this._events[type].warned = true;
- console.error('(node) warning: possible EventEmitter memory ' +
- 'leak detected. %d listeners added. ' +
- 'Use emitter.setMaxListeners() to increase limit.',
- this._events[type].length);
- console.trace();
- }
- }
-
- // If we've already got an array, just append.
- this._events[type].push(listener);
- } else {
- // Adding the second element, need to change to array.
- this._events[type] = [this._events[type], listener];
- }
-
- return this;
-};
-
-EventEmitter.prototype.on = EventEmitter.prototype.addListener;
-
-EventEmitter.prototype.once = function(type, listener) {
- var self = this;
- self.on(type, function g() {
- self.removeListener(type, g);
- listener.apply(this, arguments);
- });
-
- return this;
-};
-
-EventEmitter.prototype.removeListener = function(type, listener) {
- if ('function' !== typeof listener) {
- throw new Error('removeListener only takes instances of Function');
- }
-
- // does not use listeners(), so no side effect of creating _events[type]
- if (!this._events || !this._events[type]) return this;
-
- var list = this._events[type];
-
- if (isArray(list)) {
- var i = list.indexOf(listener);
- if (i < 0) return this;
- list.splice(i, 1);
- if (list.length == 0)
- delete this._events[type];
- } else if (this._events[type] === listener) {
- delete this._events[type];
- }
-
- return this;
-};
-
-EventEmitter.prototype.removeAllListeners = function(type) {
- // does not use listeners(), so no side effect of creating _events[type]
- if (type && this._events && this._events[type]) this._events[type] = null;
- return this;
-};
-
-EventEmitter.prototype.listeners = function(type) {
- if (!this._events) this._events = {};
- if (!this._events[type]) this._events[type] = [];
- if (!isArray(this._events[type])) {
- this._events[type] = [this._events[type]];
- }
- return this._events[type];
-};
-
-});
-
-require.define("/node_modules/sprintf/package.json", function (require, module, exports, __dirname, __filename) {
- module.exports = {"main":"./lib/sprintf"}
-});
-
-require.define("/node_modules/sprintf/lib/sprintf.js", function (require, module, exports, __dirname, __filename) {
- /**
-sprintf() for JavaScript 0.7-beta1
-http://www.diveintojavascript.com/projects/javascript-sprintf
-
-Copyright (c) Alexandru Marasteanu <alexaholic [at) gmail (dot] com>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of sprintf() for JavaScript nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL Alexandru Marasteanu BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Changelog:
-2010.11.07 - 0.7-beta1-node
- - converted it to a node.js compatible module
-
-2010.09.06 - 0.7-beta1
- - features: vsprintf, support for named placeholders
- - enhancements: format cache, reduced global namespace pollution
-
-2010.05.22 - 0.6:
- - reverted to 0.4 and fixed the bug regarding the sign of the number 0
- Note:
- Thanks to Raphael Pigulla <raph (at] n3rd [dot) org> (http://www.n3rd.org/)
- who warned me about a bug in 0.5, I discovered that the last update was
- a regress. I appologize for that.
-
-2010.05.09 - 0.5:
- - bug fix: 0 is now preceeded with a + sign
- - bug fix: the sign was not at the right position on padded results (Kamal Abdali)
- - switched from GPL to BSD license
-
-2007.10.21 - 0.4:
- - unit test and patch (David Baird)
-
-2007.09.17 - 0.3:
- - bug fix: no longer throws exception on empty paramenters (Hans Pufal)
-
-2007.09.11 - 0.2:
- - feature: added argument swapping
-
-2007.04.03 - 0.1:
- - initial release
-**/
-
-var sprintf = (function() {
- function get_type(variable) {
- return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
- }
- function str_repeat(input, multiplier) {
- for (var output = []; multiplier > 0; output[--multiplier] = input) {/* do nothing */}
- return output.join('');
- }
-
- var str_format = function() {
- if (!str_format.cache.hasOwnProperty(arguments[0])) {
- str_format.cache[arguments[0]] = str_format.parse(arguments[0]);
- }
- return str_format.format.call(null, str_format.cache[arguments[0]], arguments);
- };
-
- str_format.format = function(parse_tree, argv) {
- var cursor = 1, tree_length = parse_tree.length, node_type = '', arg, output = [], i, k, match, pad, pad_character, pad_length;
- for (i = 0; i < tree_length; i++) {
- node_type = get_type(parse_tree[i]);
- if (node_type === 'string') {
- output.push(parse_tree[i]);
- }
- else if (node_type === 'array') {
- match = parse_tree[i]; // convenience purposes only
- if (match[2]) { // keyword argument
- arg = argv[cursor];
- for (k = 0; k < match[2].length; k++) {
- if (!arg.hasOwnProperty(match[2][k])) {
- throw(sprintf('[sprintf] property "%s" does not exist', match[2][k]));
- }
- arg = arg[match[2][k]];
- }
- }
- else if (match[1]) { // positional argument (explicit)
- arg = argv[match[1]];
- }
- else { // positional argument (implicit)
- arg = argv[cursor++];
- }
-
- if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) {
- throw(sprintf('[sprintf] expecting number but found %s', get_type(arg)));
- }
- switch (match[8]) {
- case 'b': arg = arg.toString(2); break;
- case 'c': arg = String.fromCharCode(arg); break;
- case 'd': arg = parseInt(arg, 10); break;
- case 'e': arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential(); break;
- case 'f': arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg); break;
- case 'o': arg = arg.toString(8); break;
- case 's': arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg); break;
- case 'u': arg = Math.abs(arg); break;
- case 'x': arg = arg.toString(16); break;
- case 'X': arg = arg.toString(16).toUpperCase(); break;
- }
- arg = (/[def]/.test(match[8]) && match[3] && arg >= 0 ? '+'+ arg : arg);
- pad_character = match[4] ? match[4] == '0' ? '0' : match[4].charAt(1) : ' ';
- pad_length = match[6] - String(arg).length;
- pad = match[6] ? str_repeat(pad_character, pad_length) : '';
- output.push(match[5] ? arg + pad : pad + arg);
- }
- }
- return output.join('');
- };
-
- str_format.cache = {};
-
- str_format.parse = function(fmt) {
- var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
- while (_fmt) {
- if ((match = /^[^\x25]+/.exec(_fmt)) !== null) {
- parse_tree.push(match[0]);
- }
- else if ((match = /^\x25{2}/.exec(_fmt)) !== null) {
- parse_tree.push('%');
- }
- else if ((match = /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt)) !== null) {
- if (match[2]) {
- arg_names |= 1;
- var field_list = [], replacement_field = match[2], field_match = [];
- if ((field_match = /^([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
- field_list.push(field_match[1]);
- while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
- if ((field_match = /^\.([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
- field_list.push(field_match[1]);
- }
- else if ((field_match = /^\[(\d+)\]/.exec(replacement_field)) !== null) {
- field_list.push(field_match[1]);
- }
- else {
- throw('[sprintf] huh?');
- }
- }
- }
- else {
- throw('[sprintf] huh?');
- }
- match[2] = field_list;
- }
- else {
- arg_names |= 2;
- }
- if (arg_names === 3) {
- throw('[sprintf] mixing positional and named placeholders is not (yet) supported');
- }
- parse_tree.push(match);
- }
- else {
- throw('[sprintf] huh?');
- }
- _fmt = _fmt.substring(match[0].length);
- }
- return parse_tree;
- };
-
- return str_format;
-})();
-
-var vsprintf = function(fmt, argv) {
- argv.unshift(fmt);
- return sprintf.apply(null, argv);
-};
-
-exports.sprintf = sprintf;
-exports.vsprintf = vsprintf;
-});
-
-require.define("/shred/response.js", function (require, module, exports, __dirname, __filename) {
- // The `Response object` encapsulates a Node.js HTTP response.
-
-var Content = require("./content")
- , HeaderMixins = require("./mixins/headers")
- , CookieJarLib = require( "cookiejar" )
- , Cookie = CookieJarLib.Cookie
-;
-
-// Browser doesn't have zlib.
-var zlib = null;
-try {
- zlib = require('zlib');
-} catch (e) {
- console.warn("no zlib library");
-}
-
-// Iconv doesn't work in browser
-var Iconv = null;
-try {
- Iconv = require('iconv-lite');
-} catch (e) {
- console.warn("no iconv library");
-}
-
-// Construct a `Response` object. You should never have to do this directly. The
-// `Request` object handles this, getting the raw response object and passing it
-// in here, along with the request. The callback allows us to stream the response
-// and then use the callback to let the request know when it's ready.
-var Response = function(raw, request, callback) {
- var response = this;
- this._raw = raw;
-
- // The `._setHeaders` method is "private"; you can't otherwise set headers on
- // the response.
- this._setHeaders.call(this,raw.headers);
-
- // store any cookies
- if (request.cookieJar && this.getHeader('set-cookie')) {
- var cookieStrings = this.getHeader('set-cookie');
- var cookieObjs = []
- , cookie;
-
- for (var i = 0; i < cookieStrings.length; i++) {
- var cookieString = cookieStrings[i];
- if (!cookieString) {
- continue;
- }
-
- if (!cookieString.match(/domain\=/i)) {
- cookieString += '; domain=' + request.host;
- }
-
- if (!cookieString.match(/path\=/i)) {
- cookieString += '; path=' + request.path;
- }
-
- try {
- cookie = new Cookie(cookieString);
- if (cookie) {
- cookieObjs.push(cookie);
- }
- } catch (e) {
- console.warn("Tried to set bad cookie: " + cookieString);
- }
- }
-
- request.cookieJar.setCookies(cookieObjs);
- }
-
- this.request = request;
- this.client = request.client;
- this.log = this.request.log;
-
- // Stream the response content entity and fire the callback when we're done.
- // Store the incoming data in a array of Buffers which we concatinate into one
- // buffer at the end. We need to use buffers instead of strings here in order
- // to preserve binary data.
- var chunkBuffers = [];
- var dataLength = 0;
- raw.on("data", function(chunk) {
- chunkBuffers.push(chunk);
- dataLength += chunk.length;
- });
- raw.on("end", function() {
- var body;
- if (typeof Buffer === 'undefined') {
- // Just concatinate into a string
- body = chunkBuffers.join('');
- } else {
- // Initialize new buffer and add the chunks one-at-a-time.
- body = new Buffer(dataLength);
- for (var i = 0, pos = 0; i < chunkBuffers.length; i++) {
- chunkBuffers[i].copy(body, pos);
- pos += chunkBuffers[i].length;
- }
- }
-
- var setBodyAndFinish = function (body) {
- response._body = new Content({
- body: body,
- type: response.getHeader("Content-Type")
- });
- callback(response);
- }
-
- if (zlib && response.getHeader("Content-Encoding") === 'gzip'){
- zlib.gunzip(body, function (err, gunzippedBody) {
- if (Iconv && response.request.encoding){
- body = Iconv.fromEncoding(gunzippedBody,response.request.encoding);
- } else {
- body = gunzippedBody.toString();
- }
- setBodyAndFinish(body);
- })
- }
- else{
- if (response.request.encoding){
- body = Iconv.fromEncoding(body,response.request.encoding);
- }
- setBodyAndFinish(body);
- }
- });
-};
-
-// The `Response` object can be pretty overwhelming to view using the built-in
-// Node.js inspect method. We want to make it a bit more manageable. This
-// probably goes [too far in the other
-// direction](https://github.com/spire-io/shred/issues/2).
-
-Response.prototype = {
- inspect: function() {
- var response = this;
- var headers = this.format_headers();
- var summary = ["<Shred Response> ", response.status].join(" ")
- return [ summary, "- Headers:", headers].join("\n");
- },
- format_headers: function () {
- var array = []
- var headers = this._headers
- for (var key in headers) {
- if (headers.hasOwnProperty(key)) {
- var value = headers[key]
- array.push("\t" + key + ": " + value);
- }
- }
- return array.join("\n");
- }
-};
-
-// `Response` object properties, all of which are read-only:
-Object.defineProperties(Response.prototype, {
-
-// - **status**. The HTTP status code for the response.
- status: {
- get: function() { return this._raw.statusCode; },
- enumerable: true
- },
-
-// - **content**. The HTTP content entity, if any. Provided as a [content
-// object](./content.html), which will attempt to convert the entity based upon
-// the `content-type` header. The converted value is available as
-// `content.data`. The original raw content entity is available as
-// `content.body`.
- body: {
- get: function() { return this._body; }
- },
- content: {
- get: function() { return this.body; },
- enumerable: true
- },
-
-// - **isRedirect**. Is the response a redirect? These are responses with 3xx
-// status and a `Location` header.
- isRedirect: {
- get: function() {
- return (this.status>299
- &&this.status<400
- &&this.getHeader("Location"));
- },
- enumerable: true
- },
-
-// - **isError**. Is the response an error? These are responses with status of
-// 400 or greater.
- isError: {
- get: function() {
- return (this.status === 0 || this.status > 399)
- },
- enumerable: true
- }
-});
-
-// Add in the [getters for accessing the normalized headers](./headers.js).
-HeaderMixins.getters(Response);
-HeaderMixins.privateSetters(Response);
-
-// Work around Mozilla bug #608735 [https://bugzil.la/608735], which causes
-// getAllResponseHeaders() to return {} if the response is a CORS request.
-// xhr.getHeader still works correctly.
-var getHeader = Response.prototype.getHeader;
-Response.prototype.getHeader = function (name) {
- return (getHeader.call(this,name) ||
- (typeof this._raw.getHeader === 'function' && this._raw.getHeader(name)));
-};
-
-module.exports = Response;
-
-});
-
-require.define("/shred/content.js", function (require, module, exports, __dirname, __filename) {
-
-// The purpose of the `Content` object is to abstract away the data conversions
-// to and from raw content entities as strings. For example, you want to be able
-// to pass in a Javascript object and have it be automatically converted into a
-// JSON string if the `content-type` is set to a JSON-based media type.
-// Conversely, you want to be able to transparently get back a Javascript object
-// in the response if the `content-type` is a JSON-based media-type.
-
-// One limitation of the current implementation is that it [assumes the `charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
-
-// The `Content` constructor takes an options object, which *must* have either a
-// `body` or `data` property and *may* have a `type` property indicating the
-// media type. If there is no `type` attribute, a default will be inferred.
-var Content = function(options) {
- this.body = options.body;
- this.data = options.data;
- this.type = options.type;
-};
-
-Content.prototype = {
- // Treat `toString()` as asking for the `content.body`. That is, the raw content entity.
- //
- // toString: function() { return this.body; }
- //
- // Commented out, but I've forgotten why. :/
-};
-
-
-// `Content` objects have the following attributes:
-Object.defineProperties(Content.prototype,{
-
-// - **type**. Typically accessed as `content.type`, reflects the `content-type`
-// header associated with the request or response. If not passed as an options
-// to the constructor or set explicitly, it will infer the type the `data`
-// attribute, if possible, and, failing that, will default to `text/plain`.
- type: {
- get: function() {
- if (this._type) {
- return this._type;
- } else {
- if (this._data) {
- switch(typeof this._data) {
- case "string": return "text/plain";
- case "object": return "application/json";
- }
- }
- }
- return "text/plain";
- },
- set: function(value) {
- this._type = value;
- return this;
- },
- enumerable: true
- },
-
-// - **data**. Typically accessed as `content.data`, reflects the content entity
-// converted into Javascript data. This can be a string, if the `type` is, say,
-// `text/plain`, but can also be a Javascript object. The conversion applied is
-// based on the `processor` attribute. The `data` attribute can also be set
-// directly, in which case the conversion will be done the other way, to infer
-// the `body` attribute.
- data: {
- get: function() {
- if (this._body) {
- return this.processor.parser(this._body);
- } else {
- return this._data;
- }
- },
- set: function(data) {
- if (this._body&&data) Errors.setDataWithBody(this);
- this._data = data;
- return this;
- },
- enumerable: true
- },
-
-// - **body**. Typically accessed as `content.body`, reflects the content entity
-// as a UTF-8 string. It is the mirror of the `data` attribute. If you set the
-// `data` attribute, the `body` attribute will be inferred and vice-versa. If
-// you attempt to set both, an exception is raised.
- body: {
- get: function() {
- if (this._data) {
- return this.processor.stringify(this._data);
- } else {
- return this.processor.stringify(this._body);
- }
- },
- set: function(body) {
- if (this._data&&body) Errors.setBodyWithData(this);
- this._body = body;
- return this;
- },
- enumerable: true
- },
-
-// - **processor**. The functions that will be used to convert to/from `data` and
-// `body` attributes. You can add processors. The two that are built-in are for
-// `text/plain`, which is basically an identity transformation and
-// `application/json` and other JSON-based media types (including custom media
-// types with `+json`). You can add your own processors. See below.
- processor: {
- get: function() {
- var processor = Content.processors[this.type];
- if (processor) {
- return processor;
- } else {
- // Return the first processor that matches any part of the
- // content type. ex: application/vnd.foobar.baz+json will match json.
- var main = this.type.split(";")[0];
- var parts = main.split(/\+|\//);
- for (var i=0, l=parts.length; i < l; i++) {
- processor = Content.processors[parts[i]]
- }
- return processor || {parser:identity,stringify:toString};
- }
- },
- enumerable: true
- },
-
-// - **length**. Typically accessed as `content.length`, returns the length in
-// bytes of the raw content entity.
- length: {
- get: function() {
- if (typeof Buffer !== 'undefined') {
- return Buffer.byteLength(this.body);
- }
- return this.body.length;
- }
- }
-});
-
-Content.processors = {};
-
-// The `registerProcessor` function allows you to add your own processors to
-// convert content entities. Each processor consists of a Javascript object with
-// two properties:
-// - **parser**. The function used to parse a raw content entity and convert it
-// into a Javascript data type.
-// - **stringify**. The function used to convert a Javascript data type into a
-// raw content entity.
-Content.registerProcessor = function(types,processor) {
-
-// You can pass an array of types that will trigger this processor, or just one.
-// We determine the array via duck-typing here.
- if (types.forEach) {
- types.forEach(function(type) {
- Content.processors[type] = processor;
- });
- } else {
- // If you didn't pass an array, we just use what you pass in.
- Content.processors[types] = processor;
- }
-};
-
-// Register the identity processor, which is used for text-based media types.
-var identity = function(x) { return x; }
- , toString = function(x) { return x.toString(); }
-Content.registerProcessor(
- ["text/html","text/plain","text"],
- { parser: identity, stringify: toString });
-
-// Register the JSON processor, which is used for JSON-based media types.
-Content.registerProcessor(
- ["application/json; charset=utf-8","application/json","json"],
- {
- parser: function(string) {
- return JSON.parse(string);
- },
- stringify: function(data) {
- return JSON.stringify(data); }});
-
-// Error functions are defined separately here in an attempt to make the code
-// easier to read.
-var Errors = {
- setDataWithBody: function(object) {
- throw new Error("Attempt to set data attribute of a content object " +
- "when the body attributes was already set.");
- },
- setBodyWithData: function(object) {
- throw new Error("Attempt to set body attribute of a content object " +
- "when the data attributes was already set.");
- }
-}
-module.exports = Content;
-
-});
-
-require.define("/shred/mixins/headers.js", function (require, module, exports, __dirname, __filename) {
- // The header mixins allow you to add HTTP header support to any object. This
-// might seem pointless: why not simply use a hash? The main reason is that, per
-// the [HTTP spec](http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2),
-// headers are case-insensitive. So, for example, `content-type` is the same as
-// `CONTENT-TYPE` which is the same as `Content-Type`. Since there is no way to
-// overload the index operator in Javascript, using a hash to represent the
-// headers means it's possible to have two conflicting values for a single
-// header.
-//
-// The solution to this is to provide explicit methods to set or get headers.
-// This also has the benefit of allowing us to introduce additional variations,
-// including snake case, which we automatically convert to what Matthew King has
-// dubbed "corset case" - the hyphen-separated names with initial caps:
-// `Content-Type`. We use corset-case just in case we're dealing with servers
-// that haven't properly implemented the spec.
-
-// Convert headers to corset-case. **Example:** `CONTENT-TYPE` will be converted
-// to `Content-Type`.
-
-var corsetCase = function(string) {
- return string.toLowerCase()
- //.replace("_","-")
- .replace(/(^|-)(\w)/g,
- function(s) { return s.toUpperCase(); });
-};
-
-// We suspect that `initializeHeaders` was once more complicated ...
-var initializeHeaders = function(object) {
- return {};
-};
-
-// Access the `_headers` property using lazy initialization. **Warning:** If you
-// mix this into an object that is using the `_headers` property already, you're
-// going to have trouble.
-var $H = function(object) {
- return object._headers||(object._headers=initializeHeaders(object));
-};
-
-// Hide the implementations as private functions, separate from how we expose them.
-
-// The "real" `getHeader` function: get the header after normalizing the name.
-var getHeader = function(object,name) {
- return $H(object)[corsetCase(name)];
-};
-
-// The "real" `getHeader` function: get one or more headers, or all of them
-// if you don't ask for any specifics.
-var getHeaders = function(object,names) {
- var keys = (names && names.length>0) ? names : Object.keys($H(object));
- var hash = keys.reduce(function(hash,key) {
- hash[key] = getHeader(object,key);
- return hash;
- },{});
- // Freeze the resulting hash so you don't mistakenly think you're modifying
- // the real headers.
- Object.freeze(hash);
- return hash;
-};
-
-// The "real" `setHeader` function: set a header, after normalizing the name.
-var setHeader = function(object,name,value) {
- $H(object)[corsetCase(name)] = value;
- return object;
-};
-
-// The "real" `setHeaders` function: set multiple headers based on a hash.
-var setHeaders = function(object,hash) {
- for( var key in hash ) { setHeader(object,key,hash[key]); };
- return this;
-};
-
-// Here's where we actually bind the functionality to an object. These mixins work by
-// exposing mixin functions. Each function mixes in a specific batch of features.
-module.exports = {
-
- // Add getters.
- getters: function(constructor) {
- constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
- constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
- },
- // Add setters but as "private" methods.
- privateSetters: function(constructor) {
- constructor.prototype._setHeader = function(key,value) { return setHeader(this,key,value); };
- constructor.prototype._setHeaders = function(hash) { return setHeaders(this,hash); };
- },
- // Add setters.
- setters: function(constructor) {
- constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
- constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
- },
- // Add both getters and setters.
- gettersAndSetters: function(constructor) {
- constructor.prototype.getHeader = function(name) { return getHeader(this,name); };
- constructor.prototype.getHeaders = function() { return getHeaders(this,arguments); };
- constructor.prototype.setHeader = function(key,value) { return setHeader(this,key,value); };
- constructor.prototype.setHeaders = function(hash) { return setHeaders(this,hash); };
- },
-};
-
-});
-
-require.define("/node_modules/iconv-lite/package.json", function (require, module, exports, __dirname, __filename) {
- module.exports = {}
-});
-
-require.define("/node_modules/iconv-lite/index.js", function (require, module, exports, __dirname, __filename) {
- // Module exports
-var iconv = module.exports = {
- toEncoding: function(str, encoding) {
- return iconv.getCodec(encoding).toEncoding(str);
- },
- fromEncoding: function(buf, encoding) {
- return iconv.getCodec(encoding).fromEncoding(buf);
- },
-
- defaultCharUnicode: '\ufffd',
- defaultCharSingleByte: '?',
-
- // Get correct codec for given encoding.
- getCodec: function(encoding) {
- var enc = encoding || "utf8";
- var codecOptions = undefined;
- while (1) {
- if (getType(enc) === "String")
- enc = enc.replace(/[- ]/g, "").toLowerCase();
- var codec = iconv.encodings[enc];
- var type = getType(codec);
- if (type === "String") {
- // Link to other encoding.
- codecOptions = {originalEncoding: enc};
- enc = codec;
- }
- else if (type === "Object" && codec.type != undefined) {
- // Options for other encoding.
- codecOptions = codec;
- enc = codec.type;
- }
- else if (type === "Function")
- // Codec itself.
- return codec(codecOptions);
- else
- throw new Error("Encoding not recognized: '" + encoding + "' (searched as: '"+enc+"')");
- }
- },
-
- // Define basic encodings
- encodings: {
- internal: function(options) {
- return {
- toEncoding: function(str) {
- return new Buffer(ensureString(str), options.originalEncoding);
- },
- fromEncoding: function(buf) {
- return ensureBuffer(buf).toString(options.originalEncoding);
- }
- };
- },
- utf8: "internal",
- ucs2: "internal",
- binary: "internal",
- ascii: "internal",
- base64: "internal",
-
- // Codepage single-byte encodings.
- singlebyte: function(options) {
- // Prepare chars if needed
- if (!options.chars || (options.chars.length !== 128 && options.chars.length !== 256))
- throw new Error("Encoding '"+options.type+"' has incorrect 'chars' (must be of len 128 or 256)");
-
- if (options.chars.length === 128)
- options.chars = asciiString + options.chars;
-
- if (!options.charsBuf) {
- options.charsBuf = new Buffer(options.chars, 'ucs2');
- }
-
- if (!options.revCharsBuf) {
- options.revCharsBuf = new Buffer(65536);
- var defChar = iconv.defaultCharSingleByte.charCodeAt(0);
- for (var i = 0; i < options.revCharsBuf.length; i++)
- options.revCharsBuf[i] = defChar;
- for (var i = 0; i < options.chars.length; i++)
- options.revCharsBuf[options.chars.charCodeAt(i)] = i;
- }
-
- return {
- toEncoding: function(str) {
- str = ensureString(str);
-
- var buf = new Buffer(str.length);
- var revCharsBuf = options.revCharsBuf;
- for (var i = 0; i < str.length; i++)
- buf[i] = revCharsBuf[str.charCodeAt(i)];
-
- return buf;
- },
- fromEncoding: function(buf) {
- buf = ensureBuffer(buf);
-
- // Strings are immutable in JS -> we use ucs2 buffer to speed up computations.
- var charsBuf = options.charsBuf;
- var newBuf = new Buffer(buf.length*2);
- var idx1 = 0, idx2 = 0;
- for (var i = 0, _len = buf.length; i < _len; i++) {
- idx1 = buf[i]*2; idx2 = i*2;
- newBuf[idx2] = charsBuf[idx1];
- newBuf[idx2+1] = charsBuf[idx1+1];
- }
- return newBuf.toString('ucs2');
- }
- };
- },
-
- // Codepage double-byte encodings.
- table: function(options) {
- var table = options.table, key, revCharsTable = options.revCharsTable;
- if (!table) {
- throw new Error("Encoding '" + options.type +"' has incorect 'table' option");
- }
- if(!revCharsTable) {
- revCharsTable = options.revCharsTable = {};
- for (key in table) {
- revCharsTable[table[key]] = parseInt(key);
- }
- }
-
- return {
- toEncoding: function(str) {
- str = ensureString(str);
- var strLen = str.length;
- var bufLen = strLen;
- for (var i = 0; i < strLen; i++)
- if (str.charCodeAt(i) >> 7)
- bufLen++;
-
- var newBuf = new Buffer(bufLen), gbkcode, unicode,
- defaultChar = revCharsTable[iconv.defaultCharUnicode.charCodeAt(0)];
-
- for (var i = 0, j = 0; i < strLen; i++) {
- unicode = str.charCodeAt(i);
- if (unicode >> 7) {
- gbkcode = revCharsTable[unicode] || defaultChar;
- newBuf[j++] = gbkcode >> 8; //high byte;
- newBuf[j++] = gbkcode & 0xFF; //low byte
- } else {//ascii
- newBuf[j++] = unicode;
- }
- }
- return newBuf;
- },
- fromEncoding: function(buf) {
- buf = ensureBuffer(buf);
- var bufLen = buf.length, strLen = 0;
- for (var i = 0; i < bufLen; i++) {
- strLen++;
- if (buf[i] & 0x80) //the high bit is 1, so this byte is gbkcode's high byte.skip next byte
- i++;
- }
- var newBuf = new Buffer(strLen*2), unicode, gbkcode,
- defaultChar = iconv.defaultCharUnicode.charCodeAt(0);
-
- for (var i = 0, j = 0; i < bufLen; i++, j+=2) {
- gbkcode = buf[i];
- if (gbkcode & 0x80) {
- gbkcode = (gbkcode << 8) + buf[++i];
- unicode = table[gbkcode] || defaultChar;
- } else {
- unicode = gbkcode;
- }
- newBuf[j] = unicode & 0xFF; //low byte
- newBuf[j+1] = unicode >> 8; //high byte
- }
- return newBuf.toString('ucs2');
- }
- }
- }
- }
-};
-
-// Add aliases to convert functions
-iconv.encode = iconv.toEncoding;
-iconv.decode = iconv.fromEncoding;
-
-// Load other encodings from files in /encodings dir.
-var encodingsDir = __dirname+"/encodings/",
- fs = require('fs');
-fs.readdirSync(encodingsDir).forEach(function(file) {
- if(fs.statSync(encodingsDir + file).isDirectory()) return;
- var encodings = require(encodingsDir + file)
- for (var key in encodings)
- iconv.encodings[key] = encodings[key]
-});
-
-// Utilities
-var asciiString = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f'+
- ' !"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x7f';
-
-var ensureBuffer = function(buf) {
- buf = buf || new Buffer(0);
- return (buf instanceof Buffer) ? buf : new Buffer(buf.toString(), "utf8");
-}
-
-var ensureString = function(str) {
- str = str || "";
- return (str instanceof String) ? str : str.toString((str instanceof Buffer) ? 'utf8' : undefined);
-}
-
-var getType = function(obj) {
- return Object.prototype.toString.call(obj).slice(8, -1);
-}
-
-
-});
-
-require.define("/node_modules/http-browserify/package.json", function (require, module, exports, __dirname, __filename) {
- module.exports = {"main":"index.js","browserify":"browser.js"}
-});
-
-require.define("/node_modules/http-browserify/browser.js", function (require, module, exports, __dirname, __filename) {
- var http = module.exports;
-var EventEmitter = require('events').EventEmitter;
-var Request = require('./lib/request');
-
-http.request = function (params, cb) {
- if (!params) params = {};
- if (!params.host) params.host = window.location.host.split(':')[0];
- if (!params.port) params.port = window.location.port;
-
- var req = new Request(new xhrHttp, params);
- if (cb) req.on('response', cb);
- return req;
-};
-
-http.get = function (params, cb) {
- params.method = 'GET';
- var req = http.request(params, cb);
- req.end();
- return req;
-};
-
-var xhrHttp = (function () {
- if (typeof window === 'undefined') {
- throw new Error('no window object present');
- }
- else if (window.XMLHttpRequest) {
- return window.XMLHttpRequest;
- }
- else if (window.ActiveXObject) {
- var axs = [
- 'Msxml2.XMLHTTP.6.0',
- 'Msxml2.XMLHTTP.3.0',
- 'Microsoft.XMLHTTP'
- ];
- for (var i = 0; i < axs.length; i++) {
- try {
- var ax = new(window.ActiveXObject)(axs[i]);
- return function () {
- if (ax) {
- var ax_ = ax;
- ax = null;
- return ax_;
- }
- else {
- return new(window.ActiveXObject)(axs[i]);
- }
- };
- }
- catch (e) {}
- }
- throw new Error('ajax not supported in this browser')
- }
- else {
- throw new Error('ajax not supported in this browser');
- }
-})();
-
-http.STATUS_CODES = {
- 100 : 'Continue',
- 101 : 'Switching Protocols',
- 102 : 'Processing', // RFC 2518, obsoleted by RFC 4918
- 200 : 'OK',
- 201 : 'Created',
- 202 : 'Accepted',
- 203 : 'Non-Authoritative Information',
- 204 : 'No Content',
- 205 : 'Reset Content',
- 206 : 'Partial Content',
- 207 : 'Multi-Status', // RFC 4918
- 300 : 'Multiple Choices',
- 301 : 'Moved Permanently',
- 302 : 'Moved Temporarily',
- 303 : 'See Other',
- 304 : 'Not Modified',
- 305 : 'Use Proxy',
- 307 : 'Temporary Redirect',
- 400 : 'Bad Request',
- 401 : 'Unauthorized',
- 402 : 'Payment Required',
- 403 : 'Forbidden',
- 404 : 'Not Found',
- 405 : 'Method Not Allowed',
- 406 : 'Not Acceptable',
- 407 : 'Proxy Authentication Required',
- 408 : 'Request Time-out',
- 409 : 'Conflict',
- 410 : 'Gone',
- 411 : 'Length Required',
- 412 : 'Precondition Failed',
- 413 : 'Request Entity Too Large',
- 414 : 'Request-URI Too Large',
- 415 : 'Unsupported Media Type',
- 416 : 'Requested Range Not Satisfiable',
- 417 : 'Expectation Failed',
- 418 : 'I\'m a teapot', // RFC 2324
- 422 : 'Unprocessable Entity', // RFC 4918
- 423 : 'Locked', // RFC 4918
- 424 : 'Failed Dependency', // RFC 4918
- 425 : 'Unordered Collection', // RFC 4918
- 426 : 'Upgrade Required', // RFC 2817
- 500 : 'Internal Server Error',
- 501 : 'Not Implemented',
- 502 : 'Bad Gateway',
- 503 : 'Service Unavailable',
- 504 : 'Gateway Time-out',
- 505 : 'HTTP Version not supported',
- 506 : 'Variant Also Negotiates', // RFC 2295
- 507 : 'Insufficient Storage', // RFC 4918
- 509 : 'Bandwidth Limit Exceeded',
- 510 : 'Not Extended' // RFC 2774
-};
-
-});
-
-require.define("/node_modules/http-browserify/lib/request.js", function (require, module, exports, __dirname, __filename) {
- var EventEmitter = require('events').EventEmitter;
-var Response = require('./response');
-var isSafeHeader = require('./isSafeHeader');
-
-var Request = module.exports = function (xhr, params) {
- var self = this;
- self.xhr = xhr;
- self.body = '';
-
- var uri = params.host + ':' + params.port + (params.path || '/');
-
- xhr.open(
- params.method || 'GET',
- (params.scheme || 'http') + '://' + uri,
- true
- );
-
- if (params.headers) {
- Object.keys(params.headers).forEach(function (key) {
- if (!isSafeHeader(key)) return;
- var value = params.headers[key];
- if (Array.isArray(value)) {
- value.forEach(function (v) {
- xhr.setRequestHeader(key, v);
- });
- }
- else xhr.setRequestHeader(key, value)
- });
- }
-
- var res = new Response(xhr);
- res.on('ready', function () {
- self.emit('response', res);
- });
-
- xhr.onreadystatechange = function () {
- res.handle(xhr);
- };
-};
-
-Request.prototype = new EventEmitter;
-
-Request.prototype.setHeader = function (key, value) {
- if ((Array.isArray && Array.isArray(value))
- || value instanceof Array) {
- for (var i = 0; i < value.length; i++) {
- this.xhr.setRequestHeader(key, value[i]);
- }
- }
- else {
- this.xhr.setRequestHeader(key, value);
- }
-};
-
-Request.prototype.write = function
<TRUNCATED>
[55/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/swagger-ui.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/swagger-ui.js b/geode-web-api/src/main/webapp/docs/swagger-ui.js
deleted file mode 100644
index 7fc84a4..0000000
--- a/geode-web-api/src/main/webapp/docs/swagger-ui.js
+++ /dev/null
@@ -1,2269 +0,0 @@
-// swagger-ui.js
-// version 2.0.17
-$(function() {
-
- // Helper function for vertically aligning DOM elements
- // http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/
- $.fn.vAlign = function() {
- return this.each(function(i){
- var ah = $(this).height();
- var ph = $(this).parent().height();
- var mh = (ph - ah) / 2;
- $(this).css('margin-top', mh);
- });
- };
-
- $.fn.stretchFormtasticInputWidthToParent = function() {
- return this.each(function(i){
- var p_width = $(this).closest("form").innerWidth();
- var p_padding = parseInt($(this).closest("form").css('padding-left') ,10) + parseInt($(this).closest("form").css('padding-right'), 10);
- var this_padding = parseInt($(this).css('padding-left'), 10) + parseInt($(this).css('padding-right'), 10);
- $(this).css('width', p_width - p_padding - this_padding);
- });
- };
-
- $('form.formtastic li.string input, form.formtastic textarea').stretchFormtasticInputWidthToParent();
-
- // Vertically center these paragraphs
- // Parent may need a min-height for this to work..
- $('ul.downplayed li div.content p').vAlign();
-
- // When a sandbox form is submitted..
- $("form.sandbox").submit(function(){
-
- var error_free = true;
-
- // Cycle through the forms required inputs
- $(this).find("input.required").each(function() {
-
- // Remove any existing error styles from the input
- $(this).removeClass('error');
-
- // Tack the error style on if the input is empty..
- if ($(this).val() == '') {
- $(this).addClass('error');
- $(this).wiggle();
- error_free = false;
- }
-
- });
-
- return error_free;
- });
-
-});
-
-function clippyCopiedCallback(a) {
- $('#api_key_copied').fadeIn().delay(1000).fadeOut();
-
- // var b = $("#clippy_tooltip_" + a);
- // b.length != 0 && (b.attr("title", "copied!").trigger("tipsy.reload"), setTimeout(function() {
- // b.attr("title", "copy to clipboard")
- // },
- // 500))
-}
-
-// Logging function that accounts for browsers that don't have window.console
-log = function(){
- log.history = log.history || [];
- log.history.push(arguments);
- if(this.console){
- console.log( Array.prototype.slice.call(arguments) );
- }
-};
-
-// Handle browsers that do console incorrectly (IE9 and below, see http://stackoverflow.com/a/5539378/7913)
-if (Function.prototype.bind && console && typeof console.log == "object") {
- [
- "log","info","warn","error","assert","dir","clear","profile","profileEnd"
- ].forEach(function (method) {
- console[method] = this.bind(console[method], console);
- }, Function.prototype.call);
-}
-
-var Docs = {
-
- shebang: function() {
-
- // If shebang has an operation nickname in it..
- // e.g. /docs/#!/words/get_search
- var fragments = $.param.fragment().split('/');
- fragments.shift(); // get rid of the bang
-
- switch (fragments.length) {
- case 1:
- // Expand all operations for the resource and scroll to it
- log('shebang resource:' + fragments[0]);
- var dom_id = 'resource_' + fragments[0];
-
- Docs.expandEndpointListForResource(fragments[0]);
- $("#"+dom_id).slideto({highlight: false});
- break;
- case 2:
- // Refer to the endpoint DOM element, e.g. #words_get_search
- log('shebang endpoint: ' + fragments.join('_'));
-
- // Expand Resource
- Docs.expandEndpointListForResource(fragments[0]);
- $("#"+dom_id).slideto({highlight: false});
-
- // Expand operation
- var li_dom_id = fragments.join('_');
- var li_content_dom_id = li_dom_id + "_content";
-
- log("li_dom_id " + li_dom_id);
- log("li_content_dom_id " + li_content_dom_id);
-
- Docs.expandOperation($('#'+li_content_dom_id));
- $('#'+li_dom_id).slideto({highlight: false});
- break;
- }
-
- },
-
- toggleEndpointListForResource: function(resource) {
- var elem = $('li#resource_' + Docs.escapeResourceName(resource) + ' ul.endpoints');
- if (elem.is(':visible')) {
- Docs.collapseEndpointListForResource(resource);
- } else {
- Docs.expandEndpointListForResource(resource);
- }
- },
-
- // Expand resource
- expandEndpointListForResource: function(resource) {
- var resource = Docs.escapeResourceName(resource);
- if (resource == '') {
- $('.resource ul.endpoints').slideDown();
- return;
- }
-
- $('li#resource_' + resource).addClass('active');
-
- var elem = $('li#resource_' + resource + ' ul.endpoints');
- elem.slideDown();
- },
-
- // Collapse resource and mark as explicitly closed
- collapseEndpointListForResource: function(resource) {
- var resource = Docs.escapeResourceName(resource);
- $('li#resource_' + resource).removeClass('active');
-
- var elem = $('li#resource_' + resource + ' ul.endpoints');
- elem.slideUp();
- },
-
- expandOperationsForResource: function(resource) {
- // Make sure the resource container is open..
- Docs.expandEndpointListForResource(resource);
-
- if (resource == '') {
- $('.resource ul.endpoints li.operation div.content').slideDown();
- return;
- }
-
- $('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
- Docs.expandOperation($(this));
- });
- },
-
- collapseOperationsForResource: function(resource) {
- // Make sure the resource container is open..
- Docs.expandEndpointListForResource(resource);
-
- $('li#resource_' + Docs.escapeResourceName(resource) + ' li.operation div.content').each(function() {
- Docs.collapseOperation($(this));
- });
- },
-
- escapeResourceName: function(resource) {
- return resource.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g, "\\$&");
- },
-
- expandOperation: function(elem) {
- elem.slideDown();
- },
-
- collapseOperation: function(elem) {
- elem.slideUp();
- }
-};(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['content_type'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", self=this;
-
-function program1(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers.each.call(depth0, depth0.produces, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n";
- return buffer;
- }
-function program2(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <option value=\"";
- stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\">";
- stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</option>\n ";
- return buffer;
- }
-
-function program4(depth0,data) {
-
-
- return "\n <option value=\"application/json\">application/json</option>\n";
- }
-
- buffer += "<label for=\"contentType\"></label>\n<select name=\"contentType\">\n";
- stack1 = helpers['if'].call(depth0, depth0.produces, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n</select>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['main'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-
- var buffer = "", stack1, stack2;
- buffer += "\n <div class=\"info_title\">"
- + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.title)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
- + "</div>\n <div class=\"info_description\">";
- stack2 = ((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.description)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "</div>\n ";
- stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl), {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "\n ";
- stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact), {hash:{},inverse:self.noop,fn:self.program(4, program4, data),data:data});
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "\n ";
- stack2 = helpers['if'].call(depth0, ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license), {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data});
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "\n ";
- return buffer;
- }
-function program2(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "<div class=\"info_tos\"><a href=\""
- + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.termsOfServiceUrl)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
- + "\">Terms of service</a></div>";
- return buffer;
- }
-
-function program4(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "<div class='info_contact'><a href=\"mailto:"
- + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.contact)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
- + "\">Contact the developer</a></div>";
- return buffer;
- }
-
-function program6(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "<div class='info_license'><a href='"
- + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.licenseUrl)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
- + "'>"
- + escapeExpression(((stack1 = ((stack1 = depth0.info),stack1 == null || stack1 === false ? stack1 : stack1.license)),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
- + "</a></div>";
- return buffer;
- }
-
-function program8(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n , <span style=\"font-variant: small-caps\">api version</span>: ";
- if (stack1 = helpers.apiVersion) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.apiVersion; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "\n ";
- return buffer;
- }
-
- buffer += "<div class='info' id='api_info'>\n ";
- stack1 = helpers['if'].call(depth0, depth0.info, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n</div>\n<div class='container' id='resources_container'>\n <ul id='resources'>\n </ul>\n\n <div class=\"footer\">\n <br>\n <br>\n <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: ";
- if (stack1 = helpers.basePath) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.basePath; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "\n ";
- stack1 = helpers['if'].call(depth0, depth0.apiVersion, {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "]</h4>\n </div>\n</div>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['operation'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, blockHelperMissing=helpers.blockHelperMissing;
-
-function program1(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <h4>Implementation Notes</h4>\n <p>";
- if (stack1 = helpers.notes) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.notes; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</p>\n ";
- return buffer;
- }
-
-function program3(depth0,data) {
-
-
- return "\n <div class=\"auth\">\n <span class=\"api-ic ic-error\"></span>";
- }
-
-function program5(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <div id=\"api_information_panel\" style=\"top: 526px; left: 776px; display: none;\">\n ";
- stack1 = helpers.each.call(depth0, depth0, {hash:{},inverse:self.noop,fn:self.program(6, program6, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n </div>\n ";
- return buffer;
- }
-function program6(depth0,data) {
-
- var buffer = "", stack1, stack2;
- buffer += "\n <div title='";
- stack2 = ((stack1 = depth0.description),typeof stack1 === functionType ? stack1.apply(depth0) : stack1);
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "'>"
- + escapeExpression(((stack1 = depth0.scope),typeof stack1 === functionType ? stack1.apply(depth0) : stack1))
- + "</div>\n ";
- return buffer;
- }
-
-function program8(depth0,data) {
-
-
- return "</div>";
- }
-
-function program10(depth0,data) {
-
-
- return "\n <div class='access'>\n <span class=\"api-ic ic-off\" title=\"click to authenticate\"></span>\n </div>\n ";
- }
-
-function program12(depth0,data) {
-
-
- return "\n <h4>Response Class</h4>\n <p><span class=\"model-signature\" /></p>\n <br/>\n <div class=\"response-content-type\" />\n ";
- }
-
-function program14(depth0,data) {
-
-
- return "\n <h4>Parameters</h4>\n <table class='fullwidth'>\n <thead>\n <tr>\n <th style=\"width: 100px; max-width: 100px\">Parameter</th>\n <th style=\"width: 310px; max-width: 310px\">Value</th>\n <th style=\"width: 200px; max-width: 200px\">Description</th>\n <th style=\"width: 100px; max-width: 100px\">Parameter Type</th>\n <th style=\"width: 220px; max-width: 230px\">Data Type</th>\n </tr>\n </thead>\n <tbody class=\"operation-params\">\n\n </tbody>\n </table>\n ";
- }
-
-function program16(depth0,data) {
-
-
- return "\n <div style='margin:0;padding:0;display:inline'></div>\n <h4>Response Messages</h4>\n <table class='fullwidth'>\n <thead>\n <tr>\n <th>HTTP Status Code</th>\n <th>Reason</th>\n <th>Response Model</th>\n </tr>\n </thead>\n <tbody class=\"operation-status\">\n \n </tbody>\n </table>\n ";
- }
-
-function program18(depth0,data) {
-
-
- return "\n ";
- }
-
-function program20(depth0,data) {
-
-
- return "\n <div class='sandbox_header'>\n <input class='submit' name='commit' type='button' value='Try it out!' />\n <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n <img alt='Throbber' class='response_throbber' src='images/throbber.gif' style='display:none' />\n </div>\n ";
- }
-
- buffer += "\n <ul class='operations' >\n <li class='";
- if (stack1 = helpers.method) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.method; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + " operation' id='";
- if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "_";
- if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'>\n <div class='heading'>\n <h3>\n <span class='http_method'>\n <a href='#!/";
- if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "/";
- if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "' class=\"toggleOperation\">";
- if (stack1 = helpers.method) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.method; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</a>\n </span>\n <span class='path'>\n <a href='#!/";
- if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "/";
- if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "' class=\"toggleOperation\">";
- if (stack1 = helpers.path) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.path; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</a>\n </span>\n </h3>\n <ul class='options'>\n <li>\n <a href='#!/";
- if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "/";
- if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "' class=\"toggleOperation\">";
- if (stack1 = helpers.summary) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.summary; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</a>\n </li>\n </ul>\n </div>\n <div class='content' id='";
- if (stack1 = helpers.parentId) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.parentId; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "_";
- if (stack1 = helpers.nickname) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.nickname; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "_content' style='display:none'>\n ";
- stack1 = helpers['if'].call(depth0, depth0.notes, {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- options = {hash:{},inverse:self.noop,fn:self.program(3, program3, data),data:data};
- if (stack1 = helpers.oauth) { stack1 = stack1.call(depth0, options); }
- else { stack1 = depth0.oauth; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- stack1 = helpers.each.call(depth0, depth0.oauth, {hash:{},inverse:self.noop,fn:self.program(5, program5, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- options = {hash:{},inverse:self.noop,fn:self.program(8, program8, data),data:data};
- if (stack1 = helpers.oauth) { stack1 = stack1.call(depth0, options); }
- else { stack1 = depth0.oauth; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- options = {hash:{},inverse:self.noop,fn:self.program(10, program10, data),data:data};
- if (stack1 = helpers.oauth) { stack1 = stack1.call(depth0, options); }
- else { stack1 = depth0.oauth; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if (!helpers.oauth) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.type, {hash:{},inverse:self.noop,fn:self.program(12, program12, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n <form accept-charset='UTF-8' class='sandbox'>\n <div style='margin:0;padding:0;display:inline'></div>\n ";
- stack1 = helpers['if'].call(depth0, depth0.parameters, {hash:{},inverse:self.noop,fn:self.program(14, program14, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.responseMessages, {hash:{},inverse:self.noop,fn:self.program(16, program16, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.isReadOnly, {hash:{},inverse:self.program(20, program20, data),fn:self.program(18, program18, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n </form>\n <div class='response' style='display:none'>\n <h4>Request URL</h4>\n <div class='block request_url'></div>\n <h4>Response Body</h4>\n <div class='block response_body'></div>\n <h4>Response Code</h4>\n <div class='block response_code'></div>\n <h4>Response Headers</h4>\n <div class='block response_headers'></div>\n </div>\n </div>\n </li>\n </ul>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(4, program4, data),fn:self.program(2, program2, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program2(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <input type=\"file\" name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'/>\n <div class=\"parameter-content-type\" />\n ";
- return buffer;
- }
-
-function program4(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program5(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <textarea class='body-textarea' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'>";
- if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</textarea>\n ";
- return buffer;
- }
-
-function program7(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <textarea class='body-textarea' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'></textarea>\n <br />\n <div class=\"parameter-content-type\" />\n ";
- return buffer;
- }
-
-function program9(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(12, program12, data),fn:self.program(10, program10, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program10(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <input class='parameter' minlength='0' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "' placeholder='' type='text' value='";
- if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'/>\n ";
- return buffer;
- }
-
-function program12(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <input class='parameter' minlength='0' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "' placeholder='' type='text' value=''/>\n ";
- return buffer;
- }
-
- buffer += "<td class='code'>";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</td>\n<td>\n\n ";
- stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(9, program9, data),fn:self.program(1, program1, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n\n</td>\n<td>";
- if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</td>\n<td>";
- if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</td>\n<td>\n <span class=\"model-signature\"></span>\n</td>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_list'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, stack2, options, self=this, helperMissing=helpers.helperMissing, functionType="function", escapeExpression=this.escapeExpression;
-
-function program1(depth0,data) {
-
-
- return " multiple='multiple'";
- }
-
-function program3(depth0,data) {
-
-
- return "\n ";
- }
-
-function program5(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(8, program8, data),fn:self.program(6, program6, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program6(depth0,data) {
-
-
- return "\n ";
- }
-
-function program8(depth0,data) {
-
- var buffer = "", stack1, stack2, options;
- buffer += "\n ";
- options = {hash:{},inverse:self.program(11, program11, data),fn:self.program(9, program9, data),data:data};
- stack2 = ((stack1 = helpers.isArray || depth0.isArray),stack1 ? stack1.call(depth0, depth0, options) : helperMissing.call(depth0, "isArray", depth0, options));
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "\n ";
- return buffer;
- }
-function program9(depth0,data) {
-
-
- return "\n ";
- }
-
-function program11(depth0,data) {
-
-
- return "\n <option selected=\"\" value=''></option>\n ";
- }
-
-function program13(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.isDefault, {hash:{},inverse:self.program(16, program16, data),fn:self.program(14, program14, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program14(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <option selected=\"\" value='";
- if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'>";
- if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + " (default)</option>\n ";
- return buffer;
- }
-
-function program16(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <option value='";
- if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'>";
- if (stack1 = helpers.value) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.value; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</option>\n ";
- return buffer;
- }
-
- buffer += "<td class='code'>";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</td>\n<td>\n <select ";
- options = {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data};
- stack2 = ((stack1 = helpers.isArray || depth0.isArray),stack1 ? stack1.call(depth0, depth0, options) : helperMissing.call(depth0, "isArray", depth0, options));
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += " class='parameter' name='";
- if (stack2 = helpers.name) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
- else { stack2 = depth0.name; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
- buffer += escapeExpression(stack2)
- + "'>\n ";
- stack2 = helpers['if'].call(depth0, depth0.required, {hash:{},inverse:self.program(5, program5, data),fn:self.program(3, program3, data),data:data});
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "\n ";
- stack2 = helpers.each.call(depth0, ((stack1 = depth0.allowableValues),stack1 == null || stack1 === false ? stack1 : stack1.descriptiveValues), {hash:{},inverse:self.noop,fn:self.program(13, program13, data),data:data});
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "\n </select>\n</td>\n<td>";
- if (stack2 = helpers.description) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
- else { stack2 = depth0.description; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "</td>\n<td>";
- if (stack2 = helpers.paramType) { stack2 = stack2.call(depth0, {hash:{},data:data}); }
- else { stack2 = depth0.paramType; stack2 = typeof stack2 === functionType ? stack2.apply(depth0) : stack2; }
- if(stack2 || stack2 === 0) { buffer += stack2; }
- buffer += "</td>\n<td><span class=\"model-signature\"></span></td>";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_readonly'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <textarea class='body-textarea' readonly='readonly' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'>";
- if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</textarea>\n ";
- return buffer;
- }
-
-function program3(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(6, program6, data),fn:self.program(4, program4, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program4(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "\n ";
- return buffer;
- }
-
-function program6(depth0,data) {
-
-
- return "\n (empty)\n ";
- }
-
- buffer += "<td class='code'>";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</td>\n<td>\n ";
- stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(3, program3, data),fn:self.program(1, program1, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n</td>\n<td>";
- if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</td>\n<td>";
- if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</td>\n<td><span class=\"model-signature\"></span></td>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_readonly_required'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'>";
- if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</textarea>\n ";
- return buffer;
- }
-
-function program3(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(6, program6, data),fn:self.program(4, program4, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program4(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "\n ";
- return buffer;
- }
-
-function program6(depth0,data) {
-
-
- return "\n (empty)\n ";
- }
-
- buffer += "<td class='code required'>";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</td>\n<td>\n ";
- stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(3, program3, data),fn:self.program(1, program1, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n</td>\n<td>";
- if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</td>\n<td>";
- if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</td>\n<td><span class=\"model-signature\"></span></td>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['param_required'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression, self=this;
-
-function program1(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(4, program4, data),fn:self.program(2, program2, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program2(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <input type=\"file\" name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'/>\n ";
- return buffer;
- }
-
-function program4(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(7, program7, data),fn:self.program(5, program5, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program5(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <textarea class='body-textarea' placeholder='(required)' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'>";
- if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</textarea>\n ";
- return buffer;
- }
-
-function program7(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <textarea class='body-textarea' placeholder='(required)' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'></textarea>\n <br />\n <div class=\"parameter-content-type\" />\n ";
- return buffer;
- }
-
-function program9(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.isFile, {hash:{},inverse:self.program(12, program12, data),fn:self.program(10, program10, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program10(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <input class='parameter' class='required' type='file' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'/>\n ";
- return buffer;
- }
-
-function program12(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers['if'].call(depth0, depth0.defaultValue, {hash:{},inverse:self.program(15, program15, data),fn:self.program(13, program13, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n ";
- return buffer;
- }
-function program13(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <input class='parameter required' minlength='1' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "' placeholder='(required)' type='text' value='";
- if (stack1 = helpers.defaultValue) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.defaultValue; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'/>\n ";
- return buffer;
- }
-
-function program15(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <input class='parameter required' minlength='1' name='";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "' placeholder='(required)' type='text' value=''/>\n ";
- return buffer;
- }
-
- buffer += "<td class='code required'>";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</td>\n<td>\n ";
- stack1 = helpers['if'].call(depth0, depth0.isBody, {hash:{},inverse:self.program(9, program9, data),fn:self.program(1, program1, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n</td>\n<td>\n <strong>";
- if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</strong>\n</td>\n<td>";
- if (stack1 = helpers.paramType) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.paramType; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</td>\n<td><span class=\"model-signature\"></span></td>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['parameter_content_type'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", self=this;
-
-function program1(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers.each.call(depth0, depth0.consumes, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n";
- return buffer;
- }
-function program2(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <option value=\"";
- stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\">";
- stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</option>\n ";
- return buffer;
- }
-
-function program4(depth0,data) {
-
-
- return "\n <option value=\"application/json\">application/json</option>\n";
- }
-
- buffer += "<label for=\"parameterContentType\"></label>\n<select name=\"parameterContentType\">\n";
- stack1 = helpers['if'].call(depth0, depth0.consumes, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n</select>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['resource'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, options, functionType="function", escapeExpression=this.escapeExpression, self=this, blockHelperMissing=helpers.blockHelperMissing;
-
-function program1(depth0,data) {
-
-
- return " : ";
- }
-
- buffer += "<div class='heading'>\n <h2>\n <a href='#!/";
- if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "' onclick=\"Docs.toggleEndpointListForResource('";
- if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "');\">";
- if (stack1 = helpers.name) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.name; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</a> ";
- options = {hash:{},inverse:self.noop,fn:self.program(1, program1, data),data:data};
- if (stack1 = helpers.description) { stack1 = stack1.call(depth0, options); }
- else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if (!helpers.description) { stack1 = blockHelperMissing.call(depth0, stack1, options); }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- if (stack1 = helpers.description) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.description; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n </h2>\n <ul class='options'>\n <li>\n <a href='#!/";
- if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "' id='endpointListTogger_";
- if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'\n onclick=\"Docs.toggleEndpointListForResource('";
- if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "');\">Show/Hide</a>\n </li>\n <li>\n <a href='#' onclick=\"Docs.collapseOperationsForResource('";
- if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'); return false;\">\n List Operations\n </a>\n </li>\n <li>\n <a href='#' onclick=\"Docs.expandOperationsForResource('";
- if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'); return false;\">\n Expand Operations\n </a>\n </li>\n <li>\n <a href='";
- if (stack1 = helpers.url) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.url; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "'>Raw</a>\n </li>\n </ul>\n</div>\n<ul class='endpoints' id='";
- if (stack1 = helpers.id) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.id; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "_endpoint_list' style='display:none'>\n\n</ul>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['response_content_type'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", self=this;
-
-function program1(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n ";
- stack1 = helpers.each.call(depth0, depth0.produces, {hash:{},inverse:self.noop,fn:self.program(2, program2, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n";
- return buffer;
- }
-function program2(depth0,data) {
-
- var buffer = "", stack1;
- buffer += "\n <option value=\"";
- stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\">";
- stack1 = (typeof depth0 === functionType ? depth0.apply(depth0) : depth0);
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</option>\n ";
- return buffer;
- }
-
-function program4(depth0,data) {
-
-
- return "\n <option value=\"application/json\">application/json</option>\n";
- }
-
- buffer += "<label for=\"responseContentType\"></label>\n<select name=\"responseContentType\">\n";
- stack1 = helpers['if'].call(depth0, depth0.produces, {hash:{},inverse:self.program(4, program4, data),fn:self.program(1, program1, data),data:data});
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n</select>\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['signature'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
-
-
- buffer += "<div>\n<ul class=\"signature-nav\">\n <li><a class=\"description-link\" href=\"#\">Model</a></li>\n <li><a class=\"snippet-link\" href=\"#\">Model Schema</a></li>\n</ul>\n<div>\n\n<div class=\"signature-container\">\n <div class=\"description\">\n ";
- if (stack1 = helpers.signature) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.signature; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "\n </div>\n\n <div class=\"snippet\">\n <pre><code>";
- if (stack1 = helpers.sampleJSON) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.sampleJSON; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</code></pre>\n <small class=\"notice\"></small>\n </div>\n</div>\n\n";
- return buffer;
- });
-})();
-
-(function() {
- var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-templates['status_code'] = template(function (Handlebars,depth0,helpers,partials,data) {
- this.compilerInfo = [4,'>= 1.0.0'];
-helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
- var buffer = "", stack1, functionType="function", escapeExpression=this.escapeExpression;
-
-
- buffer += "<td width='15%' class='code'>";
- if (stack1 = helpers.code) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.code; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- buffer += escapeExpression(stack1)
- + "</td>\n<td>";
- if (stack1 = helpers.message) { stack1 = stack1.call(depth0, {hash:{},data:data}); }
- else { stack1 = depth0.message; stack1 = typeof stack1 === functionType ? stack1.apply(depth0) : stack1; }
- if(stack1 || stack1 === 0) { buffer += stack1; }
- buffer += "</td>\n<td width='50%'><span class=\"model-signature\" /></td>";
- return buffer;
- });
-})();
-
-
-
-// Generated by CoffeeScript 1.6.3
-(function() {
- var ContentTypeView, HeaderView, MainView, OperationView, ParameterContentTypeView, ParameterView, ResourceView, ResponseContentTypeView, SignatureView, StatusCodeView, SwaggerUi, _ref, _ref1, _ref10, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8, _ref9,
- __hasProp = {}.hasOwnProperty,
- __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
- SwaggerUi = (function(_super) {
- __extends(SwaggerUi, _super);
-
- function SwaggerUi() {
- _ref = SwaggerUi.__super__.constructor.apply(this, arguments);
- return _ref;
- }
-
- SwaggerUi.prototype.dom_id = "swagger_ui";
-
- SwaggerUi.prototype.options = null;
-
- SwaggerUi.prototype.api = null;
-
- SwaggerUi.prototype.headerView = null;
-
- SwaggerUi.prototype.mainView = null;
-
- SwaggerUi.prototype.initialize = function(options) {
- var _this = this;
- if (options == null) {
- options = {};
- }
- if (options.dom_id != null) {
- this.dom_id = options.dom_id;
- delete options.dom_id;
- }
- if ($('#' + this.dom_id) == null) {
- $('body').append('<div id="' + this.dom_id + '"></div>');
- }
- this.options = options;
- this.options.success = function() {
- return _this.render();
- };
- this.options.progress = function(d) {
- return _this.showMessage(d);
- };
- this.options.failure = function(d) {
- return _this.onLoadFailure(d);
- };
- this.headerView = new HeaderView({
- el: $('#header')
- });
- return this.headerView.on('update-swagger-ui', function(data) {
- return _this.updateSwaggerUi(data);
- });
- };
-
- SwaggerUi.prototype.updateSwaggerUi = function(data) {
- this.options.url = data.url;
- return this.load();
- };
-
- SwaggerUi.prototype.load = function() {
- var url, _ref1;
- if ((_ref1 = this.mainView) != null) {
- _ref1.clear();
- }
- url = this.options.url;
- if (url.indexOf("http") !== 0) {
- url = this.buildUrl(window.location.href.toString(), url);
- }
- this.options.url = url;
- this.headerView.update(url);
- this.api = new SwaggerApi(this.options);
- this.api.build();
- return this.api;
- };
-
- SwaggerUi.prototype.render = function() {
- var _this = this;
- this.showMessage('Finished Loading Resource Information. Rendering Swagger UI...');
- this.mainView = new MainView({
- model: this.api,
- el: $('#' + this.dom_id)
- }).render();
- this.showMessage();
- switch (this.options.docExpansion) {
- case "full":
- Docs.expandOperationsForResource('');
- break;
- case "list":
- Docs.collapseOperationsForResource('');
- }
- if (this.options.onComplete) {
- this.options.onComplete(this.api, this);
- }
- return setTimeout(function() {
- return Docs.shebang();
- }, 400);
- };
-
- SwaggerUi.prototype.buildUrl = function(base, url) {
- var endOfPath, parts;
- log("base is " + base);
- if (url.indexOf("/") === 0) {
- parts = base.split("/");
- base = parts[0] + "//" + parts[2];
- return base + url;
- } else {
- endOfPath = base.length;
- if (base.indexOf("?") > -1) {
- endOfPath = Math.min(endOfPath, base.indexOf("?"));
- }
- if (base.indexOf("#") > -1) {
- endOfPath = Math.min(endOfPath, base.indexOf("#"));
- }
- base = base.substring(0, endOfPath);
- if (base.indexOf("/", base.length - 1) !== -1) {
- return base + url;
- }
- return base + "/" + url;
- }
- };
-
- SwaggerUi.prototype.showMessage = function(data) {
- if (data == null) {
- data = '';
- }
- $('#message-bar').removeClass('message-fail');
- $('#message-bar').addClass('message-success');
- return $('#message-bar').html(data);
- };
-
- SwaggerUi.prototype.onLoadFailure = function(data) {
- var val;
- if (data == null) {
- data = '';
- }
- $('#message-bar').removeClass('message-success');
- $('#message-bar').addClass('message-fail');
- val = $('#message-bar').html(data);
- if (this.options.onFailure != null) {
- this.options.onFailure(data);
- }
- return val;
- };
-
- return SwaggerUi;
-
- })(Backbone.Router);
-
- window.SwaggerUi = SwaggerUi;
-
- HeaderView = (function(_super) {
- __extends(HeaderView, _super);
-
- function HeaderView() {
- _ref1 = HeaderView.__super__.constructor.apply(this, arguments);
- return _ref1;
- }
-
- HeaderView.prototype.events = {
- 'click #show-pet-store-icon': 'showPetStore',
- 'click #show-wordnik-dev-icon': 'showWordnikDev',
- 'click #explore': 'showCustom',
- 'keyup #input_baseUrl': 'showCustomOnKeyup',
- 'keyup #input_apiKey': 'showCustomOnKeyup'
- };
-
- HeaderView.prototype.initialize = function() {};
-
- HeaderView.prototype.showPetStore = function(e) {
- return this.trigger('update-swagger-ui', {
- url: "http://petstore.swagger.wordnik.com/api/api-docs"
- });
- };
-
- HeaderView.prototype.showWordnikDev = function(e) {
- return this.trigger('update-swagger-ui', {
- url: "http://api.wordnik.com/v4/resources.json"
- });
- };
-
- HeaderView.prototype.showCustomOnKeyup = function(e) {
- if (e.keyCode === 13) {
- return this.showCustom();
- }
- };
-
- HeaderView.prototype.showCustom = function(e) {
- if (e != null) {
- e.preventDefault();
- }
- return this.trigger('update-swagger-ui', {
- url: $('#input_baseUrl').val(),
- apiKey: $('#input_apiKey').val()
- });
- };
-
- HeaderView.prototype.update = function(url, apiKey, trigger) {
- if (trigger == null) {
- trigger = false;
- }
- $('#input_baseUrl').val(url);
- if (trigger) {
- return this.trigger('update-swagger-ui', {
- url: url
- });
- }
- };
-
- return HeaderView;
-
- })(Backbone.View);
-
- MainView = (function(_super) {
- __extends(MainView, _super);
-
- function MainView() {
- _ref2 = MainView.__super__.constructor.apply(this, arguments);
- return _ref2;
- }
-
- MainView.prototype.initialize = function() {};
-
- MainView.prototype.render = function() {
- var counter, id, resource, resources, _i, _len, _ref3;
- $(this.el).html(Handlebars.templates.main(this.model));
- resources = {};
- counter = 0;
- _ref3 = this.model.apisArray;
- for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
- resource = _ref3[_i];
- id = resource.name;
- while (typeof resources[id] !== 'undefined') {
- id = id + "_" + counter;
- counter += 1;
- }
- resource.id = id;
- resources[id] = resource;
- this.addResource(resource);
- }
- return this;
- };
-
- MainView.prototype.addResource = function(resource) {
- var resourceView;
- resourceView = new ResourceView({
- model: resource,
- tagName: 'li',
- id: 'resource_' + resource.id,
- className: 'resource'
- });
- return $('#resources').append(resourceView.render().el);
- };
-
- MainView.prototype.clear = function() {
- return $(this.el).html('');
- };
-
- return MainView;
-
- })(Backbone.View);
-
- ResourceView = (function(_super) {
- __extends(ResourceView, _super);
-
- function ResourceView() {
- _ref3 = ResourceView.__super__.constructor.apply(this, arguments);
- return _ref3;
- }
-
- ResourceView.prototype.initialize = function() {};
-
- ResourceView.prototype.render = function() {
- var counter, id, methods, operation, _i, _len, _ref4;
- $(this.el).html(Handlebars.templates.resource(this.model));
- methods = {};
- _ref4 = this.model.operationsArray;
- for (_i = 0, _len = _ref4.length; _i < _len; _i++) {
- operation = _ref4[_i];
- counter = 0;
- id = operation.nickname;
- while (typeof methods[id] !== 'undefined') {
- id = id + "_" + counter;
- counter += 1;
- }
- methods[id] = operation;
- operation.nickname = id;
- operation.parentId = this.model.id;
- this.addOperation(operation);
- }
- return this;
- };
-
- ResourceView.prototype.addOperation = function(operation) {
- var operationView;
- operation.number = this.number;
- operationView = new OperationView({
- model: operation,
- tagName: 'li',
- className: 'endpoint'
- });
- $('.endpoints', $(this.el)).append(operationView.render().el);
- return this.number++;
- };
-
- return ResourceView;
-
- })(Backbone.View);
-
- OperationView = (function(_super) {
- __extends(OperationView, _super);
-
- function OperationView() {
- _ref4 = OperationView.__super__.constructor.apply(this, arguments);
- return _ref4;
- }
-
- OperationView.prototype.invocationUrl = null;
-
- OperationView.prototype.events = {
- 'submit .sandbox': 'submitOperation',
- 'click .submit': 'submitOperation',
- 'click .response_hider': 'hideResponse',
- 'click .toggleOperation': 'toggleOperationContent',
- 'mouseenter .api-ic': 'mouseEnter',
- 'mouseout .api-ic': 'mouseExit'
- };
-
- OperationView.prototype.initialize = function() {};
-
- OperationView.prototype.mouseEnter = function(e) {
- var elem, hgh, pos, scMaxX, scMaxY, scX, scY, wd, x, y;
- elem = $(e.currentTarget.parentNode).find('#api_information_panel');
- x = event.pageX;
- y = event.pageY;
- scX = $(window).scrollLeft();
- scY = $(window).scrollTop();
- scMaxX = scX + $(window).width();
- scMaxY = scY + $(window).height();
- wd = elem.width();
- hgh = elem.height();
- if (x + wd > scMaxX) {
- x = scMaxX - wd;
- }
- if (x < scX) {
- x = scX;
- }
- if (y + hgh > scMaxY) {
- y = scMaxY - hgh;
- }
- if (y < scY) {
- y = scY;
- }
- pos = {};
- pos.top = y;
- pos.left = x;
- elem.css(pos);
- return $(e.currentTarget.parentNode).find('#api_information_panel').show();
- };
-
- OperationView.prototype.mouseExit = function(e) {
- return $(e.currentTarget.parentNode).find('#api_information_panel').hide();
- };
-
- OperationView.prototype.render = function() {
- var contentTypeModel, isMethodSubmissionSupported, k, o, param, responseContentTypeView, responseSignatureView, signatureModel, statusCode, type, v, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8;
- isMethodSubmissionSupported = true;
- if (!isMethodSubmissionSupported) {
- this.model.isReadOnly = true;
- }
- this.model.oauth = null;
- if (this.model.authorizations) {
- _ref5 = this.model.authorizations;
- for (k in _ref5) {
- v = _ref5[k];
- if (k === "oauth2") {
- if (this.model.oauth === null) {
- this.model.oauth = {};
- }
- if (this.model.oauth.scopes === void 0) {
- this.model.oauth.scopes = [];
- }
- for (_i = 0, _len = v.length; _i < _len; _i++) {
- o = v[_i];
- this.model.oauth.scopes.push(o);
- }
- }
- }
- }
- $(this.el).html(Handlebars.templates.operation(this.model));
- if (this.model.responseClassSignature && this.model.responseClassSignature !== 'string') {
- signatureModel = {
- sampleJSON: this.model.responseSampleJSON,
- isParam: false,
- signature: this.model.responseClassSignature
- };
- responseSignatureView = new SignatureView({
- model: signatureModel,
- tagName: 'div'
- });
- $('.model-signature', $(this.el)).append(responseSignatureView.render().el);
- } else {
- $('.model-signature', $(this.el)).html(this.model.type);
- }
- contentTypeModel = {
- isParam: false
- };
- contentTypeModel.consumes = this.model.consumes;
- contentTypeModel.produces = this.model.produces;
- _ref6 = this.model.parameters;
- for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
- param = _ref6[_j];
- type = param.type || param.dataType;
- if (type.toLowerCase() === 'file') {
- if (!contentTypeModel.consumes) {
- log("set content type ");
- contentTypeModel.consumes = 'multipart/form-data';
- }
- }
- }
- responseContentTypeView = new ResponseContentTypeView({
- model: contentTypeModel
- });
- $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
- _ref7 = this.model.parameters;
- for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
- param = _ref7[_k];
- this.addParameter(param, contentTypeModel.consumes);
- }
- _ref8 = this.model.responseMessages;
- for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
- statusCode = _ref8[_l];
- this.addStatusCode(statusCode);
- }
- return this;
- };
-
- OperationView.prototype.addParameter = function(param, consumes) {
- var paramView;
- param.consumes = consumes;
- paramView = new ParameterView({
- model: param,
- tagName: 'tr',
- readOnly: this.model.isReadOnly
- });
- return $('.operation-params', $(this.el)).append(paramView.render().el);
- };
-
- OperationView.prototype.addStatusCode = function(statusCode) {
- var statusCodeView;
- statusCodeView = new StatusCodeView({
- model: statusCode,
- tagName: 'tr'
- });
- return $('.operation-status', $(this.el)).append(statusCodeView.render().el);
- };
-
- OperationView.prototype.submitOperation = function(e) {
- var error_free, form, isFileUpload, map, o, opts, val, _i, _j, _k, _len, _len1, _len2, _ref5, _ref6, _ref7;
- if (e != null) {
- e.preventDefault();
- }
- form = $('.sandbox', $(this.el));
- error_free = true;
- form.find("input.required").each(function() {
- var _this = this;
- $(this).removeClass("error");
- if (jQuery.trim($(this).val()) === "") {
- $(this).addClass("error");
- $(this).wiggle({
- callback: function() {
- return $(_this).focus();
- }
- });
- return error_free = false;
- }
- });
- if (error_free) {
- map = {};
- opts = {
- parent: this
- };
- isFileUpload = false;
- _ref5 = form.find("input");
- for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
- o = _ref5[_i];
- if ((o.value != null) && jQuery.trim(o.value).length > 0) {
- map[o.name] = o.value;
- }
- if (o.type === "file") {
- isFileUpload = true;
- }
- }
- _ref6 = form.find("textarea");
- for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
- o = _ref6[_j];
- if ((o.value != null) && jQuery.trim(o.value).length > 0) {
- map["body"] = o.value;
- }
- }
- _ref7 = form.find("select");
- for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
- o = _ref7[_k];
- val = this.getSelectedValue(o);
- if ((val != null) && jQuery.trim(val).length > 0) {
- map[o.name] = val;
- }
- }
- opts.responseContentType = $("div select[name=responseContentType]", $(this.el)).val();
- opts.requestContentType = $("div select[name=parameterContentType]", $(this.el)).val();
- $(".response_throbber", $(this.el)).show();
- if (isFileUpload) {
- return this.handleFileUpload(map, form);
- } else {
- return this.model["do"](map, opts, this.showCompleteStatus, this.showErrorStatus, this);
- }
- }
- };
-
- OperationView.prototype.success = function(response, parent) {
- return parent.showCompleteStatus(response);
- };
-
- OperationView.prototype.handleFileUpload = function(map, form) {
- var bodyParam, el, headerParams, o, obj, param, params, _i, _j, _k, _l, _len, _len1, _len2, _len3, _ref5, _ref6, _ref7, _ref8,
- _this = this;
- _ref5 = form.serializeArray();
- for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
- o = _ref5[_i];
- if ((o.value != null) && jQuery.trim(o.value).length > 0) {
- map[o.name] = o.value;
- }
- }
- bodyParam = new FormData();
- params = 0;
- _ref6 = this.model.parameters;
- for (_j = 0, _len1 = _ref6.length; _j < _len1; _j++) {
- param = _ref6[_j];
- if (param.paramType === 'form') {
- if (map[param.name] !== void 0) {
- bodyParam.append(param.name, map[param.name]);
- }
- }
- }
- headerParams = {};
- _ref7 = this.model.parameters;
- for (_k = 0, _len2 = _ref7.length; _k < _len2; _k++) {
- param = _ref7[_k];
- if (param.paramType === 'header') {
- headerParams[param.name] = map[param.name];
- }
- }
- log(headerParams);
- _ref8 = form.find('input[type~="file"]');
- for (_l = 0, _len3 = _ref8.length; _l < _len3; _l++) {
- el = _ref8[_l];
- if (typeof el.files[0] !== 'undefined') {
- bodyParam.append($(el).attr('name'), el.files[0]);
- params += 1;
- }
- }
- log(bodyParam);
- this.invocationUrl = this.model.supportHeaderParams() ? (headerParams = this.model.getHeaderParams(map), this.model.urlify(map, false)) : this.model.urlify(map, true);
- $(".request_url", $(this.el)).html("<pre>" + this.invocationUrl + "</pre>");
- obj = {
- type: this.model.method,
- url: this.invocationUrl,
- headers: headerParams,
- data: bodyParam,
- dataType: 'json',
- contentType: false,
- processData: false,
- error: function(data, textStatus, error) {
- return _this.showErrorStatus(_this.wrap(data), _this);
- },
- success: function(data) {
- return _this.showResponse(data, _this);
- },
- complete: function(data) {
- return _this.showCompleteStatus(_this.wrap(data), _this);
- }
- };
- if (window.authorizations) {
- window.authorizations.apply(obj);
- }
- if (params === 0) {
- obj.data.append("fake", "true");
- }
- jQuery.ajax(obj);
- return false;
- };
-
- OperationView.prototype.wrap = function(data) {
- var h, headerArray, headers, i, o, _i, _len;
- headers = {};
- headerArray = data.getAllResponseHeaders().split("\r");
- for (_i = 0, _len = headerArray.length; _i < _len; _i++) {
- i = headerArray[_i];
- h = i.split(':');
- if (h[0] !== void 0 && h[1] !== void 0) {
- headers[h[0].trim()] = h[1].trim();
- }
- }
- o = {};
- o.content = {};
- o.content.data = data.responseText;
- o.headers = headers;
- o.request = {};
- o.request.url = this.invocationUrl;
- o.status = data.status;
- return o;
- };
-
- OperationView.prototype.getSelectedValue = function(select) {
- var opt, options, _i, _len, _ref5;
- if (!select.multiple) {
- return select.value;
- } else {
- options = [];
- _ref5 = select.options;
- for (_i = 0, _len = _ref5.length; _i < _len; _i++) {
- opt = _ref5[_i];
- if (opt.selected) {
- options.push(opt.value);
- }
- }
- if (options.length > 0) {
- return options.join(",");
- } else {
- return null;
- }
- }
- };
-
- OperationView.prototype.hideResponse = function(e) {
- if (e != null) {
- e.preventDefault();
- }
- $(".response", $(this.el)).slideUp();
- return $(".response_hider", $(this.el)).fadeOut();
- };
-
- OperationView.prototype.showResponse = function(response) {
- var prettyJson;
- prettyJson = JSON.stringify(response, null, "\t").replace(/\n/g, "<br>");
- return $(".response_body", $(this.el)).html(escape(prettyJson));
- };
-
- OperationView.prototype.showErrorStatus = function(data, parent) {
- return parent.showStatus(data);
- };
-
- OperationView.prototype.showCompleteStatus = function(data, parent) {
- return parent.showStatus(data);
- };
-
- OperationView.prototype.formatXml = function(xml) {
- var contexp, formatted, indent, lastType, lines, ln, pad, reg, transitions, wsexp, _fn, _i, _len;
- reg = /(>)(<)(\/*)/g;
- wsexp = /[ ]*(.*)[ ]+\n/g;
- contexp = /(<.+>)(.+\n)/g;
- xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
- pad = 0;
- formatted = '';
- lines = xml.split('\n');
- indent = 0;
- lastType = 'other';
- transitions = {
- 'single->single': 0,
- 'single->closing': -1,
- 'single->opening': 0,
- 'single->other': 0,
- 'closing->single': 0,
- 'closing->closing': -1,
- 'closing->opening': 0,
- 'closing->other': 0,
- 'opening->single': 1,
- 'opening->closing': 0,
- 'opening->opening': 1,
- 'opening->other': 1,
- 'other->single': 0,
- 'other->closing': -1,
- 'other->opening': 0,
- 'other->other': 0
- };
- _fn = function(ln) {
- var fromTo, j, key, padding, type, types, value;
- types = {
- single: Boolean(ln.match(/<.+\/>/)),
- closing: Boolean(ln.match(/<\/.+>/)),
- opening: Boolean(ln.match(/<[^!?].*>/))
- };
- type = ((function() {
- var _results;
- _results = [];
- for (key in types) {
- value = types[key];
- if (value) {
- _results.push(key);
- }
- }
- return _results;
- })())[0];
- type = type === void 0 ? 'other' : type;
- fromTo = lastType + '->' + type;
- lastType = type;
- padding = '';
- indent += transitions[fromTo];
- padding = ((function() {
- var _j, _ref5, _results;
- _results = [];
- for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
- _results.push(' ');
- }
- return _results;
- })()).join('');
- if (fromTo === 'opening->closing') {
- return formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
- } else {
- return formatted += padding + ln + '\n';
- }
- };
- for (_i = 0, _len = lines.length; _i < _len; _i++) {
- ln = lines[_i];
- _fn(ln);
- }
- return formatted;
- };
-
- OperationView.prototype.showStatus = function(response) {
- var code, content, contentType, headers, pre, response_body, url;
- if (response.content === void 0) {
- content = response.data;
- url = response.url;
- } else {
- content = response.content.data;
- url = response.request.url;
- }
- headers = response.headers;
- contentType = headers && headers["Content-Type"] ? headers["Content-Type"].split(";")[0].trim() : null;
- if (!content) {
- code = $('<code />').text("no content");
- pre = $('<pre class="json" />').append(code);
- } else if (contentType === "application/json" || /\+json$/.test(contentType)) {
- code = $('<code />').text(JSON.stringify(JSON.parse(content), null, " "));
- pre = $('<pre class="json" />').append(code);
- } else if (contentType === "application/xml" || /\+xml$/.test(contentType)) {
- code = $('<code />').text(this.formatXml(content));
- pre = $('<pre class="xml" />').append(code);
- } else if (contentType === "text/html") {
- code = $('<code />').html(content);
- pre = $('<pre class="xml" />').append(code);
- } else if (/^image\//.test(contentType)) {
- pre = $('<img>').attr('src', url);
- } else {
- code = $('<code />').text(content);
- pre = $('<pre class="json" />').append(code);
- }
- response_body = pre;
- $(".request_url", $(this.el)).html("<pre>" + url + "</pre>");
- $(".response_code", $(this.el)).html("<pre>" + response.status + "</pre>");
- $(".response_body", $(this.el)).html(response_body);
- $(".response_headers", $(this.el)).html("<pre>" + JSON.stringify(response.headers, null, " ").replace(/\n/g, "<br>") + "</pre>");
- $(".response", $(this.el)).slideDown();
- $(".response_hider", $(this.el)).show();
- $(".response_throbber", $(this.el)).hide();
- return hljs.highlightBlock($('.response_body', $(this.el))[0]);
- };
-
- OperationView.prototype.toggleOperationContent = function() {
- var elem;
- elem = $('#' + Docs.escapeResourceName(this.model.parentId) + "_" + this.model.nickname + "_content");
- if (elem.is(':visible')) {
- return Docs.collapseOperation(elem);
- } else {
- return Docs.expandOperation(elem);
- }
- };
-
- return OperationView;
-
- })(Backbone.View);
-
- StatusCodeView = (function(_super) {
- __extends(StatusCodeView, _super);
-
- function StatusCodeView() {
- _ref5 = StatusCodeView.__super__.constructor.apply(this, arguments);
- return _ref5;
- }
-
- StatusCodeView.prototype.initialize = function() {};
-
- StatusCodeView.prototype.render = function() {
- var responseModel, responseModelView, template;
- template = this.template();
- $(this.el).html(template(this.model));
- if (swaggerUi.api.models.hasOwnProperty(this.model.responseModel)) {
- responseModel = {
- sampleJSON: JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(), null, 2),
- isParam: false,
- signature: swaggerUi.api.models[this.model.responseModel].getMockSignature()
- };
- responseModelView = new SignatureView({
- model: responseModel,
- tagName: 'div'
- });
- $('.model-signature', this.$el).append(responseModelView.render().el);
- } else {
- $('.model-signature', this.$el).html('');
- }
- return this;
- };
-
- StatusCodeView.prototype.template = function() {
- return Handlebars.templates.status_code;
- };
-
- return StatusCodeView;
-
- })(Backbone.View);
-
- ParameterView = (function(_super) {
- __extends(ParameterView, _super);
-
- function ParameterView() {
- _ref6 = ParameterView.__super__.constructor.apply(this, arguments);
- return _ref6;
- }
-
- ParameterView.prototype.initialize = function() {
- return Handlebars.registerHelper('isArray', function(param, opts) {
- if (param.type.toLowerCase() === 'array' || param.allowMultiple) {
- return opts.fn(this);
- } else {
- return opts.inverse(this);
- }
- });
- };
-
- ParameterView.prototype.render = function() {
- var contentTypeModel, isParam, parameterContentTypeView, responseContentTypeView, signatureModel, signatureView, template, type;
- type = this.model.type || this.model.dataType;
- if (this.model.paramType === 'body') {
- this.model.isBody = true;
- }
- if (type.toLowerCase() === 'file') {
- this.model.isFile = true;
- }
- template = this.template();
- $(this.el).html(template(this.model));
- signatureModel = {
- sampleJSON: this.model.sampleJSON,
- isParam: true,
- signature: this.model.signature
- };
- if (this.model.sampleJSON) {
- signatureView = new SignatureView({
- model: signatureModel,
- tagName: 'div'
- });
- $('.model-signature', $(this.el)).append(signatureView.render().el);
- } else {
- $('.model-signature', $(this.el)).html(this.model.signature);
- }
- isParam = false;
- if (this.model.isBody) {
- isParam = true;
- }
- contentTypeModel = {
- isParam: isParam
- };
- contentTypeModel.consumes = this.model.consumes;
- if (isParam) {
- parameterContentTypeView = new ParameterContentTypeView({
- model: contentTypeModel
- });
- $('.parameter-content-type', $(this.el)).append(parameterContentTypeView.render().el);
- } else {
- responseContentTypeView = new ResponseContentTypeView({
- model: contentTypeModel
- });
- $('.response-content-type', $(this.el)).append(responseContentTypeView.render().el);
- }
- return this;
- };
-
- ParameterView.prototype.template = function() {
- if (this.model.isList) {
- return Handlebars.templates.param_list;
- } else {
- if (this.options.readOnly) {
- if (this.model.required) {
- return Handlebars.templates.param_readonly_required;
- } else {
- return Handlebars.templates.param_readonly;
- }
- } else {
- if (this.model.required) {
- return Handlebars.templates.param_required;
- } else {
- return Handlebars.templates.param;
- }
- }
- }
- };
-
- return ParameterView;
-
- })(Backbone.View);
-
- SignatureView = (function(_super) {
- __extends(SignatureView, _super);
-
- function SignatureView() {
- _ref7 = SignatureView.__super__.constructor.apply(this, arguments);
- return _ref7;
- }
-
- SignatureView.prototype.events = {
- 'click a.description-link': 'switchToDescription',
- 'click a.snippet-link': 'switchToSnippet',
- 'mousedown .snippet': 'snippetToTextArea'
- };
-
- SignatureView.prototype.initialize = function() {};
-
- SignatureView.prototype.render = function() {
- var template;
- template = this.template();
- $(this.el).html(template(this.model));
- this.switchToDescription();
- this.isParam = this.model.isParam;
- if (this.isParam) {
- $('.notice', $(this.el)).text('Click to set as parameter value');
- }
- return this;
- };
-
- SignatureView.prototype.template = function() {
- return Handlebars.templates.signature;
- };
-
- SignatureView.prototype.switchToDescription = function(e) {
- if (e != null) {
- e.preventDefault();
- }
- $(".snippet", $(this.el)).hide();
- $(".description", $(this.el)).show();
- $('.description-link', $(this.el)).addClass('selected');
- return $('.snippet-link', $(this.el)).removeClass('selected');
- };
-
- SignatureView.prototype.switchToSnippet = function(e) {
- if (e != null) {
- e.preventDefault();
- }
- $(".description", $(this.el)).hide();
- $(".snippet", $(this.el)).show();
- $('.snippet-link', $(this.el)).addClass('selected');
- return $('.description-link', $(this.el)).removeClass('selected');
- };
-
- SignatureView.prototype.snippetToTextArea = function(e) {
- var textArea;
- if (this.isParam) {
- if (e != null) {
- e.preventDefault();
- }
-
<TRUNCATED>
[90/98] [abbrv] incubator-geode git commit: fixing
dumpStack/dumpAllStacks methods
Posted by ds...@apache.org.
fixing dumpStack/dumpAllStacks methods
These were trying to invoke methods using DistributedTestCase that have
been moved to ThreadUtils.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7b11d084
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7b11d084
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7b11d084
Branch: refs/heads/feature/GEM-983
Commit: 7b11d0843ed87054183b572299fcb010a3f7084a
Parents: b10a171
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Oct 27 10:15:34 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Oct 27 10:16:40 2016 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/geode/test/dunit/ThreadUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7b11d084/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java b/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
index 3122925..ac90cbc 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
@@ -77,7 +77,7 @@ public class ThreadUtils {
*/
public static void dumpStack(final Host host) {
for (int v = 0; v < host.getVMCount(); v++) {
- host.getVM(v).invoke(org.apache.geode.test.dunit.DistributedTestCase.class, "dumpStack");
+ host.getVM(v).invoke(org.apache.geode.test.dunit.ThreadUtils.class, "dumpStack");
}
}
@@ -87,7 +87,7 @@ public class ThreadUtils {
* @since GemFire 5.0
*/
public static void dumpStack(final VM vm) {
- vm.invoke(org.apache.geode.test.dunit.DistributedTestCase.class, "dumpStack");
+ vm.invoke(org.apache.geode.test.dunit.ThreadUtils.class, "dumpStack");
}
public static void dumpStackTrace(final Thread thread, final StackTraceElement[] stackTrace) {
[42/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
index 21d11d9..4e9e9fd 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import java.io.File;
@@ -54,9 +52,11 @@ public class CreateRegionFunction implements Function, Declarable {
public static final String ID = "create-region-function";
- private static final boolean DUMP_SESSION_CACHE_XML = Boolean.getBoolean("gemfiremodules.dumpSessionCacheXml");
+ private static final boolean DUMP_SESSION_CACHE_XML =
+ Boolean.getBoolean("gemfiremodules.dumpSessionCacheXml");
- private static final String REGION_CONFIGURATION_METADATA_REGION = "__regionConfigurationMetadata";
+ private static final String REGION_CONFIGURATION_METADATA_REGION =
+ "__regionConfigurationMetadata";
public CreateRegionFunction() {
this(CacheFactory.getAnyInstance());
@@ -106,7 +106,8 @@ public class CreateRegionFunction implements Function, Declarable {
RegionHelper.validateRegion(this.cache, configuration, region);
} catch (Exception e) {
if (!e.getMessage()
- .equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME.toLocalizedString())) {
+ .equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME
+ .toLocalizedString())) {
this.cache.getLogger().warning(e);
}
status = RegionStatus.INVALID;
@@ -131,8 +132,7 @@ public class CreateRegionFunction implements Function, Declarable {
return true;
}
- public void init(Properties properties) {
- }
+ public void init(Properties properties) {}
private RegionStatus createRegion(RegionConfiguration configuration) {
// Get a distributed lock
@@ -150,7 +150,8 @@ public class CreateRegionFunction implements Function, Declarable {
dml.lockInterruptibly();
if (this.cache.getLogger().fineEnabled()) {
end = System.currentTimeMillis();
- this.cache.getLogger().fine(this + ": Obtained lock on " + dml + " in " + (end - start) + " ms");
+ this.cache.getLogger()
+ .fine(this + ": Obtained lock on " + dml + " in " + (end - start) + " ms");
}
// Attempt to get the region again after the lock has been obtained
@@ -183,7 +184,8 @@ public class CreateRegionFunction implements Function, Declarable {
RegionHelper.validateRegion(this.cache, configuration, region);
} catch (Exception e) {
if (!e.getMessage()
- .equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME.toLocalizedString())) {
+ .equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME
+ .toLocalizedString())) {
this.cache.getLogger().warning(e);
}
status = RegionStatus.INVALID;
@@ -191,10 +193,8 @@ public class CreateRegionFunction implements Function, Declarable {
}
} catch (Exception e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Caught Exception attempting to create region named ")
- .append(configuration.getRegionName())
- .append(":");
+ builder.append(this).append(": Caught Exception attempting to create region named ")
+ .append(configuration.getRegionName()).append(":");
this.cache.getLogger().warning(builder.toString(), e);
status = RegionStatus.INVALID;
} finally {
@@ -214,7 +214,8 @@ public class CreateRegionFunction implements Function, Declarable {
private Region<String, RegionConfiguration> createRegionConfigurationMetadataRegion() {
// a sessionFactory in hibernate could have been re-started
// so, it is possible that this region exists already
- Region<String, RegionConfiguration> r = this.cache.getRegion(REGION_CONFIGURATION_METADATA_REGION);
+ Region<String, RegionConfiguration> r =
+ this.cache.getRegion(REGION_CONFIGURATION_METADATA_REGION);
if (r != null) {
return r;
}
@@ -227,7 +228,8 @@ public class CreateRegionFunction implements Function, Declarable {
try {
return gemFireCache.createVMRegion(REGION_CONFIGURATION_METADATA_REGION, ra, ira);
} catch (IOException | ClassNotFoundException e) {
- InternalGemFireError assErr = new InternalGemFireError(LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
+ InternalGemFireError assErr = new InternalGemFireError(
+ LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
assErr.initCause(e);
throw assErr;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java
index 2882f58..0f2d6ef 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/DebugCacheListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.cache.Declarable;
@@ -43,9 +41,7 @@ public class DebugCacheListener extends CacheListenerAdapter implements Declarab
private void log(EntryEvent event) {
StringBuilder builder = new StringBuilder();
- builder.append("DebugCacheListener: Received ")
- .append(event.getOperation())
- .append(" for key=")
+ builder.append("DebugCacheListener: Received ").append(event.getOperation()).append(" for key=")
.append(event.getKey());
if (event.getNewValue() != null) {
builder.append("; value=").append(event.getNewValue());
@@ -53,8 +49,7 @@ public class DebugCacheListener extends CacheListenerAdapter implements Declarab
event.getRegion().getCache().getLogger().info(builder.toString());
}
- public void init(Properties p) {
- }
+ public void init(Properties p) {}
public boolean equals(Object obj) {
// This method is only implemented so that RegionCreator.validateRegion works properly.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java
index 1c41ec9..6f276c4 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ModuleStatistics.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.StatisticDescriptor;
@@ -41,10 +39,14 @@ public class ModuleStatistics {
static {
StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
type = f.createType("pluginStats", "statistics for hibernate plugin and hibernate L2 cache",
- new StatisticDescriptor[]{f.createLongCounter("cacheHits", "number of times an entity was found in L2 cache",
- "count"), f.createLongCounter("cacheMisses", "number of times an entity was NOT found in l2 cache",
- "count"), f.createLongCounter("hibernateEntityDestroyJobsScheduled",
- "number of entities scheduled for destroy because of version conflict with a remote member", "jobs")});
+ new StatisticDescriptor[] {
+ f.createLongCounter("cacheHits", "number of times an entity was found in L2 cache",
+ "count"),
+ f.createLongCounter("cacheMisses",
+ "number of times an entity was NOT found in l2 cache", "count"),
+ f.createLongCounter("hibernateEntityDestroyJobsScheduled",
+ "number of entities scheduled for destroy because of version conflict with a remote member",
+ "jobs")});
cacheHitsId = type.nameToId("cacheHits");
cacheMissesId = type.nameToId("cacheMisses");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java
index f8825d2..e20421a 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfiguration.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.DataSerializable;
@@ -28,8 +26,8 @@ import java.io.IOException;
import java.io.InputStream;
/**
- * Class <code>RegionConfiguration</code> encapsulates the configuration attributes for a <code>Region</code> to be
- * created on the server.
+ * Class <code>RegionConfiguration</code> encapsulates the configuration attributes for a
+ * <code>Region</code> to be created on the server.
*
* @since GemFire 6.5
*/
@@ -82,16 +80,15 @@ public class RegionConfiguration implements DataSerializable {
private boolean enableSessionExpirationCacheListener = false;
/**
- * name for the CacheWriter to be associated with this region. This cache writer must have a zero arg constructor and
- * must be present on the classpath on the server.
+ * name for the CacheWriter to be associated with this region. This cache writer must have a zero
+ * arg constructor and must be present on the classpath on the server.
*/
private String cacheWriterName;
/**
* Default constructor used by the <code>DataSerialiable</code> interface
*/
- public RegionConfiguration() {
- }
+ public RegionConfiguration() {}
/**
* Sets the name of the <code>Region</code> to be created
@@ -168,7 +165,8 @@ public class RegionConfiguration implements DataSerializable {
/**
* Enables/disables delta replication across a <code>Gateway</code>.
*
- * @param enableGatewayDeltaReplication true to enable, false to disable gateway delta replication.
+ * @param enableGatewayDeltaReplication true to enable, false to disable gateway delta
+ * replication.
*/
public void setEnableGatewayDeltaReplication(boolean enableGatewayDeltaReplication) {
this.enableGatewayDeltaReplication = enableGatewayDeltaReplication;
@@ -269,30 +267,21 @@ public class RegionConfiguration implements DataSerializable {
}
public String toString() {
- return new StringBuilder().append("RegionConfiguration[")
- .append("regionName=")
- .append(this.regionName)
- .append("; regionAttributesId=")
- .append(this.regionAttributesId)
- .append("; maxInactiveInterval=")
- .append(this.maxInactiveInterval)
- .append("; enableGatewayDeltaReplication=")
- .append(this.enableGatewayDeltaReplication)
- .append("; enableGatewayReplication=")
- .append(this.enableGatewayReplication)
- .append("; enableDebugListener=")
- .append(this.enableDebugListener)
+ return new StringBuilder().append("RegionConfiguration[").append("regionName=")
+ .append(this.regionName).append("; regionAttributesId=").append(this.regionAttributesId)
+ .append("; maxInactiveInterval=").append(this.maxInactiveInterval)
+ .append("; enableGatewayDeltaReplication=").append(this.enableGatewayDeltaReplication)
+ .append("; enableGatewayReplication=").append(this.enableGatewayReplication)
+ .append("; enableDebugListener=").append(this.enableDebugListener)
.append("; enableSessionExpirationCacheListener=")
- .append(this.enableSessionExpirationCacheListener)
- .append("; cacheWriter=")
- .append(this.cacheWriterName)
- .append("]")
- .toString();
+ .append(this.enableSessionExpirationCacheListener).append("; cacheWriter=")
+ .append(this.cacheWriterName).append("]").toString();
}
/**
- * set the fully qualified name of the {@link CacheWriter} to be created on the server. The cacheWriter must have a
- * zero arg constructor, and must be present on the classpath on the server.
+ * set the fully qualified name of the {@link CacheWriter} to be created on the server. The
+ * cacheWriter must have a zero arg constructor, and must be present on the classpath on the
+ * server.
*
* @param cacheWriterName fully qualified class name of the cacheWriter
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java
index c05d9d6..e756533 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionConfigurationCacheListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.cache.Cache;
@@ -27,7 +25,8 @@ import org.apache.geode.cache.util.CacheListenerAdapter;
import java.util.Properties;
-public class RegionConfigurationCacheListener extends CacheListenerAdapter<String, RegionConfiguration> implements Declarable {
+public class RegionConfigurationCacheListener
+ extends CacheListenerAdapter<String, RegionConfiguration> implements Declarable {
private Cache cache;
@@ -38,7 +37,8 @@ public class RegionConfigurationCacheListener extends CacheListenerAdapter<Strin
public void afterCreate(EntryEvent<String, RegionConfiguration> event) {
RegionConfiguration configuration = event.getNewValue();
if (this.cache.getLogger().fineEnabled()) {
- this.cache.getLogger().fine("RegionConfigurationCacheListener received afterCreate for region " + event.getKey());
+ this.cache.getLogger().fine(
+ "RegionConfigurationCacheListener received afterCreate for region " + event.getKey());
}
// Create region
// this is a replicate region, and many VMs can be doing create region
@@ -69,18 +69,14 @@ public class RegionConfigurationCacheListener extends CacheListenerAdapter<Strin
builder1 = new StringBuilder();
int regionSize = region.size();
if (regionSize > 0) {
- builder1.append("RegionConfigurationCacheListener region ")
- .append(region.getName())
- .append(" has been initialized with the following ")
- .append(regionSize)
+ builder1.append("RegionConfigurationCacheListener region ").append(region.getName())
+ .append(" has been initialized with the following ").append(regionSize)
.append(" region configurations:\n");
builder2 = new StringBuilder();
builder2.append("RegionConfigurationCacheListener created the following ")
- .append(regionSize)
- .append(" regions:\n");
+ .append(regionSize).append(" regions:\n");
} else {
- builder1.append("RegionConfigurationCacheListener region ")
- .append(region.getName())
+ builder1.append("RegionConfigurationCacheListener region ").append(region.getName())
.append(" has been initialized with no region configurations");
}
}
@@ -109,6 +105,5 @@ public class RegionConfigurationCacheListener extends CacheListenerAdapter<Strin
}
}
- public void init(Properties p) {
- }
+ public void init(Properties p) {}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java
index dc338a1..0743bea 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionHelper.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.cache.AttributesFactory;
@@ -67,24 +65,24 @@ public class RegionHelper {
// Create region attributes creation on existing region attributes.
// The RAC is created to execute the sameAs method.
- RegionAttributesCreation existingRACreation = new RegionAttributesCreation(existingAttributes, false);
+ RegionAttributesCreation existingRACreation =
+ new RegionAttributesCreation(existingAttributes, false);
// Create requested region attributes
RegionAttributes requestedRegionAttributes = getRegionAttributes(cache, configuration);
- // Compare the two region attributes. This method either returns true or throws a RuntimeException.
+ // Compare the two region attributes. This method either returns true or throws a
+ // RuntimeException.
existingRACreation.sameAs(requestedRegionAttributes);
}
- public static RebalanceResults rebalanceRegion(Region region) throws CancellationException, InterruptedException {
+ public static RebalanceResults rebalanceRegion(Region region)
+ throws CancellationException, InterruptedException {
String regionName = region.getName(); // FilterByName only looks at name and not full path
if (!PartitionRegionHelper.isPartitionedRegion(region)) {
StringBuilder builder = new StringBuilder();
- builder.append("Region ")
- .append(regionName)
- .append(" is not partitioned. Instead, it is ")
- .append(region.getAttributes().getDataPolicy())
- .append(". It can't be rebalanced.");
+ builder.append("Region ").append(regionName).append(" is not partitioned. Instead, it is ")
+ .append(region.getAttributes().getDataPolicy()).append(". It can't be rebalanced.");
throw new IllegalArgumentException(builder.toString());
}
@@ -100,7 +98,8 @@ public class RegionHelper {
return rebalanceOperation.getResults();
}
- public static RebalanceResults rebalanceCache(GemFireCache cache) throws CancellationException, InterruptedException {
+ public static RebalanceResults rebalanceCache(GemFireCache cache)
+ throws CancellationException, InterruptedException {
ResourceManager resourceManager = cache.getResourceManager();
RebalanceFactory rebalanceFactory = resourceManager.createRebalanceFactory();
RebalanceOperation rebalanceOperation = rebalanceFactory.start();
@@ -119,9 +118,11 @@ public class RegionHelper {
}
}
- private static RegionAttributes getRegionAttributes(Cache cache, RegionConfiguration configuration) {
+ private static RegionAttributes getRegionAttributes(Cache cache,
+ RegionConfiguration configuration) {
// Create the requested attributes
- RegionAttributes baseRequestedAttributes = cache.getRegionAttributes(configuration.getRegionAttributesId());
+ RegionAttributes baseRequestedAttributes =
+ cache.getRegionAttributes(configuration.getRegionAttributesId());
if (baseRequestedAttributes == null) {
throw new IllegalArgumentException(
"No region attributes named " + configuration.getRegionAttributesId() + " are defined.");
@@ -133,7 +134,8 @@ public class RegionHelper {
if (maxInactiveInterval != RegionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL) {
requestedFactory.setStatisticsEnabled(true);
if (configuration.getCustomExpiry() == null) {
- requestedFactory.setEntryIdleTimeout(new ExpirationAttributes(maxInactiveInterval, ExpirationAction.DESTROY));
+ requestedFactory.setEntryIdleTimeout(
+ new ExpirationAttributes(maxInactiveInterval, ExpirationAction.DESTROY));
} else {
requestedFactory.setCustomEntryIdleTimeout(configuration.getCustomExpiry());
}
@@ -147,7 +149,7 @@ public class RegionHelper {
// Enable gateway replication if necessary
// TODO: Disabled for WAN
-// requestedFactory.setEnableGateway(configuration.getEnableGatewayReplication());
+ // requestedFactory.setEnableGateway(configuration.getEnableGatewayReplication());
// Add the debug cache listener if necessary
if (configuration.getEnableDebugListener()) {
@@ -161,7 +163,8 @@ public class RegionHelper {
// Add the cacheWriter if necessary
if (configuration.getCacheWriterName() != null) {
try {
- CacheWriter writer = (CacheWriter) Class.forName(configuration.getCacheWriterName()).newInstance();
+ CacheWriter writer =
+ (CacheWriter) Class.forName(configuration.getCacheWriterName()).newInstance();
requestedFactory.setCacheWriter(writer);
} catch (InstantiationException e) {
throw new RuntimeException("Could not set a cacheWriter for the region", e);
@@ -174,8 +177,7 @@ public class RegionHelper {
return requestedFactory.create();
}
- private RegionHelper() {
- }
+ private RegionHelper() {}
public static String getRebalanceResultsMessage(RebalanceResults results) {
StringBuilder builder = new StringBuilder();
@@ -184,58 +186,42 @@ public class RegionHelper {
fillInRebalanceResultsSummary(builder, rebalanceInfo);
// Log the 'Before' results
- fillInRebalanceResultsMemberDetails(builder, rebalanceInfo.getPartitionMemberDetailsBefore(), "Before");
+ fillInRebalanceResultsMemberDetails(builder, rebalanceInfo.getPartitionMemberDetailsBefore(),
+ "Before");
// Log the 'After' results
- fillInRebalanceResultsMemberDetails(builder, rebalanceInfo.getPartitionMemberDetailsAfter(), "After");
+ fillInRebalanceResultsMemberDetails(builder, rebalanceInfo.getPartitionMemberDetailsAfter(),
+ "After");
}
return builder.toString();
}
- private static void fillInRebalanceResultsSummary(StringBuilder builder, PartitionRebalanceInfo rebalanceInfo) {
- builder.append("\nRebalanced region ")
- .append(rebalanceInfo.getRegionPath())
- .append(" in ")
- .append(rebalanceInfo.getTime())
- .append(" ms")
-
- .append("\nCreated ")
- .append(rebalanceInfo.getBucketCreatesCompleted())
- .append(" buckets containing ")
- .append(rebalanceInfo.getBucketCreateBytes())
- .append(" bytes in ")
- .append(rebalanceInfo.getBucketCreateTime())
- .append(" ms")
-
- .append("\nTransferred ")
- .append(rebalanceInfo.getBucketTransfersCompleted())
- .append(" buckets containing ")
- .append(rebalanceInfo.getBucketTransferBytes())
- .append(" bytes in ")
- .append(rebalanceInfo.getBucketTransferTime())
- .append(" ms")
-
- .append("\nTransferred ")
- .append(rebalanceInfo.getPrimaryTransfersCompleted())
- .append(" primary buckets in ")
- .append(rebalanceInfo.getPrimaryTransferTime())
+ private static void fillInRebalanceResultsSummary(StringBuilder builder,
+ PartitionRebalanceInfo rebalanceInfo) {
+ builder.append("\nRebalanced region ").append(rebalanceInfo.getRegionPath()).append(" in ")
+ .append(rebalanceInfo.getTime()).append(" ms")
+
+ .append("\nCreated ").append(rebalanceInfo.getBucketCreatesCompleted())
+ .append(" buckets containing ").append(rebalanceInfo.getBucketCreateBytes())
+ .append(" bytes in ").append(rebalanceInfo.getBucketCreateTime()).append(" ms")
+
+ .append("\nTransferred ").append(rebalanceInfo.getBucketTransfersCompleted())
+ .append(" buckets containing ").append(rebalanceInfo.getBucketTransferBytes())
+ .append(" bytes in ").append(rebalanceInfo.getBucketTransferTime()).append(" ms")
+
+ .append("\nTransferred ").append(rebalanceInfo.getPrimaryTransfersCompleted())
+ .append(" primary buckets in ").append(rebalanceInfo.getPrimaryTransferTime())
.append(" ms");
}
- private static void fillInRebalanceResultsMemberDetails(StringBuilder builder, Set<PartitionMemberInfo> memberInfoSet,
- String when) {
+ private static void fillInRebalanceResultsMemberDetails(StringBuilder builder,
+ Set<PartitionMemberInfo> memberInfoSet, String when) {
builder.append("\nMember Info ").append(when).append(" Rebalance:\n");
for (PartitionMemberInfo info : memberInfoSet) {
- builder.append("\tdistributedMember=")
- .append(info.getDistributedMember())
- .append(", configuredMaxMemory=")
- .append(info.getConfiguredMaxMemory())
- .append(", size=")
- .append(info.getSize())
- .append(", bucketCount=")
- .append(info.getBucketCount())
- .append(", primaryCount=")
- .append(info.getPrimaryCount());
+ builder.append("\tdistributedMember=").append(info.getDistributedMember())
+ .append(", configuredMaxMemory=").append(info.getConfiguredMaxMemory()).append(", size=")
+ .append(info.getSize()).append(", bucketCount=").append(info.getBucketCount())
+ .append(", primaryCount=").append(info.getPrimaryCount());
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
index 5cad86c..bedfcba 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionSizeFunction.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.cache.Declarable;
@@ -51,6 +49,5 @@ public class RegionSizeFunction implements Function, Declarable {
}
@Override
- public void init(Properties arg0) {
- }
+ public void init(Properties arg0) {}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java
index d539a5c..f7e33bc 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/RegionStatus.java
@@ -1,18 +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
+ * 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.modules.util;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java
index bf39bb2..d3e5f18 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ResourceManagerValidator.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.cache.GemFireCache;
@@ -53,7 +51,8 @@ public class ResourceManagerValidator {
}
}
- private static void validateSunArguments(GemFireCache cache, ResourceManager rm, List<String> inputArguments) {
+ private static void validateSunArguments(GemFireCache cache, ResourceManager rm,
+ List<String> inputArguments) {
// Retrieve the -Xms, -Xmx, UseConcMarkSweepGC and CMSInitiatingOccupancyFraction arguments
String dashXms = null, dashXmx = null, useCMS = null, cmsIOF = null;
for (String argument : inputArguments) {
@@ -69,15 +68,9 @@ public class ResourceManagerValidator {
}
if (cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
- builder.append("Relevant input java arguments: ")
- .append("dashXms=")
- .append(dashXms)
- .append("; dashXmx=")
- .append(dashXmx)
- .append("; useCMS=")
- .append(useCMS)
- .append("; cmsIOF=")
- .append(cmsIOF);
+ builder.append("Relevant input java arguments: ").append("dashXms=").append(dashXms)
+ .append("; dashXmx=").append(dashXmx).append("; useCMS=").append(useCMS)
+ .append("; cmsIOF=").append(cmsIOF);
cache.getLogger().fine(builder.toString());
}
@@ -91,15 +84,14 @@ public class ResourceManagerValidator {
verifyCMSInitiatingOccupancyFraction(cache, rm, cmsIOF);
}
- private static void validateJavaHeapParameters(GemFireCache cache, String dashXms, String dashXmx) {
+ private static void validateJavaHeapParameters(GemFireCache cache, String dashXms,
+ String dashXmx) {
if (dashXms == null) {
- cache.getLogger()
- .warning(
- "Setting the initial size of the heap (configured using -Xms) is recommended so that GemFire cache eviction is optimal");
+ cache.getLogger().warning(
+ "Setting the initial size of the heap (configured using -Xms) is recommended so that GemFire cache eviction is optimal");
} else if (dashXmx == null) {
- cache.getLogger()
- .warning(
- "Setting the maximum size of the heap (configured using -Xmx) is recommended so that GemFire cache eviction is optimal");
+ cache.getLogger().warning(
+ "Setting the maximum size of the heap (configured using -Xmx) is recommended so that GemFire cache eviction is optimal");
} else {
// Neither heap parameter is null. Parse them and verify they are the same.
List<String> dashXmsList = splitAtDigits(dashXms);
@@ -108,13 +100,9 @@ public class ResourceManagerValidator {
String dashXmxStr = dashXmxList.get(1);
if (!dashXmsStr.equals(dashXmxStr)) {
StringBuilder builder = new StringBuilder();
- builder.append("Setting the initial (")
- .append(dashXmsStr)
- .append(dashXmsList.get(2))
- .append(") and maximum (")
- .append(dashXmxStr)
- .append(dashXmxList.get(2))
- .append(") sizes of the heap the same is recommended so that GemFire cache eviction is optimal");
+ builder.append("Setting the initial (").append(dashXmsStr).append(dashXmsList.get(2))
+ .append(") and maximum (").append(dashXmxStr).append(dashXmxList.get(2)).append(
+ ") sizes of the heap the same is recommended so that GemFire cache eviction is optimal");
cache.getLogger().warning(builder.toString());
}
}
@@ -122,31 +110,33 @@ public class ResourceManagerValidator {
private static void verifyCMSGC(GemFireCache cache, String useCMS) {
if (useCMS == null) {
- cache.getLogger()
- .warning(
- "Using the concurrent garbage collector (configured using -XX:+UseConcMarkSweepGC) is recommended so that GemFire cache eviction is optimal");
+ cache.getLogger().warning(
+ "Using the concurrent garbage collector (configured using -XX:+UseConcMarkSweepGC) is recommended so that GemFire cache eviction is optimal");
}
}
- private static void verifyCMSInitiatingOccupancyFraction(GemFireCache cache, ResourceManager rm, String cmsIOF) {
+ private static void verifyCMSInitiatingOccupancyFraction(GemFireCache cache, ResourceManager rm,
+ String cmsIOF) {
if (cmsIOF == null) {
- cache.getLogger()
- .warning(
- "Setting the CMS initiating occupancy fraction (configured using -XX:CMSInitiatingOccupancyFraction=N) is recommended so that GemFire cache eviction is optimal");
+ cache.getLogger().warning(
+ "Setting the CMS initiating occupancy fraction (configured using -XX:CMSInitiatingOccupancyFraction=N) is recommended so that GemFire cache eviction is optimal");
} else {
- // Parse the CMSInitiatingOccupancyFraction. Verify it is less than both eviction and critical thresholds.
+ // Parse the CMSInitiatingOccupancyFraction. Verify it is less than both eviction and critical
+ // thresholds.
int cmsIOFVal = Integer.parseInt(cmsIOF.split("=")[1]);
float currentEvictionHeapPercentage = rm.getEvictionHeapPercentage();
if (currentEvictionHeapPercentage != 0 && currentEvictionHeapPercentage < cmsIOFVal) {
cache.getLogger()
- .warning(
- "Setting the CMS initiating occupancy fraction (" + cmsIOFVal + ") less than the eviction heap percentage (" + currentEvictionHeapPercentage + ") is recommended so that GemFire cache eviction is optimal");
+ .warning("Setting the CMS initiating occupancy fraction (" + cmsIOFVal
+ + ") less than the eviction heap percentage (" + currentEvictionHeapPercentage
+ + ") is recommended so that GemFire cache eviction is optimal");
}
float currentCriticalHeapPercentage = rm.getCriticalHeapPercentage();
if (currentCriticalHeapPercentage != 0 && currentCriticalHeapPercentage < cmsIOFVal) {
cache.getLogger()
- .warning(
- "Setting the CMS initiating occupancy fraction (" + cmsIOFVal + ") less than the critical heap percentage (" + currentCriticalHeapPercentage + ") is recommended so that GemFire cache eviction is optimal");
+ .warning("Setting the CMS initiating occupancy fraction (" + cmsIOFVal
+ + ") less than the critical heap percentage (" + currentCriticalHeapPercentage
+ + ") is recommended so that GemFire cache eviction is optimal");
}
}
}
@@ -160,7 +150,6 @@ public class ResourceManagerValidator {
return result;
}
- private ResourceManagerValidator() {
- }
+ private ResourceManagerValidator() {}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java
index 2e6b3cf..fd1e5b2 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/SessionCustomExpiry.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.cache.CustomExpiry;
@@ -27,26 +25,27 @@ import java.io.Serializable;
import java.util.Properties;
@SuppressWarnings("serial")
-public class SessionCustomExpiry implements CustomExpiry<String, HttpSession>, Serializable, Declarable {
+public class SessionCustomExpiry
+ implements CustomExpiry<String, HttpSession>, Serializable, Declarable {
private static final long serialVersionUID = 182735509690640051L;
- private static final ExpirationAttributes EXPIRE_NOW = new ExpirationAttributes(1, ExpirationAction.DESTROY);
+ private static final ExpirationAttributes EXPIRE_NOW =
+ new ExpirationAttributes(1, ExpirationAction.DESTROY);
public ExpirationAttributes getExpiry(Region.Entry<String, HttpSession> entry) {
HttpSession session = entry.getValue();
if (session != null) {
- return new ExpirationAttributes(entry.getValue().getMaxInactiveInterval(), ExpirationAction.DESTROY);
+ return new ExpirationAttributes(entry.getValue().getMaxInactiveInterval(),
+ ExpirationAction.DESTROY);
} else {
return EXPIRE_NOW;
}
}
- public void close() {
- }
+ public void close() {}
- public void init(Properties props) {
- }
+ public void init(Properties props) {}
public boolean equals(Object obj) {
// This method is only implemented so that RegionCreator.validateRegion works properly.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
index ab630a2..9a3f5aa 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchPartitionedRegionEntriesFunction.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.cache.Cache;
@@ -58,12 +56,8 @@ public class TouchPartitionedRegionEntriesFunction implements Function, Declarab
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
- builder.append("Function ")
- .append(ID)
- .append(" received request to touch ")
- .append(primaryDataSet.getFullPath())
- .append("->")
- .append(keys);
+ builder.append("Function ").append(ID).append(" received request to touch ")
+ .append(primaryDataSet.getFullPath()).append("->").append(keys);
this.cache.getLogger().fine(builder.toString());
}
@@ -93,7 +87,6 @@ public class TouchPartitionedRegionEntriesFunction implements Function, Declarab
return true;
}
- public void init(Properties properties) {
- }
+ public void init(Properties properties) {}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
index f3bb294..3d2a037 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/TouchReplicatedRegionEntriesFunction.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.cache.Cache;
@@ -27,8 +25,8 @@ import java.util.Properties;
import java.util.Set;
/**
- * Touches the keys contained in the set of keys by performing a get on the replicated region. This is a non-data-aware
- * function invoked using onMembers or onServers.
+ * Touches the keys contained in the set of keys by performing a get on the replicated region. This
+ * is a non-data-aware function invoked using onMembers or onServers.
*
*/
public class TouchReplicatedRegionEntriesFunction implements Function, Declarable {
@@ -53,12 +51,8 @@ public class TouchReplicatedRegionEntriesFunction implements Function, Declarabl
Set<String> keys = (Set<String>) arguments[1];
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
- builder.append("Function ")
- .append(ID)
- .append(" received request to touch ")
- .append(regionName)
- .append("->")
- .append(keys);
+ builder.append("Function ").append(ID).append(" received request to touch ")
+ .append(regionName).append("->").append(keys);
this.cache.getLogger().fine(builder.toString());
}
@@ -90,7 +84,6 @@ public class TouchReplicatedRegionEntriesFunction implements Function, Declarabl
return true;
}
- public void init(Properties properties) {
- }
+ public void init(Properties properties) {}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java
index 4b04b56..46b4a25 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Callback.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
import javax.servlet.ServletException;
@@ -26,5 +24,6 @@ import java.io.IOException;
*/
public interface Callback {
- public void call(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException;
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java
index 89e8d8d..3fede62 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/CommandServlet.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
@@ -42,7 +40,8 @@ public class CommandServlet extends HttpServlet {
* @throws IOException
*/
@Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
+ protected void doGet(HttpServletRequest request, HttpServletResponse response)
+ throws IOException, ServletException {
QueryCommand cmd = QueryCommand.UNKNOWN;
String param = request.getParameter("param");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java
index 9ba4d8f..7f04e8b 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
import org.apache.geode.modules.session.catalina.JvmRouteBinderValve;
@@ -71,7 +69,8 @@ public class EmbeddedTomcat {
*/
private String webappDir = "";
- public EmbeddedTomcat(String contextPath, int port, String jvmRoute) throws MalformedURLException {
+ public EmbeddedTomcat(String contextPath, int port, String jvmRoute)
+ throws MalformedURLException {
this.contextPath = contextPath;
this.port = port;
@@ -148,7 +147,8 @@ public class EmbeddedTomcat {
}
}
- public StandardWrapper addServlet(String path, String name, String clazz) throws ServletException {
+ public StandardWrapper addServlet(String path, String name, String clazz)
+ throws ServletException {
StandardWrapper servlet = (StandardWrapper) rootContext.createWrapper();
servlet.setName(name);
servlet.setServletClass(clazz);
@@ -158,7 +158,7 @@ public class EmbeddedTomcat {
rootContext.addServletMapping(path, name);
servlet.setParent(rootContext);
-// servlet.load();
+ // servlet.load();
return servlet;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java
index 81d5301..2b89e68 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/QueryCommand.java
@@ -1,18 +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
+ * 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.modules.session;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
index d0c4b19..d7674dd 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/TestSessionsBase.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
import static org.apache.geode.distributed.ConfigurationProperties.*;
@@ -72,8 +70,8 @@ public abstract class TestSessionsBase {
server.startContainer();
/*
- * Can only retrieve the region once the container has started up
- * (and the cache has started too).
+ * Can only retrieve the region once the container has started up (and the cache has started
+ * too).
*/
region = sessionManager.getSessionCache().getSessionRegion();
}
@@ -107,8 +105,9 @@ public abstract class TestSessionsBase {
}
/**
- * Test callback functionality. This is here really just as an example. Callbacks are useful to implement per test
- * actions which can be defined within the actual test method instead of in a separate servlet class.
+ * Test callback functionality. This is here really just as an example. Callbacks are useful to
+ * implement per test actions which can be defined within the actual test method instead of in a
+ * separate servlet class.
*/
@Test
public void testCallback() throws Exception {
@@ -116,7 +115,8 @@ public abstract class TestSessionsBase {
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
PrintWriter out = response.getWriter();
out.write(helloWorld);
}
@@ -141,7 +141,8 @@ public abstract class TestSessionsBase {
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
HttpSession session = request.getSession();
response.getWriter().write(Boolean.toString(session.isNew()));
}
@@ -162,7 +163,8 @@ public abstract class TestSessionsBase {
}
/**
- * Check that our session persists. The values we pass in as query params are used to set attributes on the session.
+ * Check that our session persists. The values we pass in as query params are used to set
+ * attributes on the session.
*/
@Test
public void testSessionPersists1() throws Exception {
@@ -251,13 +253,14 @@ public abstract class TestSessionsBase {
}
/**
- * Test setting the session expiration via a property change as would happen under normal deployment conditions.
+ * Test setting the session expiration via a property change as would happen under normal
+ * deployment conditions.
*/
@Test
public void testSessionExpiration2() throws Exception {
// TestSessions only live for a minute
- sessionManager.propertyChange(
- new PropertyChangeEvent(server.getRootContext(), "sessionTimeout", new Integer(30), new Integer(1)));
+ sessionManager.propertyChange(new PropertyChangeEvent(server.getRootContext(), "sessionTimeout",
+ new Integer(30), new Integer(1)));
// Check that the value has been set to 60 seconds
assertEquals(60, sessionManager.getMaxInactiveInterval());
@@ -343,7 +346,8 @@ public abstract class TestSessionsBase {
}
/**
- * Test that multiple attribute updates, within the same request result in only the latest one being effective.
+ * Test that multiple attribute updates, within the same request result in only the latest one
+ * being effective.
*/
@Test
public void testMultipleAttributeUpdates() throws Exception {
@@ -351,7 +355,8 @@ public abstract class TestSessionsBase {
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
HttpSession session = request.getSession();
for (int i = 0; i < 1000; i++) {
session.setAttribute(key, Integer.toString(i));
@@ -380,7 +385,8 @@ public abstract class TestSessionsBase {
public void testCommitSessionValveInvalidSession() throws Exception {
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
HttpSession session = request.getSession();
session.invalidate();
response.getWriter().write("done");
@@ -406,7 +412,8 @@ public abstract class TestSessionsBase {
public void testExtraSessionsNotCreated() throws Exception {
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
// Do nothing with sessions
response.getWriter().write("done");
}
@@ -426,13 +433,15 @@ public abstract class TestSessionsBase {
}
/**
- * Test for issue #46 lastAccessedTime is not updated at the start of the request, but only at the end.
+ * Test for issue #46 lastAccessedTime is not updated at the start of the request, but only at the
+ * end.
*/
@Test
public void testLastAccessedTime() throws Exception {
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
HttpSession session = request.getSession();
// Hack to expose the session to our test context
session.getServletContext().setAttribute("session", session);
@@ -460,7 +469,8 @@ public abstract class TestSessionsBase {
Long lastAccess = (Long) session.getAttribute("lastAccessTime");
assertTrue(
- "Last access time not set correctly: " + lastAccess.longValue() + " not <= " + session.getLastAccessedTime(),
+ "Last access time not set correctly: " + lastAccess.longValue() + " not <= "
+ + session.getLastAccessedTime(),
lastAccess.longValue() <= session.getLastAccessedTime());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
index 1a9c715..cdcd2a3 100644
--- a/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
+++ b/extensions/geode-modules/src/test/java/org/apache/geode/modules/session/Tomcat6SessionsJUnitTest.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
import org.apache.geode.modules.session.catalina.Tomcat6DeltaSessionManager;
[75/98] [abbrv] incubator-geode git commit: Merge branch
'release/1.0.0-incubating' into develop
Posted by ds...@apache.org.
Merge branch 'release/1.0.0-incubating' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ddc32682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ddc32682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ddc32682
Branch: refs/heads/feature/GEM-983
Commit: ddc326821c74c170a8fe03642d7114a0e51311d9
Parents: cd06c8c 280a407
Author: Swapnil Bawaskar <sb...@apache.org>
Authored: Tue Oct 25 11:14:01 2016 -0700
Committer: Swapnil Bawaskar <sb...@apache.org>
Committed: Tue Oct 25 11:14:01 2016 -0700
----------------------------------------------------------------------
KEYS | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 171 insertions(+)
----------------------------------------------------------------------
[14/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
index b87792d..6a1bd63 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -55,18 +53,19 @@ import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.internal.util.JavaCommandBuilder;
/**
- * A command line utility inspired by the <code>CacheServerLauncher</code> that is responsible for administering
- * a stand-along GemFire JMX {@link Agent}.
+ * A command line utility inspired by the <code>CacheServerLauncher</code> that is responsible for
+ * administering a stand-along GemFire JMX {@link Agent}.
* <p/>
+ *
* @since GemFire 3.5
*/
public class AgentLauncher {
private static final Logger logger = LogService.getLogger();
-
+
/** Should the launch command be printed? */
- public static final boolean PRINT_LAUNCH_COMMAND = Boolean.getBoolean(AgentLauncher.class.getSimpleName()
- + ".PRINT_LAUNCH_COMMAND");
+ public static final boolean PRINT_LAUNCH_COMMAND =
+ Boolean.getBoolean(AgentLauncher.class.getSimpleName() + ".PRINT_LAUNCH_COMMAND");
/* constants used to define state */
static final int SHUTDOWN = 0;
@@ -79,7 +78,10 @@ public class AgentLauncher {
/** Agent configuration options */
static final String AGENT_PROPS = "agent-props";
- /** A flag to indicate if the current log file should be kept. Used only when 'start' is used to fork off the 'server' */
+ /**
+ * A flag to indicate if the current log file should be kept. Used only when 'start' is used to
+ * fork off the 'server'
+ */
static final String APPENDTO_LOG_FILE = "appendto-log-file";
/** optional and additional classpath entries */
@@ -107,10 +109,11 @@ public class AgentLauncher {
private final String statusFileName;
/**
- * Instantiates an AgentLauncher for execution and control of the GemFire JMX Agent process. This constructor is
- * package private to prevent direct instantiation or subclassing by classes outside this package, but does allow
- * the class to be tested as needed.
+ * Instantiates an AgentLauncher for execution and control of the GemFire JMX Agent process. This
+ * constructor is package private to prevent direct instantiation or subclassing by classes
+ * outside this package, but does allow the class to be tested as needed.
* <p/>
+ *
* @param basename base name for the application to be launched
*/
AgentLauncher(final String basename) {
@@ -135,15 +138,17 @@ public class AgentLauncher {
SortedMap<String, String> map = new TreeMap<String, String>();
int maxLength = 0;
- for (Iterator<Object> iter = props.keySet().iterator(); iter.hasNext(); ) {
+ for (Iterator<Object> iter = props.keySet().iterator(); iter.hasNext();) {
String prop = (String) iter.next();
int length = prop.length();
if (length > maxLength) {
maxLength = length;
}
- map.put(prop, AgentConfigImpl.getPropertyDescription(prop) +
- " (" + LocalizedStrings.AgentLauncher_DEFAULT.toLocalizedString() + " \"" + props.getProperty(prop) + "\")");
+ map.put(prop,
+ AgentConfigImpl.getPropertyDescription(prop) + " ("
+ + LocalizedStrings.AgentLauncher_DEFAULT.toLocalizedString() + " \""
+ + props.getProperty(prop) + "\")");
}
Iterator<Entry<String, String>> entries = map.entrySet().iterator();
@@ -175,8 +180,8 @@ public class AgentLauncher {
}
/**
- * Returns a map that maps the name of the start options to its value on the command line. If no value is
- * specified on the command line, a default one is provided.
+ * Returns a map that maps the name of the start options to its value on the command line. If no
+ * value is specified on the command line, a default one is provided.
*/
protected Map<String, Object> getStartOptions(final String[] args) throws Exception {
final Map<String, Object> options = new HashMap<String, Object>();
@@ -193,21 +198,18 @@ public class AgentLauncher {
for (final String arg : args) {
if (arg.startsWith("-classpath=")) {
options.put(CLASSPATH, arg.substring("-classpath=".length()));
- }
- else if (arg.startsWith("-dir=")) {
+ } else if (arg.startsWith("-dir=")) {
final File workingDirectory = processDirOption(options, arg.substring("-dir=".length()));
System.setProperty(AgentConfigImpl.AGENT_PROPSFILE_PROPERTY_NAME,
- new File(workingDirectory, AgentConfig.DEFAULT_PROPERTY_FILE).getPath());
- }
- else if (arg.startsWith("-J")) {
+ new File(workingDirectory, AgentConfig.DEFAULT_PROPERTY_FILE).getPath());
+ } else if (arg.startsWith("-J")) {
vmArgs.add(arg.substring(2));
- }
- else if (arg.contains("=")) {
+ } else if (arg.contains("=")) {
final int index = arg.indexOf("=");
final String prop = arg.substring(0, index);
final String value = arg.substring(index + 1);
- // if appendto-log-file is set, put it in options; it is not set as an agent prop
+ // if appendto-log-file is set, put it in options; it is not set as an agent prop
if (prop.equals(APPENDTO_LOG_FILE)) {
options.put(APPENDTO_LOG_FILE, value);
continue;
@@ -216,16 +218,21 @@ public class AgentLauncher {
// verify the property is valid
AgentConfigImpl.getPropertyDescription(prop);
- // Note, the gfAgentPropertyFile System property is ultimately read in the constructor of the AgentImpl class
- // in order to make any properties defined in this file not only accessible to the DistributedSystem but to
+ // Note, the gfAgentPropertyFile System property is ultimately read in the constructor of
+ // the AgentImpl class
+ // in order to make any properties defined in this file not only accessible to the
+ // DistributedSystem but to
// the GemFire Agent as well.
if (AgentConfigImpl.PROPERTY_FILE_NAME.equals(prop)) {
System.setProperty(AgentConfigImpl.AGENT_PROPSFILE_PROPERTY_NAME, value);
}
- // The Agent properties file (specified with the command-line key=value) is used to pass configuration settings
- // to the GemFire DistributedSystem. A property file can be passed using the property-file command-line switch
- // is a large number of properties are specified, or the properties maybe individually specified on the
+ // The Agent properties file (specified with the command-line key=value) is used to pass
+ // configuration settings
+ // to the GemFire DistributedSystem. A property file can be passed using the property-file
+ // command-line switch
+ // is a large number of properties are specified, or the properties maybe individually
+ // specified on the
// command-line as property=value arguments.
agentProps.setProperty(prop, value);
}
@@ -235,21 +242,24 @@ public class AgentLauncher {
}
/**
- * After parsing the command line arguments, spawn the Java VM that will host the GemFire JMX Agent.
+ * After parsing the command line arguments, spawn the Java VM that will host the GemFire JMX
+ * Agent.
*/
public void start(final String[] args) throws Exception {
final Map<String, Object> options = getStartOptions(args);
workingDirectory = IOUtils.tryGetCanonicalFileElseGetAbsoluteFile((File) options.get(DIR));
- // verify that any GemFire JMX Agent process has been properly shutdown and delete any remaining status files...
+ // verify that any GemFire JMX Agent process has been properly shutdown and delete any remaining
+ // status files...
verifyAndClearStatus();
// start the GemFire JMX Agent process...
runCommandLine(options, buildCommandLine(options));
// wait for the GemFire JMX Agent process to complete startup and begin running...
- // it is also possible the Agent process may fail to start, so this should not wait indefinitely unless
+ // it is also possible the Agent process may fail to start, so this should not wait indefinitely
+ // unless
// the status file was not successfully written to
pollAgentUntilRunning();
@@ -260,15 +270,16 @@ public class AgentLauncher {
final Status status = getStatus();
if (status != null && status.state != SHUTDOWN) {
- throw new IllegalStateException(LocalizedStrings.AgentLauncher_JMX_AGENT_EXISTS_BUT_WAS_NOT_SHUTDOWN.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.AgentLauncher_JMX_AGENT_EXISTS_BUT_WAS_NOT_SHUTDOWN.toLocalizedString());
}
deleteStatus();
}
private String[] buildCommandLine(final Map<String, Object> options) {
- final List<String> commands = JavaCommandBuilder.buildCommand(AgentLauncher.class.getName(), (String) options.get(CLASSPATH), null,
- (List<String>) options.get(VMARGS));
+ final List<String> commands = JavaCommandBuilder.buildCommand(AgentLauncher.class.getName(),
+ (String) options.get(CLASSPATH), null, (List<String>) options.get(VMARGS));
commands.add("server");
commands.add("-dir=" + workingDirectory);
@@ -293,14 +304,16 @@ public class AgentLauncher {
}
}
- private int runCommandLine(final Map<String, Object> options, final String[] commandLine) throws IOException {
- // initialize the startup log starting with a fresh log file (where all startup messages are printed)
- final File startLogFile = IOUtils.tryGetCanonicalFileElseGetAbsoluteFile(
- new File(workingDirectory, startLogFileName));
+ private int runCommandLine(final Map<String, Object> options, final String[] commandLine)
+ throws IOException {
+ // initialize the startup log starting with a fresh log file (where all startup messages are
+ // printed)
+ final File startLogFile = IOUtils
+ .tryGetCanonicalFileElseGetAbsoluteFile(new File(workingDirectory, startLogFileName));
if (startLogFile.exists() && !startLogFile.delete()) {
- throw new IOException(LocalizedStrings.AgentLauncher_UNABLE_TO_DELETE_FILE_0.toLocalizedString(
- startLogFile.getAbsolutePath()));
+ throw new IOException(LocalizedStrings.AgentLauncher_UNABLE_TO_DELETE_FILE_0
+ .toLocalizedString(startLogFile.getAbsolutePath()));
}
Map<String, String> env = new HashMap<String, String>();
@@ -311,7 +324,8 @@ public class AgentLauncher {
final int pid = OSProcess.bgexec(commandLine, workingDirectory, startLogFile, false, env);
- System.out.println(LocalizedStrings.AgentLauncher_STARTING_JMX_AGENT_WITH_PID_0.toLocalizedString(pid));
+ System.out.println(
+ LocalizedStrings.AgentLauncher_STARTING_JMX_AGENT_WITH_PID_0.toLocalizedString(pid));
return pid;
}
@@ -319,10 +333,13 @@ public class AgentLauncher {
private void pollAgentUntilRunning() throws Exception {
Status status = spinReadStatus();
- // TODO this loop could recurse indefinitely if the GemFire JMX Agent's state never changes from STARTING
- // to something else (like RUNNING), which could happen if server process fails to startup correctly
+ // TODO this loop could recurse indefinitely if the GemFire JMX Agent's state never changes from
+ // STARTING
+ // to something else (like RUNNING), which could happen if server process fails to startup
+ // correctly
// and did not or could not write to the status file!
- // TODO should we really allow the InterruptedException from the Thread.sleep call to break this loop (yeah, I
+ // TODO should we really allow the InterruptedException from the Thread.sleep call to break this
+ // loop (yeah, I
// think so given the fact this could loop indefinitely)?
while (status != null && status.state == STARTING) {
Thread.sleep(500);
@@ -332,8 +349,7 @@ public class AgentLauncher {
if (status == null) {
// TODO throw a more appropriate Exception here!
throw new Exception(LocalizedStrings.AgentLauncher_NO_AVAILABLE_STATUS.toLocalizedString());
- }
- else {
+ } else {
System.out.println(status);
}
}
@@ -370,21 +386,23 @@ public class AgentLauncher {
}
// LOG:TODO: redirectOutput called here
- OSProcess.redirectOutput(new File(config.getLogFile())); // redirect output to the configured log file
+ OSProcess.redirectOutput(new File(config.getLogFile())); // redirect output to the configured
+ // log file
return AgentFactory.getAgent(config);
}
private ThreadGroup createAgentProcessThreadGroup() {
return new ThreadGroup(LocalizedStrings.AgentLauncher_STARTING_AGENT.toLocalizedString()) {
- @Override
- public void uncaughtException(final Thread t, final Throwable e) {
- if (e instanceof VirtualMachineError) {
- SystemFailure.setFailure((VirtualMachineError) e);
- }
- setServerError(LocalizedStrings.AgentLauncher_UNCAUGHT_EXCEPTION_IN_THREAD_0.toLocalizedString(t.getName()), e);
+ @Override
+ public void uncaughtException(final Thread t, final Throwable e) {
+ if (e instanceof VirtualMachineError) {
+ SystemFailure.setFailure((VirtualMachineError) e);
}
- };
+ setServerError(LocalizedStrings.AgentLauncher_UNCAUGHT_EXCEPTION_IN_THREAD_0
+ .toLocalizedString(t.getName()), e);
+ }
+ };
}
private Thread createAgentProcessThread(final ThreadGroup group, final Agent agent) {
@@ -397,18 +415,17 @@ public class AgentLauncher {
try {
agent.start();
writeStatus(createStatus(AgentLauncher.this.basename, RUNNING, OSProcess.getId()));
- }
- catch (IOException e) {
+ } catch (IOException e) {
e.printStackTrace();
- }
- catch (GemFireException e) {
+ } catch (GemFireException e) {
e.printStackTrace();
handleGemFireException(e);
}
}
private void handleGemFireException(final GemFireException e) {
- String message = LocalizedStrings.AgentLauncher_SERVER_FAILED_TO_START_0.toLocalizedString(e.getMessage());
+ String message = LocalizedStrings.AgentLauncher_SERVER_FAILED_TO_START_0
+ .toLocalizedString(e.getMessage());
if (e.getCause() != null) {
if (e.getCause().getCause() != null) {
@@ -427,9 +444,9 @@ public class AgentLauncher {
*/
private void setServerError(final String message, final Throwable cause) {
try {
- writeStatus(createStatus(this.basename, SHUTDOWN_PENDING_AFTER_FAILED_STARTUP, OSProcess.getId(), message, cause));
- }
- catch (Exception e) {
+ writeStatus(createStatus(this.basename, SHUTDOWN_PENDING_AFTER_FAILED_STARTUP,
+ OSProcess.getId(), message, cause));
+ } catch (Exception e) {
logger.fatal(e.getMessage(), e);
System.exit(1);
}
@@ -450,9 +467,8 @@ public class AgentLauncher {
}
/**
- * Extracts configuration information for stopping a agent based on the
- * contents of the command line. This method can also be used with getting
- * the status of a agent.
+ * Extracts configuration information for stopping a agent based on the contents of the command
+ * line. This method can also be used with getting the status of a agent.
*/
protected Map<String, Object> getStopOptions(final String[] args) throws Exception {
final Map<String, Object> options = new HashMap<String, Object>();
@@ -462,12 +478,11 @@ public class AgentLauncher {
for (final String arg : args) {
if (arg.equals("stop") || arg.equals("status")) {
// expected
- }
- else if (arg.startsWith("-dir=")) {
+ } else if (arg.startsWith("-dir=")) {
processDirOption(options, arg.substring("-dir=".length()));
- }
- else {
- throw new Exception(LocalizedStrings.AgentLauncher_UNKNOWN_ARGUMENT_0.toLocalizedString(arg));
+ } else {
+ throw new Exception(
+ LocalizedStrings.AgentLauncher_UNKNOWN_ARGUMENT_0.toLocalizedString(arg));
}
}
@@ -494,18 +509,19 @@ public class AgentLauncher {
pollAgentForShutdown();
if (isStatus(SHUTDOWN)) {
- System.out.println(LocalizedStrings.AgentLauncher_0_HAS_STOPPED.toLocalizedString(this.basename));
+ System.out
+ .println(LocalizedStrings.AgentLauncher_0_HAS_STOPPED.toLocalizedString(this.basename));
deleteStatus();
exitStatus = 0;
+ } else {
+ System.out
+ .println(LocalizedStrings.AgentLauncher_TIMEOUT_WAITING_FOR_0_TO_SHUTDOWN_STATUS_IS_1
+ .toLocalizedString(this.basename, status));
}
- else {
- System.out.println(LocalizedStrings.AgentLauncher_TIMEOUT_WAITING_FOR_0_TO_SHUTDOWN_STATUS_IS_1
- .toLocalizedString(this.basename, status));
- }
- }
- else {
- System.out.println(LocalizedStrings.AgentLauncher_THE_SPECIFIED_WORKING_DIRECTORY_0_CONTAINS_NO_STATUS_FILE
- .toLocalizedString(workingDirectory));
+ } else {
+ System.out.println(
+ LocalizedStrings.AgentLauncher_THE_SPECIFIED_WORKING_DIRECTORY_0_CONTAINS_NO_STATUS_FILE
+ .toLocalizedString(workingDirectory));
}
System.exit(exitStatus);
@@ -526,7 +542,8 @@ public class AgentLauncher {
* Prints the status of the GemFire JMX Agent running in the configured working directory.
*/
public void status(final String[] args) throws Exception {
- this.workingDirectory = IOUtils.tryGetCanonicalFileElseGetAbsoluteFile((File) getStopOptions(args).get(DIR));
+ this.workingDirectory =
+ IOUtils.tryGetCanonicalFileElseGetAbsoluteFile((File) getStopOptions(args).get(DIR));
System.out.println(getStatus());
System.exit(0);
}
@@ -539,24 +556,30 @@ public class AgentLauncher {
if (new File(workingDirectory, statusFileName).exists()) {
status = spinReadStatus();
- }
- else {
- status = createStatus(this.basename, SHUTDOWN, 0, LocalizedStrings.AgentLauncher_0_IS_NOT_RUNNING_IN_SPECIFIED_WORKING_DIRECTORY_1
- .toLocalizedString(this.basename, this.workingDirectory), null);
+ } else {
+ status = createStatus(this.basename, SHUTDOWN, 0,
+ LocalizedStrings.AgentLauncher_0_IS_NOT_RUNNING_IN_SPECIFIED_WORKING_DIRECTORY_1
+ .toLocalizedString(this.basename, this.workingDirectory),
+ null);
}
return status;
}
/**
- * Determines if the Status.state is one of the specified states in the given array of states. Note, the status
- * of the Agent, as indicated in the .agent.ser status file, should never have a written value of UNKNOWN.
+ * Determines if the Status.state is one of the specified states in the given array of states.
+ * Note, the status of the Agent, as indicated in the .agent.ser status file, should never have a
+ * written value of UNKNOWN.
* <p/>
- * @param states an array of possible acceptable states satisfying the condition of the Agent's status.
- * @return a boolean value indicating whether the Agent's status satisfies one of the specified states.
+ *
+ * @param states an array of possible acceptable states satisfying the condition of the Agent's
+ * status.
+ * @return a boolean value indicating whether the Agent's status satisfies one of the specified
+ * states.
*/
private boolean isStatus(final Integer... states) {
- return (this.status != null && Arrays.asList(defaultToUnknownStateIfNull(states)).contains(this.status.state));
+ return (this.status != null
+ && Arrays.asList(defaultToUnknownStateIfNull(states)).contains(this.status.state));
}
/**
@@ -571,12 +594,15 @@ public class AgentLauncher {
}
/**
- * Reads the GemFire JMX Agent's status from the status file (.agent.ser) in it's working directory.
+ * Reads the GemFire JMX Agent's status from the status file (.agent.ser) in it's working
+ * directory.
* <p/>
- * @return a Status object containing the state persisted to the .agent.ser file in the working directory
- * and representing the status of the Agent
+ *
+ * @return a Status object containing the state persisted to the .agent.ser file in the working
+ * directory and representing the status of the Agent
* @throws IOException if the status file was unable to be read.
- * @throws RuntimeException if the class of the object written to the .agent.ser file is not of type Status.
+ * @throws RuntimeException if the class of the object written to the .agent.ser file is not of
+ * type Status.
*/
protected Status readStatus() throws IOException {
FileInputStream fileIn = null;
@@ -587,22 +613,22 @@ public class AgentLauncher {
objectIn = new ObjectInputStream(fileIn);
this.status = (Status) objectIn.readObject();
return this.status;
- }
- catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e) {
throw new RuntimeException(e);
- }
- finally {
+ } finally {
IOUtils.close(objectIn);
IOUtils.close(fileIn);
}
}
/**
- * A wrapper method for the readStatus method to make one last check for the GemFire JMX Agent process if running
- * with the native libraries.
- * @return the Status object as returned from readStatus unless running in native mode and a determination is made
- * such that the Agent process is not running.
- * @throws IOException if the state of the Agent process could not be read from the .agent.ser status file.
+ * A wrapper method for the readStatus method to make one last check for the GemFire JMX Agent
+ * process if running with the native libraries.
+ *
+ * @return the Status object as returned from readStatus unless running in native mode and a
+ * determination is made such that the Agent process is not running.
+ * @throws IOException if the state of the Agent process could not be read from the .agent.ser
+ * status file.
* @see #readStatus()
*/
protected Status nativeReadStatus() throws IOException {
@@ -617,11 +643,12 @@ public class AgentLauncher {
}
/**
- * Reads the JMX Agent's status from the .agent.ser status file. If the status file cannot be read due
- * to I/O problems, the method will keep attempting to read the file for up to 20 seconds.
+ * Reads the JMX Agent's status from the .agent.ser status file. If the status file cannot be read
+ * due to I/O problems, the method will keep attempting to read the file for up to 20 seconds.
* <p/>
- * @return the Status of the GemFire JMX Agent as determined by the .agent.ser status file, or natively
- * based on the presence/absence of the Agent process.
+ *
+ * @return the Status of the GemFire JMX Agent as determined by the .agent.ser status file, or
+ * natively based on the presence/absence of the Agent process.
*/
protected Status spinReadStatus() {
Status status = null;
@@ -632,15 +659,15 @@ public class AgentLauncher {
while (status == null && clock < endTime) {
try {
status = nativeReadStatus();
- }
- catch (Exception ignore) {
+ } catch (Exception ignore) {
// see bug 31575
// see bug 36998
- // try again after a short delay... the status file might have been read prematurely before it existed
- // or while the server was trying to write to it resulting in a possible EOFException, or other IOException.
+ // try again after a short delay... the status file might have been read prematurely before
+ // it existed
+ // or while the server was trying to write to it resulting in a possible EOFException, or
+ // other IOException.
pause(500);
- }
- finally {
+ } finally {
clock = System.currentTimeMillis();
}
}
@@ -649,9 +676,10 @@ public class AgentLauncher {
}
/**
- * Sets the status of the GemFire JMX Agent by serializing a <code>Status</code> object to a status file
- * in the Agent's working directory.
+ * Sets the status of the GemFire JMX Agent by serializing a <code>Status</code> object to a
+ * status file in the Agent's working directory.
* <p/>
+ *
* @param status the Status object representing the state of the Agent process to persist to disk.
* @return the written Status object.
* @throws IOException if the Status could not be successfully persisted to disk.
@@ -667,8 +695,7 @@ public class AgentLauncher {
objectOut.flush();
this.status = status;
return this.status;
- }
- finally {
+ } finally {
IOUtils.close(objectOut);
IOUtils.close(fileOut);
}
@@ -678,7 +705,8 @@ public class AgentLauncher {
return createStatus(basename, state, pid, null, null);
}
- protected static Status createStatus(final String basename, final int state, final int pid, final String msg, final Throwable t) {
+ protected static Status createStatus(final String basename, final int state, final int pid,
+ final String msg, final Throwable t) {
final Status status = new Status(basename);
status.state = state;
status.pid = pid;
@@ -693,26 +721,27 @@ public class AgentLauncher {
}
protected static Integer[] defaultToUnknownStateIfNull(final Integer... states) {
- return (states != null ? states : new Integer[] { UNKNOWN });
+ return (states != null ? states : new Integer[] {UNKNOWN});
}
protected static boolean pause(final int milliseconds) {
try {
Thread.sleep(milliseconds);
return true;
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
Thread.currentThread().interrupt();
return false;
}
}
- protected static File processDirOption(final Map<String, Object> options, final String dirValue) throws FileNotFoundException {
+ protected static File processDirOption(final Map<String, Object> options, final String dirValue)
+ throws FileNotFoundException {
final File workingDirectory = new File(dirValue);
if (!workingDirectory.exists()) {
- throw new FileNotFoundException(LocalizedStrings.AgentLauncher_THE_INPUT_WORKING_DIRECTORY_DOES_NOT_EXIST_0
- .toLocalizedString(dirValue));
+ throw new FileNotFoundException(
+ LocalizedStrings.AgentLauncher_THE_INPUT_WORKING_DIRECTORY_DOES_NOT_EXIST_0
+ .toLocalizedString(dirValue));
}
options.put(DIR, workingDirectory);
@@ -723,6 +752,7 @@ public class AgentLauncher {
/**
* Prints usage information for the AgentLauncher to the command line.
* <p/>
+ *
* @param message a String to output to the command line indicating the user error.
*/
private static void usage(final String message) {
@@ -732,7 +762,7 @@ public class AgentLauncher {
out.println("agent start [-J<vmarg>]* [-dir=<dir>] [prop=value]*");
out.println(LocalizedStrings.AgentLauncher_STARTS_THE_GEMFIRE_JMX_AGENT.toLocalizedString());
- out.println("\t" + LocalizedStrings.AgentLauncher_VMARG.toLocalizedString() );
+ out.println("\t" + LocalizedStrings.AgentLauncher_VMARG.toLocalizedString());
out.println("\t" + LocalizedStrings.AgentLauncher_DIR.toLocalizedString());
out.println("\t" + LocalizedStrings.AgentLauncher_PROP.toLocalizedString());
out.println("\t" + LocalizedStrings.AgentLauncher_SEE_HELP_CONFIG.toLocalizedString());
@@ -743,7 +773,9 @@ public class AgentLauncher {
out.println("\t" + LocalizedStrings.AgentLauncher_DIR.toLocalizedString());
out.println("");
out.println("agent status [-dir=<dir>]");
- out.println(LocalizedStrings.AgentLauncher_REPORTS_THE_STATUS_AND_THE_PROCESS_ID_OF_A_GEMFIRE_JMX_AGENT.toLocalizedString());
+ out.println(
+ LocalizedStrings.AgentLauncher_REPORTS_THE_STATUS_AND_THE_PROCESS_ID_OF_A_GEMFIRE_JMX_AGENT
+ .toLocalizedString());
out.println("\t" + LocalizedStrings.AgentLauncher_DIR.toLocalizedString());
out.println();
@@ -751,15 +783,17 @@ public class AgentLauncher {
}
/**
- * Bootstrap method to launch the GemFire JMX Agent process to monitor and manage a GemFire Distributed System/Cache.
- * Main will read the arguments passed on the command line and dispatch the command to the appropriate handler.
+ * Bootstrap method to launch the GemFire JMX Agent process to monitor and manage a GemFire
+ * Distributed System/Cache. Main will read the arguments passed on the command line and dispatch
+ * the command to the appropriate handler.
*/
public static void main(final String[] args) {
if (args.length < 1) {
usage(LocalizedStrings.AgentLauncher_MISSING_COMMAND.toLocalizedString());
}
- // TODO is this only needed on 'agent server'? 'agent {start|stop|status}' technically do no run any GemFire Cache
+ // TODO is this only needed on 'agent server'? 'agent {start|stop|status}' technically do no run
+ // any GemFire Cache
// or DS code inside the current process.
SystemFailure.loadEmergencyClasses();
@@ -770,50 +804,45 @@ public class AgentLauncher {
if (command.equalsIgnoreCase("start")) {
launcher.start(args);
- }
- else if (command.equalsIgnoreCase("server")) {
+ } else if (command.equalsIgnoreCase("server")) {
launcher.server(args);
- }
- else if (command.equalsIgnoreCase("stop")) {
+ } else if (command.equalsIgnoreCase("stop")) {
launcher.stop(args);
- }
- else if (command.equalsIgnoreCase("status")) {
+ } else if (command.equalsIgnoreCase("status")) {
launcher.status(args);
- }
- else if (command.toLowerCase().matches("-{0,2}help")) {
+ } else if (command.toLowerCase().matches("-{0,2}help")) {
if (args.length > 1) {
final String topic = args[1];
if (topic.equals("config")) {
launcher.configHelp();
- }
- else {
+ } else {
usage(LocalizedStrings.AgentLauncher_NO_HELP_AVAILABLE_FOR_0.toLocalizedString(topic));
}
}
usage(LocalizedStrings.AgentLauncher_AGENT_HELP.toLocalizedString());
- }
- else {
+ } else {
usage(LocalizedStrings.AgentLauncher_UNKNOWN_COMMAND_0.toLocalizedString(command));
}
- }
- catch (VirtualMachineError e) {
+ } catch (VirtualMachineError e) {
SystemFailure.initiateFailure(e);
throw e;
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
SystemFailure.checkFailure();
t.printStackTrace();
- System.err.println(LocalizedStrings.AgentLauncher_ERROR_0.toLocalizedString(t.getLocalizedMessage()));
+ System.err.println(
+ LocalizedStrings.AgentLauncher_ERROR_0.toLocalizedString(t.getLocalizedMessage()));
System.exit(1);
}
}
/**
- * A class representing the current state of the GemFire JMX Agent process. Instances of this class are serialized
- * to a {@linkplain #statusFileName file} on disk in the specified working directory {@linkplain #workingDirectory}.
+ * A class representing the current state of the GemFire JMX Agent process. Instances of this
+ * class are serialized to a {@linkplain #statusFileName file} on disk in the specified working
+ * directory {@linkplain #workingDirectory}.
* <p/>
+ *
* @see #SHUTDOWN
* @see #STARTING
* @see #RUNNING
@@ -844,9 +873,9 @@ public class AgentLauncher {
if (pid == Integer.MIN_VALUE && state == SHUTDOWN && msg != null) {
buffer.append(msg);
- }
- else {
- buffer.append(LocalizedStrings.AgentLauncher_0_PID_1_STATUS.toLocalizedString(this.baseName, pid));
+ } else {
+ buffer.append(
+ LocalizedStrings.AgentLauncher_0_PID_1_STATUS.toLocalizedString(this.baseName, pid));
switch (state) {
case SHUTDOWN:
@@ -862,7 +891,8 @@ public class AgentLauncher {
buffer.append(LocalizedStrings.AgentLauncher_SHUTDOWN_PENDING.toLocalizedString());
break;
case SHUTDOWN_PENDING_AFTER_FAILED_STARTUP:
- buffer.append(LocalizedStrings.AgentLauncher_SHUTDOWN_PENDING_AFTER_FAILED_STARTUP.toLocalizedString());
+ buffer.append(LocalizedStrings.AgentLauncher_SHUTDOWN_PENDING_AFTER_FAILED_STARTUP
+ .toLocalizedString());
break;
default:
buffer.append(LocalizedStrings.AgentLauncher_UNKNOWN.toLocalizedString());
@@ -872,12 +902,12 @@ public class AgentLauncher {
if (exception != null) {
if (msg != null) {
buffer.append("\n").append(msg).append(" - ");
- }
- else {
+ } else {
buffer.append("\n " + LocalizedStrings.AgentLauncher_EXCEPTION_IN_0_1
- .toLocalizedString(this.baseName, exception.getMessage()) + " - ");
+ .toLocalizedString(this.baseName, exception.getMessage()) + " - ");
}
- buffer.append(LocalizedStrings.AgentLauncher_SEE_LOG_FILE_FOR_DETAILS.toLocalizedString());
+ buffer
+ .append(LocalizedStrings.AgentLauncher_SEE_LOG_FILE_FOR_DETAILS.toLocalizedString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
index e08f3a5..5e6202d 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/CacheServerJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -51,19 +49,17 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
/**
- * MBean representation of a {@link
- * org.apache.geode.admin.CacheVm}.
+ * MBean representation of a {@link org.apache.geode.admin.CacheVm}.
*
* @since GemFire 4.0
*/
public class CacheServerJmxImpl extends CacheServerImpl
- implements ManagedResource, CacheVmConfig, CacheServerConfig, SystemMemberJmx {
+ implements ManagedResource, CacheVmConfig, CacheServerConfig, SystemMemberJmx {
private static final Logger logger = LogService.getLogger();
-
- /**
- * Interval in seconds between refreshes. Value less than one results in no
- * refreshing
+
+ /**
+ * Interval in seconds between refreshes. Value less than one results in no refreshing
*/
private int refreshInterval = 0;
@@ -78,73 +74,66 @@ public class CacheServerJmxImpl extends CacheServerImpl
/** Reference to the cache MBean representing a Cache in the Cache VM Member */
private SystemMemberCacheJmxImpl managedSystemMemberCache;
-
+
/** collection to collect all the resources created for this member */
- private Map<StatResource, StatisticResourceJmxImpl> managedStatisticsResourcesMap = new HashMap<StatResource, StatisticResourceJmxImpl>();
+ private Map<StatResource, StatisticResourceJmxImpl> managedStatisticsResourcesMap =
+ new HashMap<StatResource, StatisticResourceJmxImpl>();
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
- * Creates a new <code>CacheServerJmxImpl</code> for an existing
- * cache server.
+ * Creates a new <code>CacheServerJmxImpl</code> for an existing cache server.
*/
- CacheServerJmxImpl(AdminDistributedSystemJmxImpl system,
- GemFireVM vm)
- throws AdminException {
+ CacheServerJmxImpl(AdminDistributedSystemJmxImpl system, GemFireVM vm) throws AdminException {
super(system, vm);
initializeMBean();
}
/**
- * Creates a new <code>CacheServerJmxImpl</code> for an
- * newly-created cache server.
+ * Creates a new <code>CacheServerJmxImpl</code> for an newly-created cache server.
*/
- CacheServerJmxImpl(AdminDistributedSystemJmxImpl system,
- CacheVmConfig config)
- throws AdminException {
+ CacheServerJmxImpl(AdminDistributedSystemJmxImpl system, CacheVmConfig config)
+ throws AdminException {
super(system, config);
initializeMBean();
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
- /**
+ /**
* Creates and registers the MBean to manage this resource
*/
- private void initializeMBean()
- throws AdminException {
- //initialize Managed Resources for stats & cache first.
-// initializeManagedResources();
-
- this.mbeanName = new StringBuffer("GemFire.CacheVm:")
- .append("id=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(getId()))
- .append(",type=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(getType().getName()))
- .toString();
-
- this.objectName = MBeanUtil.createMBean(this,
- addDynamicAttributes(MBeanUtil.lookupManagedBean(this)));
+ private void initializeMBean() throws AdminException {
+ // initialize Managed Resources for stats & cache first.
+ // initializeManagedResources();
+
+ this.mbeanName = new StringBuffer("GemFire.CacheVm:").append("id=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(getId())).append(",type=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(getType().getName())).toString();
+
+ this.objectName =
+ MBeanUtil.createMBean(this, addDynamicAttributes(MBeanUtil.lookupManagedBean(this)));
// Refresh Interval
- AdminDistributedSystemJmxImpl sysJmx = (AdminDistributedSystemJmxImpl)system;
- if (sysJmx.getRefreshInterval()>0)
+ AdminDistributedSystemJmxImpl sysJmx = (AdminDistributedSystemJmxImpl) system;
+ if (sysJmx.getRefreshInterval() > 0)
this.refreshInterval = sysJmx.getRefreshInterval();
}
public String getMBeanName() {
return this.mbeanName;
}
-
+
public ModelMBean getModelMBean() {
return this.modelMBean;
}
+
public void setModelMBean(ModelMBean modelMBean) {
this.modelMBean = modelMBean;
}
-
+
public ObjectName getObjectName() {
return this.objectName;
}
@@ -152,18 +141,17 @@ public class CacheServerJmxImpl extends CacheServerImpl
public ManagedResourceType getManagedResourceType() {
return ManagedResourceType.CACHE_VM;
}
-
+
/**
- * Un-registers all the statistics & cache managed resource created for this
- * member. After un-registering the resource MBean instances, clears
- * managedStatisticsResourcesMap collection & sets managedSystemMemberCache
- * to null.
+ * Un-registers all the statistics & cache managed resource created for this member. After
+ * un-registering the resource MBean instances, clears managedStatisticsResourcesMap collection &
+ * sets managedSystemMemberCache to null.
*
- * Creates ConfigurationParameterJmxImpl, StatisticResourceJmxImpl and
- * SystemMemberCacheJmxImpl. But cleans up only StatisticResourceJmxImpl and
- * SystemMemberCacheJmxImpl which are of type ManagedResource.
+ * Creates ConfigurationParameterJmxImpl, StatisticResourceJmxImpl and SystemMemberCacheJmxImpl.
+ * But cleans up only StatisticResourceJmxImpl and SystemMemberCacheJmxImpl which are of type
+ * ManagedResource.
*/
- public void cleanupResource() {
+ public void cleanupResource() {
synchronized (this.managedStatisticsResourcesMap) {
ConfigurationParameter[] names = getConfiguration();
if (names != null) {
@@ -173,21 +161,22 @@ public class CacheServerJmxImpl extends CacheServerImpl
}
}
this.parms.clear();
-
- Collection<StatisticResourceJmxImpl> statisticResources = managedStatisticsResourcesMap.values();
-
+
+ Collection<StatisticResourceJmxImpl> statisticResources =
+ managedStatisticsResourcesMap.values();
+
for (StatisticResourceJmxImpl statisticResource : statisticResources) {
MBeanUtil.unregisterMBean(statisticResource);
}
-
+
this.managedStatisticsResourcesMap.clear();
}
-
+
MBeanUtil.unregisterMBean(this.managedSystemMemberCache);
this.managedSystemMemberCache = null;
}
- /////////////////////// Configuration ///////////////////////
+ /////////////////////// Configuration ///////////////////////
@Override
public String getHost() {
@@ -252,9 +241,9 @@ public class CacheServerJmxImpl extends CacheServerImpl
}
// -------------------------------------------------------------------------
- // MBean attribute accessors/mutators
+ // MBean attribute accessors/mutators
// -------------------------------------------------------------------------
-
+
/**
* Gets the interval in seconds between config refreshes
*
@@ -263,14 +252,13 @@ public class CacheServerJmxImpl extends CacheServerImpl
public int getRefreshInterval() {
return this.refreshInterval;
}
-
- /**
- * Sets interval in seconds between cache config refreshes; zero or less turns
- * off auto refreshing. Manual refreshing has no effect on when the next
- * scheduled refresh will occur.
+
+ /**
+ * Sets interval in seconds between cache config refreshes; zero or less turns off auto
+ * refreshing. Manual refreshing has no effect on when the next scheduled refresh will occur.
*
- * @param refreshInterval the new refresh interval in seconds
- */
+ * @param refreshInterval the new refresh interval in seconds
+ */
public void _setRefreshInterval(int refreshInterval) {
boolean isRegistered = MBeanUtil.isRefreshNotificationRegistered(this,
RefreshNotificationType.SYSTEM_MEMBER_CONFIG);
@@ -282,31 +270,29 @@ public class CacheServerJmxImpl extends CacheServerImpl
}
/**
- * RefreshInterval is now set only through the AdminDistributedSystem property
- * refreshInterval. Attempt to set refreshInterval on CacheServerJmx MBean
- * would result in an OperationNotSupportedException Auto-refresh is enabled
- * on demand when a call to refreshConfig is made
+ * RefreshInterval is now set only through the AdminDistributedSystem property refreshInterval.
+ * Attempt to set refreshInterval on CacheServerJmx MBean would result in an
+ * OperationNotSupportedException Auto-refresh is enabled on demand when a call to refreshConfig
+ * is made
*
- * @param refreshInterval
- * the new refresh interval in seconds
+ * @param refreshInterval the new refresh interval in seconds
* @deprecated since 6.0 use DistributedSystemConfig.refreshInterval instead
*/
@Deprecated
- public void setRefreshInterval(int refreshInterval)
- throws OperationNotSupportedException {
+ public void setRefreshInterval(int refreshInterval) throws OperationNotSupportedException {
throw new OperationNotSupportedException(
- LocalizedStrings.MANAGED_RESOURCE_REFRESH_INTERVAL_CANT_BE_SET_DIRECTLY.toLocalizedString());
- }
-
+ LocalizedStrings.MANAGED_RESOURCE_REFRESH_INTERVAL_CANT_BE_SET_DIRECTLY
+ .toLocalizedString());
+ }
+
// -------------------------------------------------------------------------
- // MBean Operations
+ // MBean Operations
// -------------------------------------------------------------------------
- public void refreshConfig()
- throws org.apache.geode.admin.AdminException {
- // 1st call to refreshConfig would trigger
+ public void refreshConfig() throws org.apache.geode.admin.AdminException {
+ // 1st call to refreshConfig would trigger
// the auto-refresh if an interval is set
- if (this.refreshInterval>0) {
+ if (this.refreshInterval > 0) {
this._setRefreshInterval(this.refreshInterval);
}
@@ -316,82 +302,78 @@ public class CacheServerJmxImpl extends CacheServerImpl
/**
* Initializes Cache & Statistics managed resources.
*
- * @throws AdminException
- * if initialization of managed resources fails
+ * @throws AdminException if initialization of managed resources fails
*/
-// private void initializeManagedResources() throws AdminException {
-// try {
-// manageCache();
-// } catch (MalformedObjectNameException e) {
-// throw new AdminException(LocalizedStrings.SystemMemberJmxImpl_EXCEPTION_OCCURRED_WHILE_INITIALIZING_0_MBEANS_FOR_1.toLocalizedString(
-// new Object[] {"Cache", getId()}),
-// e);
-// } catch (AdminException ae) {
-// if (LocalizedStrings.SystemMemberJmx_THIS_SYSTEM_MEMBER_DOES_NOT_HAVE_A_CACHE.toLocalizedString().equals(ae.getMessage())) {
-// //ignore this exception for a cache-less peer
-// } else {
-// throw ae;
-// }
-// }
-// try {
-// manageStats();
-// } catch (MalformedObjectNameException e) {
-// throw new AdminException(LocalizedStrings.SystemMemberJmxImpl_EXCEPTION_OCCURRED_WHILE_INITIALIZING_0_MBEANS_FOR_1.toLocalizedString(
-// new Object[] {"Statistics", getId()}),
-// e);
-// }
-// }
-
- /**
+ // private void initializeManagedResources() throws AdminException {
+ // try {
+ // manageCache();
+ // } catch (MalformedObjectNameException e) {
+ // throw new
+ // AdminException(LocalizedStrings.SystemMemberJmxImpl_EXCEPTION_OCCURRED_WHILE_INITIALIZING_0_MBEANS_FOR_1.toLocalizedString(
+ // new Object[] {"Cache", getId()}),
+ // e);
+ // } catch (AdminException ae) {
+ // if
+ // (LocalizedStrings.SystemMemberJmx_THIS_SYSTEM_MEMBER_DOES_NOT_HAVE_A_CACHE.toLocalizedString().equals(ae.getMessage()))
+ // {
+ // //ignore this exception for a cache-less peer
+ // } else {
+ // throw ae;
+ // }
+ // }
+ // try {
+ // manageStats();
+ // } catch (MalformedObjectNameException e) {
+ // throw new
+ // AdminException(LocalizedStrings.SystemMemberJmxImpl_EXCEPTION_OCCURRED_WHILE_INITIALIZING_0_MBEANS_FOR_1.toLocalizedString(
+ // new Object[] {"Statistics", getId()}),
+ // e);
+ // }
+ // }
+
+ /**
* Gets this member's cache.
*
* @return array of ObjectName for this member's cache
*/
- public ObjectName manageCache()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName manageCache() throws AdminException, MalformedObjectNameException {
return Helper.manageCache(this);
}
- /**
+ /**
* Gets all active StatisticResources for this manager.
*
* @return array of ObjectName instances
*/
- public ObjectName[] manageStats()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName[] manageStats() throws AdminException, MalformedObjectNameException {
return Helper.manageStats(this);
}
- /**
- * Gets the active StatisticResources for this manager, based on the
- * typeName as the key
+ /**
+ * Gets the active StatisticResources for this manager, based on the typeName as the key
*
* @return ObjectName of StatisticResourceJMX instance
*/
- public ObjectName[] manageStat(String statisticsTypeName)
- throws AdminException, MalformedObjectNameException {
-
+ public ObjectName[] manageStat(String statisticsTypeName)
+ throws AdminException, MalformedObjectNameException {
+
return Helper.manageStat(this, statisticsTypeName);
}
// -------------------------------------------------------------------------
- // JMX Notification listener
+ // JMX Notification listener
// -------------------------------------------------------------------------
/**
- * Handles notification to refresh. Reacts by refreshing the values of this
- * GemFireManager's ConfigurationParamaters. Any other notification is
- * ignored. Given notification is handled only if there is any JMX client
- * connected to the system.
+ * Handles notification to refresh. Reacts by refreshing the values of this GemFireManager's
+ * ConfigurationParamaters. Any other notification is ignored. Given notification is handled only
+ * if there is any JMX client connected to the system.
*
- * @param notification
- * the JMX notification being received
- * @param hb
- * handback object is unused
+ * @param notification the JMX notification being received
+ * @param hb handback object is unused
*/
public void handleNotification(Notification notification, Object hb) {
- AdminDistributedSystemJmxImpl systemJmx =
- (AdminDistributedSystemJmxImpl) this.system;
+ AdminDistributedSystemJmxImpl systemJmx = (AdminDistributedSystemJmxImpl) this.system;
if (!systemJmx.isRmiClientCountZero()) {
Helper.handleNotification(this, notification, hb);
@@ -399,51 +381,44 @@ public class CacheServerJmxImpl extends CacheServerImpl
}
// -------------------------------------------------------------------------
- // Template methods overriden from superclass...
+ // Template methods overriden from superclass...
// -------------------------------------------------------------------------
-
+
/**
- * Template method for creating instance of ConfigurationParameter.
- * Overridden to return ConfigurationParameterJmxImpl.
+ * Template method for creating instance of ConfigurationParameter. Overridden to return
+ * ConfigurationParameterJmxImpl.
*/
@Override
- protected ConfigurationParameter createConfigurationParameter(String name,
- String description,
- Object value,
- Class type,
- boolean userModifiable) {
- return new ConfigurationParameterJmxImpl(
- name, description, value, type, userModifiable);
+ protected ConfigurationParameter createConfigurationParameter(String name, String description,
+ Object value, Class type, boolean userModifiable) {
+ return new ConfigurationParameterJmxImpl(name, description, value, type, userModifiable);
}
-
+
/**
- * Override createStatisticResource by instantiating StatisticResourceJmxImpl
- * if it was not created earlier otherwise returns the same instance.
+ * Override createStatisticResource by instantiating StatisticResourceJmxImpl if it was not
+ * created earlier otherwise returns the same instance.
*
- * @param stat
- * StatResource reference for which this JMX resource is to be created
+ * @param stat StatResource reference for which this JMX resource is to be created
* @return StatisticResourceJmxImpl - JMX Implementation of StatisticResource
- * @throws AdminException
- * if constructing StatisticResourceJmxImpl instance fails
+ * @throws AdminException if constructing StatisticResourceJmxImpl instance fails
*/
@Override
protected StatisticResource createStatisticResource(StatResource stat)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
StatisticResourceJmxImpl managedStatisticResource = null;
-
+
synchronized (this.managedStatisticsResourcesMap) {
- /*
- * Ensuring that a single instance of Statistic Resource is created per
- * StatResource.
+ /*
+ * Ensuring that a single instance of Statistic Resource is created per StatResource.
*/
StatisticResourceJmxImpl statisticResourceJmxImpl = managedStatisticsResourcesMap.get(stat);
if (statisticResourceJmxImpl != null) {
managedStatisticResource = statisticResourceJmxImpl;
} else {
managedStatisticResource = new StatisticResourceJmxImpl(stat, this);
- managedStatisticResource.getStatistics();//inits timer
+ managedStatisticResource.getStatistics();// inits timer
managedStatisticsResourcesMap.put(stat, managedStatisticResource);
}
}
@@ -451,88 +426,81 @@ public class CacheServerJmxImpl extends CacheServerImpl
}
/**
- * Override createSystemMemberCache by instantiating SystemMemberCacheJmxImpl
- * if it was not created earlier.
+ * Override createSystemMemberCache by instantiating SystemMemberCacheJmxImpl if it was not
+ * created earlier.
*
- * @param vm
- * GemFireVM reference for which this JMX resource is to be created
+ * @param vm GemFireVM reference for which this JMX resource is to be created
* @return SystemMemberCacheJmxImpl - JMX Implementation of SystemMemberCache
- * @throws AdminException
- * if constructing SystemMemberCacheJmxImpl instance fails
+ * @throws AdminException if constructing SystemMemberCacheJmxImpl instance fails
*/
@Override
protected SystemMemberCache createSystemMemberCache(GemFireVM vm)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
if (managedSystemMemberCache == null) {
managedSystemMemberCache = new SystemMemberCacheJmxImpl(vm);
}
return managedSystemMemberCache;
}
-
+
// -------------------------------------------------------------------------
- // Create MBean attributes for each ConfigurationParameter
+ // Create MBean attributes for each ConfigurationParameter
// -------------------------------------------------------------------------
-
+
/**
* Add MBean attribute definitions for each ConfigurationParameter.
*
* @param managed the mbean definition to add attributes to
- * @return a new instance of ManagedBean copied from <code>managed</code> but
- * with the new attributes added
+ * @return a new instance of ManagedBean copied from <code>managed</code> but with the new
+ * attributes added
*/
- public ManagedBean addDynamicAttributes(ManagedBean managed)
- throws org.apache.geode.admin.AdminException {
+ public ManagedBean addDynamicAttributes(ManagedBean managed)
+ throws org.apache.geode.admin.AdminException {
return Helper.addDynamicAttributes(this, managed);
}
/**
- * Cleans up Managed Resources created for the client that was connected to
- * the server represented by this class.
+ * Cleans up Managed Resources created for the client that was connected to the server represented
+ * by this class.
*
- * @param clientId
- * id of the client to be removed
- * @return List of ManagedResources associated with the client of given client
- * id
+ * @param clientId id of the client to be removed
+ * @return List of ManagedResources associated with the client of given client id
*/
/*
- * This clean up is for the clients. The clients are started with a loner DM.
- * Hence the clientId is not supposed to contain '/' as per
- * InternalDistributedMember.toString().
+ * This clean up is for the clients. The clients are started with a loner DM. Hence the clientId
+ * is not supposed to contain '/' as per InternalDistributedMember.toString().
*/
public List<ManagedResource> cleanupBridgeClientResources(String clientId) {
List<ManagedResource> returnedResources = new ArrayList<ManagedResource>();
- String compatibleId = "id_"+MBeanUtil.makeCompliantMBeanNameProperty(clientId);
+ String compatibleId = "id_" + MBeanUtil.makeCompliantMBeanNameProperty(clientId);
synchronized (this.managedStatisticsResourcesMap) {
- Set<Entry<StatResource, StatisticResourceJmxImpl>> entrySet = this.managedStatisticsResourcesMap.entrySet();
-
- for (Iterator<Entry<StatResource, StatisticResourceJmxImpl>> it = entrySet.iterator(); it.hasNext();) {
+ Set<Entry<StatResource, StatisticResourceJmxImpl>> entrySet =
+ this.managedStatisticsResourcesMap.entrySet();
+
+ for (Iterator<Entry<StatResource, StatisticResourceJmxImpl>> it = entrySet.iterator(); it
+ .hasNext();) {
Entry<StatResource, StatisticResourceJmxImpl> entry = it.next();
StatisticResourceJmxImpl resource = entry.getValue();
if (resource.getMBeanName().contains(compatibleId)) {
- it.remove(); //remove matching entry
+ it.remove(); // remove matching entry
returnedResources.add(resource);
}
}
}
return returnedResources;
}
-
+
/**
* Implementation handles client membership changes.
*
- * @param clientId
- * id of the client for whom membership change happened
- * @param eventType
- * membership change type; one of
- * {@link ClientMembershipMessage#JOINED},
- * {@link ClientMembershipMessage#LEFT},
- * {@link ClientMembershipMessage#CRASHED}
+ * @param clientId id of the client for whom membership change happened
+ * @param eventType membership change type; one of {@link ClientMembershipMessage#JOINED},
+ * {@link ClientMembershipMessage#LEFT}, {@link ClientMembershipMessage#CRASHED}
*/
public void handleClientMembership(String clientId, int eventType) {
- String notifType = null;
+ String notifType = null;
List<ManagedResource> cleanedUp = null;
-
+
if (eventType == ClientMembershipMessage.LEFT) {
notifType = NOTIF_CLIENT_LEFT;
cleanedUp = cleanupBridgeClientResources(clientId);
@@ -542,98 +510,79 @@ public class CacheServerJmxImpl extends CacheServerImpl
} else if (eventType == ClientMembershipMessage.JOINED) {
notifType = NOTIF_CLIENT_JOINED;
}
-
+
if (cleanedUp != null) {
for (ManagedResource resource : cleanedUp) {
MBeanUtil.unregisterMBean(resource);
}
}
- Helper.sendNotification(this,
- new Notification(notifType, this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- clientId));
+ Helper.sendNotification(this, new Notification(notifType, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), clientId));
}
-
+
/**
- * Implementation handles creation of cache by extracting the details from the
- * given event object and sending the
- * {@link SystemMemberJmx#NOTIF_CACHE_CREATED} notification to the connected
- * JMX Clients.
+ * Implementation handles creation of cache by extracting the details from the given event object
+ * and sending the {@link SystemMemberJmx#NOTIF_CACHE_CREATED} notification to the connected JMX
+ * Clients.
*
- * @param event
- * event object corresponding to the creation of the cache
+ * @param event event object corresponding to the creation of the cache
*/
public void handleCacheCreate(SystemMemberCacheEvent event) {
- Helper.sendNotification(this,
- new Notification(NOTIF_CACHE_CREATED, this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- Helper.getCacheEventDetails(event)));
- }
+ Helper.sendNotification(this, new Notification(NOTIF_CACHE_CREATED, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), Helper.getCacheEventDetails(event)));
+ }
/**
- * Implementation handles closure of cache by extracting the details from the
- * given event object and sending the
- * {@link SystemMemberJmx#NOTIF_CACHE_CLOSED} notification to the connected
- * JMX Clients.
+ * Implementation handles closure of cache by extracting the details from the given event object
+ * and sending the {@link SystemMemberJmx#NOTIF_CACHE_CLOSED} notification to the connected JMX
+ * Clients.
*
- * @param event
- * event object corresponding to the closure of the cache
+ * @param event event object corresponding to the closure of the cache
*/
public void handleCacheClose(SystemMemberCacheEvent event) {
- Helper.sendNotification(this,
- new Notification(NOTIF_CACHE_CLOSED, this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- Helper.getCacheEventDetails(event)));
+ Helper.sendNotification(this, new Notification(NOTIF_CACHE_CLOSED, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), Helper.getCacheEventDetails(event)));
}
/**
- * Implementation handles creation of region by extracting the details from
- * the given event object and sending the
- * {@link SystemMemberJmx#NOTIF_REGION_CREATED} notification to the connected
- * JMX Clients. Region Path is set as User Data in Notification.
+ * Implementation handles creation of region by extracting the details from the given event object
+ * and sending the {@link SystemMemberJmx#NOTIF_REGION_CREATED} notification to the connected JMX
+ * Clients. Region Path is set as User Data in Notification.
*
- * @param event
- * event object corresponding to the creation of a region
+ * @param event event object corresponding to the creation of a region
*/
public void handleRegionCreate(SystemMemberRegionEvent event) {
- Notification notification = new Notification(NOTIF_REGION_CREATED,
- this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- Helper.getRegionEventDetails(event));
-
+ Notification notification = new Notification(NOTIF_REGION_CREATED, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), Helper.getRegionEventDetails(event));
+
notification.setUserData(event.getRegionPath());
Helper.sendNotification(this, notification);
}
/**
- * Implementation should handle loss of region by extracting the details from
- * the given event object and sending the
- * {@link SystemMemberJmx#NOTIF_REGION_LOST} notification to the connected
- * JMX Clients. Region Path is set as User Data in Notification. Additionally,
- * it also clears the ManagedResources created for the region that is lost.
+ * Implementation should handle loss of region by extracting the details from the given event
+ * object and sending the {@link SystemMemberJmx#NOTIF_REGION_LOST} notification to the connected
+ * JMX Clients. Region Path is set as User Data in Notification. Additionally, it also clears the
+ * ManagedResources created for the region that is lost.
*
- * @param event
- * event object corresponding to the loss of a region
+ * @param event event object corresponding to the loss of a region
*/
public void handleRegionLoss(SystemMemberRegionEvent event) {
SystemMemberCacheJmxImpl cacheResource = this.managedSystemMemberCache;
-
+
if (cacheResource != null) {
- ManagedResource cleanedUp =
- cacheResource.cleanupRegionResources(event.getRegionPath());
-
+ ManagedResource cleanedUp = cacheResource.cleanupRegionResources(event.getRegionPath());
+
if (cleanedUp != null) {
MBeanUtil.unregisterMBean(cleanedUp);
}
}
- Notification notification = new Notification(NOTIF_REGION_LOST,
- this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- Helper.getRegionEventDetails(event));
-
+ Notification notification = new Notification(NOTIF_REGION_LOST, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), Helper.getRegionEventDetails(event));
+
notification.setUserData(event.getRegionPath());
Helper.sendNotification(this, notification);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
index 9f7f940..3273ccc 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigAttributeInfo.java
@@ -1,75 +1,65 @@
/*
- * 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
+ * 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.admin.jmx.internal;
-//import org.apache.geode.admin.ConfigurationParameter;
+// import org.apache.geode.admin.ConfigurationParameter;
import org.apache.geode.internal.Assert;
import javax.management.Descriptor;
import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.ModelMBeanAttributeInfo;
-/**
- * Subclass of AttributeInfo with {@link
- * org.apache.geode.admin.ConfigurationParameter} added for use as the
- * {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's
+/**
+ * Subclass of AttributeInfo with {@link org.apache.geode.admin.ConfigurationParameter} added for
+ * use as the {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's
* <i>targetObject</i> value.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
class ConfigAttributeInfo extends org.apache.commons.modeler.AttributeInfo {
private static final long serialVersionUID = -1918437700841687078L;
-
+
private final ConfigurationParameterJmxImpl config;
-
+
public ConfigAttributeInfo(ConfigurationParameterJmxImpl config) {
super();
this.config = config;
}
-
+
public ConfigurationParameterJmxImpl getConfig() {
return this.config;
}
@Override
public ModelMBeanAttributeInfo createAttributeInfo() {
- Descriptor desc = new DescriptorSupport(
- new String[] {
- "name=" + this.displayName,
- "descriptorType=attribute",
- "currencyTimeLimit=-1", // always stale
- "displayName=" + this.displayName,
- "getMethod=getJmxValue",
- "setMethod=setJmxValue"
- });
-
+ Descriptor desc = new DescriptorSupport(new String[] {"name=" + this.displayName,
+ "descriptorType=attribute", "currencyTimeLimit=-1", // always stale
+ "displayName=" + this.displayName, "getMethod=getJmxValue", "setMethod=setJmxValue"});
+
Assert.assertTrue(this.config != null, "Config target object is null!");
desc.setField("targetObject", this.config);
- ModelMBeanAttributeInfo info = new ModelMBeanAttributeInfo(
- this.displayName, // name
- this.type, // type
+ ModelMBeanAttributeInfo info = new ModelMBeanAttributeInfo(this.displayName, // name
+ this.type, // type
this.description, // description
- this.readable, // isReadable
- this.writeable, // isWritable
- this.is, // isIs
+ this.readable, // isReadable
+ this.writeable, // isWritable
+ this.is, // isIs
desc);
-
+
return info;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
index a318eb5..f9add13 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -29,49 +27,46 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Provides MBean support for managing accessing a ConfigurationParameter.
* <p>
- * Implements java.io.Serializable because several MBeans have attributes of
- * type ConfigurationParameter. This means that calls to getMBeanInfo which
- * may be serialized for remote clients will be broken unless those attributes
- * support serialization.
+ * Implements java.io.Serializable because several MBeans have attributes of type
+ * ConfigurationParameter. This means that calls to getMBeanInfo which may be serialized for remote
+ * clients will be broken unless those attributes support serialization.
* <p>
- * TODO: refactor to implement ConfigurationParameter and delegate to
- * ConfigurationParameterImpl. Wrap all delegate calls w/ e.printStackTrace()
- * since the HttpAdaptor devours them
+ * TODO: refactor to implement ConfigurationParameter and delegate to ConfigurationParameterImpl.
+ * Wrap all delegate calls w/ e.printStackTrace() since the HttpAdaptor devours them
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
public class ConfigurationParameterJmxImpl
-extends org.apache.geode.admin.internal.ConfigurationParameterImpl
-implements Serializable {
+ extends org.apache.geode.admin.internal.ConfigurationParameterImpl implements Serializable {
private static final long serialVersionUID = -7822171853906772375L;
private boolean deserialized = false;
-
+
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
-
- protected ConfigurationParameterJmxImpl(String name,
- String description,
- Object value,
- Class type,
- boolean userModifiable) {
+
+ protected ConfigurationParameterJmxImpl(String name, String description, Object value, Class type,
+ boolean userModifiable) {
super(name, description, value, type, userModifiable);
}
-
- protected ConfigurationParameterJmxImpl(String name,
- Object value) {
+
+ protected ConfigurationParameterJmxImpl(String name, Object value) {
super(name, value);
}
-
+
/** Constructor to allow serialization */
- protected ConfigurationParameterJmxImpl() { super(); }
-
+ protected ConfigurationParameterJmxImpl() {
+ super();
+ }
+
@Override
public void setValue(Object value) throws UnmodifiableConfigurationException {
if (deserialized) {
- throw new UnsupportedOperationException(LocalizedStrings.ConfigurationParameterJmxImpl_REMOTE_MUTATION_OF_CONFIGURATIONPARAMETER_IS_CURRENTLY_UNSUPPORTED.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.ConfigurationParameterJmxImpl_REMOTE_MUTATION_OF_CONFIGURATIONPARAMETER_IS_CURRENTLY_UNSUPPORTED
+ .toLocalizedString());
}
try {
super.setValue(value);
@@ -83,12 +78,12 @@ implements Serializable {
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -97,73 +92,72 @@ implements Serializable {
throw e;
}
}
-
+
// -------------------------------------------------------------------------
- // HACK
+ // HACK
// -------------------------------------------------------------------------
public void setJmxValue(Integer value) throws UnmodifiableConfigurationException {
setValue(value);
}
+
public void setJmxValue(String value) throws UnmodifiableConfigurationException {
setValue(value);
}
+
public void setJmxValue(java.io.File value) throws UnmodifiableConfigurationException {
setValue(value);
}
+
public void setJmxValue(Boolean value) throws UnmodifiableConfigurationException {
setValue(value);
}
-
+
public Class getJmxValueType() {
if (isInetAddress() || isFile() || isOctal()) {
return java.lang.String.class;
}
return getValueType();
}
-
+
public Object getJmxValue() {
if (isInetAddress() || isFile() || isOctal()) {
return getValueAsString();
}
return getValue();
}
-
- /**
- * Override writeObject which is used in serialization. This class is
- * serialized when JMX client acquires MBeanInfo for ConfigurationParameter
- * MBean. Super class is not serializable.
+
+ /**
+ * Override writeObject which is used in serialization. This class is serialized when JMX client
+ * acquires MBeanInfo for ConfigurationParameter MBean. Super class is not serializable.
*/
- private void writeObject(java.io.ObjectOutputStream out)
- throws IOException {
+ private void writeObject(java.io.ObjectOutputStream out) throws IOException {
out.writeObject(this.name);
out.writeObject(this.description);
out.writeObject(this.value);
out.writeObject(this.type);
out.writeBoolean(this.userModifiable);
}
-
- /**
- * Override readObject which is used in serialization. Customize
- * serialization of this exception to avoid escape of InternalRole
- * which is not Serializable.
+
+ /**
+ * Override readObject which is used in serialization. Customize serialization of this exception
+ * to avoid escape of InternalRole which is not Serializable.
*/
- private void readObject(java.io.ObjectInputStream in)
- throws IOException, ClassNotFoundException {
+ private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {
String inName = (String) in.readObject();
String inDescription = (String) in.readObject();
Object inValue = in.readObject();
Class inClass = (Class) in.readObject();
boolean inUserModifiable = in.readBoolean();
-
+
Assert.assertTrue(inName != null);
Assert.assertTrue(inDescription != null);
Assert.assertTrue(inValue != null);
Assert.assertTrue(inClass != null);
-
+
this.deserialized = true;
this.name = inName;
setInternalState(inDescription, inValue, inClass, inUserModifiable);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
index 18c3fd5..54d3072 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributedSystemHealthConfigJmxImpl.java
@@ -1,42 +1,38 @@
/*
- * 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
+ * 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.admin.jmx.internal;
import org.apache.geode.admin.*;
import org.apache.geode.admin.internal.*;
-//import org.apache.geode.internal.admin.*;
+// import org.apache.geode.internal.admin.*;
import javax.management.*;
import javax.management.modelmbean.*;
-//import org.apache.commons.modeler.ManagedBean;
+// import org.apache.commons.modeler.ManagedBean;
/**
- * The JMX "managed resource" that represents the configuration for
- * the health of a distributed system. Basically, it provides the
- * behavior of <code>DistributedSystemHealthConfigImpl</code>, but
- * does some JMX stuff like registering beans with the agent.
+ * The JMX "managed resource" that represents the configuration for the health of a distributed
+ * system. Basically, it provides the behavior of <code>DistributedSystemHealthConfigImpl</code>,
+ * but does some JMX stuff like registering beans with the agent.
*
* @see GemFireHealthJmxImpl#createDistributedSystemHealthConfig
*
*
* @since GemFire 3.5
*/
-public class DistributedSystemHealthConfigJmxImpl
- extends DistributedSystemHealthConfigImpl
- implements ManagedResource {
+public class DistributedSystemHealthConfigJmxImpl extends DistributedSystemHealthConfigImpl
+ implements ManagedResource {
/** The <code>GemFireHealth</code> that we help configure */
private GemFireHealth health;
@@ -50,31 +46,27 @@ public class DistributedSystemHealthConfigJmxImpl
/** The JMX object name of the MBean for this managed resource */
private final ObjectName objectName;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>DistributedSystemHealthCOnfigJmxImpl</code>
- * that configures the health of the distributed system monitored by
- * <code>health</code>.
+ * Creates a new <code>DistributedSystemHealthCOnfigJmxImpl</code> that configures the health of
+ * the distributed system monitored by <code>health</code>.
*/
- DistributedSystemHealthConfigJmxImpl(GemFireHealthJmxImpl health)
- throws AdminException {
+ DistributedSystemHealthConfigJmxImpl(GemFireHealthJmxImpl health) throws AdminException {
super();
this.health = health;
- this.mbeanName = new StringBuffer()
- .append(MBEAN_NAME_PREFIX)
- .append("DistributedSystemHealthConfig,id=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(health.getDistributedSystem().getId()))
- .toString();
+ this.mbeanName =
+ new StringBuffer().append(MBEAN_NAME_PREFIX).append("DistributedSystemHealthConfig,id=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(health.getDistributedSystem().getId()))
+ .toString();
this.objectName = MBeanUtil.createMBean(this);
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Applies the changes made to this config back to the health
- * monitor.
+ * Applies the changes made to this config back to the health monitor.
*
* @see GemFireHealth#setDistributedSystemHealthConfig
*/
@@ -85,7 +77,7 @@ public class DistributedSystemHealthConfigJmxImpl
public String getMBeanName() {
return this.mbeanName;
}
-
+
public ModelMBean getModelMBean() {
return this.modelMBean;
}
[65/98] [abbrv] incubator-geode git commit: GEODE-502: Increased the
startup timeout for DUnit tests
Posted by ds...@apache.org.
GEODE-502: Increased the startup timeout for DUnit tests
* In DUnitLauncher increased the startup timeout
* This is done to accomodate the extra time needed if GC kicks in.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a78d491d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a78d491d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a78d491d
Branch: refs/heads/feature/GEM-983
Commit: a78d491d60a40628a4ad99463a3482e830ca971f
Parents: 7742981
Author: nabarun <nn...@pivotal.io>
Authored: Wed Oct 19 10:41:35 2016 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Mon Oct 24 15:33:14 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a78d491d/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
index 3451695..5a80a64 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
@@ -72,7 +72,7 @@ public class DUnitLauncher {
private static final int DEBUGGING_VM_NUM = -1;
private static final int LOCATOR_VM_NUM = -2;
- static final long STARTUP_TIMEOUT = 30 * 1000;
+ static final long STARTUP_TIMEOUT = 120 * 1000;
private static final String SUSPECT_FILENAME = "dunit_suspect.log";
private static File DUNIT_SUSPECT_FILE;
[06/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
index d3aaf9c..51301bc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesMutator.java
@@ -1,32 +1,28 @@
/*
- * 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
+ * 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;
/**
- * Supports modification of certain region attributes after the region has been
- * created. It is recommended that the attributes be completely initialized
- * using an {@link AttributesFactory} before creating the region instead of
- * using an <code>AttributesMutator</code> after region creation. This will
- * avoid a potential performance penalty due to the additional
- * network traffic.
- *<p>
- * The setter methods all return the previous value of the attribute.
+ * Supports modification of certain region attributes after the region has been created. It is
+ * recommended that the attributes be completely initialized using an {@link AttributesFactory}
+ * before creating the region instead of using an <code>AttributesMutator</code> after region
+ * creation. This will avoid a potential performance penalty due to the additional network traffic.
+ * <p>
+ * The setter methods all return the previous value of the attribute.
*
*
*
@@ -35,176 +31,195 @@ package org.apache.geode.cache;
* @see AttributesFactory
* @since GemFire 3.0
*/
-public interface AttributesMutator<K,V> {
-
- /** Returns the Region whose attributes this mutator affects.
+public interface AttributesMutator<K, V> {
+
+ /**
+ * Returns the Region whose attributes this mutator affects.
+ *
* @return the Region this mutator affects
*/
- public Region<K,V> getRegion();
-
- /** Changes the timeToLive expiration attributes for the region as a whole
+ public Region<K, V> getRegion();
+
+ /**
+ * Changes the timeToLive expiration attributes for the region as a whole
*
* @param timeToLive the expiration attributes for the region timeToLive
* @return the previous value of region timeToLive
- * @throws IllegalArgumentException if timeToLive is null or if the
- * ExpirationAction is LOCAL_INVALIDATE and the region is
- * {@link DataPolicy#withReplication replicated}
+ * @throws IllegalArgumentException if timeToLive is null or if the ExpirationAction is
+ * LOCAL_INVALIDATE and the region is {@link DataPolicy#withReplication replicated}
* @throws IllegalStateException if statistics are disabled for this region.
*/
public ExpirationAttributes setRegionTimeToLive(ExpirationAttributes timeToLive);
-
- /** Changes the idleTimeout expiration attributes for the region as a whole.
- * Resets the {@link CacheStatistics#getLastAccessedTime} for the region.
+
+ /**
+ * Changes the idleTimeout expiration attributes for the region as a whole. Resets the
+ * {@link CacheStatistics#getLastAccessedTime} for the region.
*
* @param idleTimeout the ExpirationAttributes for this region idleTimeout
* @return the previous value of region idleTimeout
- * @throws IllegalArgumentException if idleTimeout is null or if the
- * ExpirationAction is LOCAL_INVALIDATE and the region is
- * {@link DataPolicy#withReplication replicated}
+ * @throws IllegalArgumentException if idleTimeout is null or if the ExpirationAction is
+ * LOCAL_INVALIDATE and the region is {@link DataPolicy#withReplication replicated}
* @throws IllegalStateException if statistics are disabled for this region.
*/
public ExpirationAttributes setRegionIdleTimeout(ExpirationAttributes idleTimeout);
-
- /** Changes the timeToLive expiration attributes for values in this region.
+
+ /**
+ * Changes the timeToLive expiration attributes for values in this region.
*
* @param timeToLive the timeToLive expiration attributes for entries
* @return the previous value of entry timeToLive
- * @throws IllegalArgumentException if timeToLive is null or if the
- * ExpirationAction is LOCAL_DESTROY and the region is {@link DataPolicy#withReplication replicated} or if
- * the ExpirationAction is LOCAL_INVALIDATE and the region is
- * {@link DataPolicy#withReplication replicated}
+ * @throws IllegalArgumentException if timeToLive is null or if the ExpirationAction is
+ * LOCAL_DESTROY and the region is {@link DataPolicy#withReplication replicated} or if the
+ * ExpirationAction is LOCAL_INVALIDATE and the region is
+ * {@link DataPolicy#withReplication replicated}
* @throws IllegalStateException if statistics are disabled for this region.
*/
public ExpirationAttributes setEntryTimeToLive(ExpirationAttributes timeToLive);
-
+
/**
* Changes the custom timeToLive for values in this region
+ *
* @param custom the new CustomExpiry
* @return the old CustomExpiry
*/
- public CustomExpiry<K,V> setCustomEntryTimeToLive(CustomExpiry<K,V> custom);
-
- /** Changes the idleTimeout expiration attributes for values in the region.
+ public CustomExpiry<K, V> setCustomEntryTimeToLive(CustomExpiry<K, V> custom);
+
+ /**
+ * Changes the idleTimeout expiration attributes for values in the region.
*
* @param idleTimeout the idleTimeout expiration attributes for entries
* @return the previous value of entry idleTimeout
- * @throws IllegalArgumentException if idleTimeout is null or if the
- * ExpirationAction is LOCAL_DESTROY and the region is
- * {@link DataPolicy#withReplication replicated}
- * or if the the ExpirationAction is LOCAL_INVALIDATE and the region is
- * {@link DataPolicy#withReplication replicated}
+ * @throws IllegalArgumentException if idleTimeout is null or if the ExpirationAction is
+ * LOCAL_DESTROY and the region is {@link DataPolicy#withReplication replicated} or if the
+ * the ExpirationAction is LOCAL_INVALIDATE and the region is
+ * {@link DataPolicy#withReplication replicated}
* @see AttributesFactory#setStatisticsEnabled
* @throws IllegalStateException if statistics are disabled for this region.
*/
public ExpirationAttributes setEntryIdleTimeout(ExpirationAttributes idleTimeout);
-
- /** Changes the CustomExpiry for idleTimeout for values in the region
+
+ /**
+ * Changes the CustomExpiry for idleTimeout for values in the region
*
* @param custom the new CustomExpiry
* @return the old CustomExpiry
*/
- public CustomExpiry<K,V> setCustomEntryIdleTimeout(CustomExpiry<K,V> custom);
-
- /** Changes the CacheListener for the region.
- * Removes listeners already added and calls {@link CacheCallback#close} on each of them.
+ public CustomExpiry<K, V> setCustomEntryIdleTimeout(CustomExpiry<K, V> custom);
+
+ /**
+ * Changes the CacheListener for the region. Removes listeners already added and calls
+ * {@link CacheCallback#close} on each of them.
+ *
* @param aListener a user defined cache listener
* @return the previous CacheListener if a single one exists; otherwise null.
* @throws IllegalStateException if more than one cache listener has already been added
- * @deprecated as of GemFire 5.0, use {@link #addCacheListener} or {@link #initCacheListeners} instead.
+ * @deprecated as of GemFire 5.0, use {@link #addCacheListener} or {@link #initCacheListeners}
+ * instead.
*/
@Deprecated
- public CacheListener<K,V> setCacheListener(CacheListener<K,V> aListener);
+ public CacheListener<K, V> setCacheListener(CacheListener<K, V> aListener);
+
/**
* Adds a cache listener to the end of the list of cache listeners on this region.
+ *
* @param aListener the user defined cache listener to add to the region.
* @throws IllegalArgumentException if <code>aListener</code> is null
* @since GemFire 5.0
*/
- public void addCacheListener(CacheListener<K,V> aListener);
+ public void addCacheListener(CacheListener<K, V> aListener);
+
/**
- * Removes a cache listener from the list of cache listeners on this region.
- * Does nothing if the specified listener has not been added.
- * If the specified listener has been added then {@link CacheCallback#close} will
- * be called on it; otherwise does nothing.
+ * Removes a cache listener from the list of cache listeners on this region. Does nothing if the
+ * specified listener has not been added. If the specified listener has been added then
+ * {@link CacheCallback#close} will be called on it; otherwise does nothing.
+ *
* @param aListener the cache listener to remove from the region.
* @throws IllegalArgumentException if <code>aListener</code> is null
* @since GemFire 5.0
*/
- public void removeCacheListener(CacheListener<K,V> aListener);
+ public void removeCacheListener(CacheListener<K, V> aListener);
+
/**
- * Removes all cache listeners, calling {@link CacheCallback#close} on each of them, and then adds each listener in the specified array.
+ * Removes all cache listeners, calling {@link CacheCallback#close} on each of them, and then adds
+ * each listener in the specified array.
+ *
* @param newListeners a possibly null or empty array of listeners to add to this region.
* @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
* @since GemFire 5.0
*/
- public void initCacheListeners(CacheListener<K,V>[] newListeners);
-
- /** Changes the cache writer for the region.
+ public void initCacheListeners(CacheListener<K, V>[] newListeners);
+
+ /**
+ * Changes the cache writer for the region.
+ *
* @param cacheWriter the cache writer
* @return the previous CacheWriter
*/
- public CacheWriter<K,V> setCacheWriter(CacheWriter<K,V> cacheWriter);
-
+ public CacheWriter<K, V> setCacheWriter(CacheWriter<K, V> cacheWriter);
+
/**
* Changes the cache loader for the region.
*
- * Changing the cache loader for partitioned regions is not recommended due to
- * the fact that it can result in an inconsistent cache loader configuration.
- * This feature may be removed in future releases.
+ * Changing the cache loader for partitioned regions is not recommended due to the fact that it
+ * can result in an inconsistent cache loader configuration. This feature may be removed in future
+ * releases.
*
- * @param cacheLoader
- * the cache loader
+ * @param cacheLoader the cache loader
* @return the previous CacheLoader
*/
- public CacheLoader<K,V> setCacheLoader(CacheLoader<K,V> cacheLoader);
-
+ public CacheLoader<K, V> setCacheLoader(CacheLoader<K, V> cacheLoader);
+
- /** Allows changing the eviction controller attributes for the region.
+ /**
+ * Allows changing the eviction controller attributes for the region.
*
* @return the {@link EvictionAttributesMutator} used to change the EvictionAttributes
*/
public EvictionAttributesMutator getEvictionAttributesMutator();
/**
- * Sets cloning on region
- * Note: off-heap regions always behave as if cloning is enabled.
+ * Sets cloning on region Note: off-heap regions always behave as if cloning is enabled.
+ *
* @param cloningEnable
* @since GemFire 6.1
*/
public void setCloningEnabled(boolean cloningEnable);
+
/**
* Returns whether or not cloning is enabled on region
*
- * @return True if cloning is enabled (default);
- * false cloning is not enabled.
+ * @return True if cloning is enabled (default); false cloning is not enabled.
*
* @since GemFire 6.1
*/
public boolean getCloningEnabled();
-
+
/**
- * Adds GatewaySenderId to the list of GatewaySenderIds of the region.
- * If the GatewaySenderId is not present on this VM then it will try to send it to other VM's
+ * Adds GatewaySenderId to the list of GatewaySenderIds of the region. If the GatewaySenderId is
+ * not present on this VM then it will try to send it to other VM's
*
* @param gatewaySenderId
*/
- public void addGatewaySenderId(String gatewaySenderId);
-
- /**
- * Removes GatewaySenderId from the list of GatewaySenderIds of the region.
- * @param gatewaySenderId
- */
- public void removeGatewaySenderId(String gatewaySenderId);
-
- /**
- * Adds AsyncEventQueueId to the list of AsyncEventQueueId of the region.
- * @param asyncEventQueueId
- */
- public void addAsyncEventQueueId(String asyncEventQueueId);
-
- /**
- * Removes AsyncEventQueueId from the list of AsyncEventQueuesId of the region.
- * @param asyncEventQueueId
- */
- public void removeAsyncEventQueueId(String asyncEventQueueId);
+ public void addGatewaySenderId(String gatewaySenderId);
+
+ /**
+ * Removes GatewaySenderId from the list of GatewaySenderIds of the region.
+ *
+ * @param gatewaySenderId
+ */
+ public void removeGatewaySenderId(String gatewaySenderId);
+
+ /**
+ * Adds AsyncEventQueueId to the list of AsyncEventQueueId of the region.
+ *
+ * @param asyncEventQueueId
+ */
+ public void addAsyncEventQueueId(String asyncEventQueueId);
+
+ /**
+ * Removes AsyncEventQueueId from the list of AsyncEventQueuesId of the region.
+ *
+ * @param asyncEventQueueId
+ */
+ public void removeAsyncEventQueueId(String asyncEventQueueId);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/Cache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Cache.java b/geode-core/src/main/java/org/apache/geode/cache/Cache.java
index 773654b..bc4aa19 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Cache.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Cache.java
@@ -1,18 +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
+ * 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;
@@ -37,25 +35,23 @@ import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.i18n.LogWriterI18n;
-/**
- * Caches are obtained from the {@link CacheFactory#create()} method.
- * See {@link CacheFactory} for common usage patterns for creating the cache instance.
+/**
+ * Caches are obtained from the {@link CacheFactory#create()} method. See {@link CacheFactory} for
+ * common usage patterns for creating the cache instance.
* <p>
- * When a cache is created a {@link DistributedSystem} is also created.
- * This system tells the cache where to find other caches on the network
- * and how to communicate with them.
- * The system can also specify a
- * <a href="../distribution/DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
- * property which will cause this cache to be initialized with the contents
- * of that file. The contents must comply with the
- * <code>"doc-files/cache8_0.dtd"</code> file
- * and the top level element must be a <code>cache</code> element.
+ * When a cache is created a {@link DistributedSystem} is also created. This system tells the cache
+ * where to find other caches on the network and how to communicate with them. The system can also
+ * specify a <a href="../distribution/DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
+ * property which will cause this cache to be initialized with the contents of that file. The
+ * contents must comply with the <code>"doc-files/cache8_0.dtd"</code> file and the top level
+ * element must be a <code>cache</code> element.
* <p>
- * When a cache will no longer be used it should be {@link #close() closed}.
- * Once it {@link #isClosed is closed} any attempt to use it or any {@link Region}
- * obtained from it will cause a {@link CacheClosedException} to be thrown.
+ * When a cache will no longer be used it should be {@link #close() closed}. Once it
+ * {@link #isClosed is closed} any attempt to use it or any {@link Region} obtained from it will
+ * cause a {@link CacheClosedException} to be thrown.
*
- * <p>A cache can have multiple root regions, each with a different name.
+ * <p>
+ * A cache can have multiple root regions, each with a different name.
*
*
* @since GemFire 2.0
@@ -63,28 +59,27 @@ import org.apache.geode.i18n.LogWriterI18n;
@SuppressWarnings("deprecation")
public interface Cache extends GemFireCache {
/**
- * Terminates this object cache and releases all the resources.
- * Calls {@link Region#close} on each region in the cache.
- * After this cache is closed, any further
- * method call on this cache or any region object will throw
- * {@link CacheClosedException}, unless otherwise noted.
- * @param keepalive whether the server should keep the durable client's queues alive for the timeout period
+ * Terminates this object cache and releases all the resources. Calls {@link Region#close} on each
+ * region in the cache. After this cache is closed, any further method call on this cache or any
+ * region object will throw {@link CacheClosedException}, unless otherwise noted.
+ *
+ * @param keepalive whether the server should keep the durable client's queues alive for the
+ * timeout period
* @throws CacheClosedException if the cache is already closed.
* @deprecated as of 6.5 use {@link ClientCache#close(boolean)} instead.
*/
@Deprecated
- public void close(boolean keepalive);
-
+ public void close(boolean keepalive);
+
/**
- * Creates a VM region using the specified
- * RegionAttributes.
+ * Creates a VM region using the specified RegionAttributes.
*
* @param name the name of the region to create
* @param aRegionAttributes the attributes of the root region
* @return the region object
- * @throws RegionExistsException if a region is already in
- * this cache
- * @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL
+ * @throws RegionExistsException if a region is already in this cache
+ * @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock
+ * for Scope.GLOBAL
* @throws TimeoutException if timed out getting distributed lock for Scope.GLOBAL
* @throws CacheClosedException if the cache is closed
* @throws IllegalStateException If the supplied RegionAttributes violate the
@@ -93,8 +88,8 @@ public interface Cache extends GemFireCache {
* @deprecated as of GemFire 5.0, use {@link #createRegion} instead.
*/
@Deprecated
- public <K,V> Region<K,V> createVMRegion(String name, RegionAttributes<K,V> aRegionAttributes)
- throws RegionExistsException, TimeoutException;
+ public <K, V> Region<K, V> createVMRegion(String name, RegionAttributes<K, V> aRegionAttributes)
+ throws RegionExistsException, TimeoutException;
/**
* Creates a region using the specified RegionAttributes.
@@ -103,7 +98,8 @@ public interface Cache extends GemFireCache {
* @param aRegionAttributes the attributes of the root region
* @return the region object
* @throws RegionExistsException if a region is already in this cache
- * @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock for Scope.GLOBAL
+ * @throws org.apache.geode.distributed.LeaseExpiredException if lease expired on distributed lock
+ * for Scope.GLOBAL
* @throws TimeoutException if timed out getting distributed lock for Scope.GLOBAL
* @throws CacheClosedException if the cache is closed
* @throws IllegalStateException If the supplied RegionAttributes violate the
@@ -113,138 +109,133 @@ public interface Cache extends GemFireCache {
* @deprecated as of 6.5 use {@link #createRegionFactory(RegionAttributes)} instead
*/
@Deprecated
- public <K,V> Region<K,V> createRegion(String name, RegionAttributes<K,V> aRegionAttributes)
- throws RegionExistsException, TimeoutException;
+ public <K, V> Region<K, V> createRegion(String name, RegionAttributes<K, V> aRegionAttributes)
+ throws RegionExistsException, TimeoutException;
/**
- * Creates a {@link RegionFactory} which can be used to specify additional
- * attributes for {@link Region} creation.
+ * Creates a {@link RegionFactory} which can be used to specify additional attributes for
+ * {@link Region} creation.
+ *
* @see #createRegionFactory(RegionShortcut)
* @since GemFire 6.5
*/
- public <K,V> RegionFactory<K,V> createRegionFactory();
-
+ public <K, V> RegionFactory<K, V> createRegionFactory();
+
/**
- * Creates a {@link RegionFactory} for the most commonly used {@link Region} types
- * defined by {@link RegionShortcut}
+ * Creates a {@link RegionFactory} for the most commonly used {@link Region} types defined by
+ * {@link RegionShortcut}
+ *
* @since GemFire 6.5
*/
- public <K,V> RegionFactory<K,V> createRegionFactory(RegionShortcut atts);
-
+ public <K, V> RegionFactory<K, V> createRegionFactory(RegionShortcut atts);
+
/**
- * Creates a {@link RegionFactory} for creating a {@link Region} from
- * {@link RegionAttributes} mapped to this regionAttributesId
+ * Creates a {@link RegionFactory} for creating a {@link Region} from {@link RegionAttributes}
+ * mapped to this regionAttributesId
+ *
* @param regionAttributesId the Id of RegionAttributes to be used
* @see #setRegionAttributes(String, RegionAttributes)
* @since GemFire 6.5
*/
- public <K,V> RegionFactory<K,V> createRegionFactory(String regionAttributesId);
-
+ public <K, V> RegionFactory<K, V> createRegionFactory(String regionAttributesId);
+
/**
- * Creates a {@link RegionFactory} for creating a {@link Region} from
- * the given regionAttributes
+ * Creates a {@link RegionFactory} for creating a {@link Region} from the given regionAttributes
+ *
* @param regionAttributes regionAttributes for the new region
* @see #createRegionFactory(RegionShortcut)
* @since GemFire 6.5
*/
- public <K,V> RegionFactory<K,V> createRegionFactory(RegionAttributes<K,V> regionAttributes);
-
+ public <K, V> RegionFactory<K, V> createRegionFactory(RegionAttributes<K, V> regionAttributes);
+
/**
- * Internal GemStone method for accessing the internationalized
- * logging object for GemFire, use {@link #getLogger()} instead.
- * This method does not throw
- * <code>CacheClosedException</code> if the cache is closed.
+ * Internal GemStone method for accessing the internationalized logging object for GemFire, use
+ * {@link #getLogger()} instead. This method does not throw <code>CacheClosedException</code> if
+ * the cache is closed.
+ *
* @return the logging object
* @deprecated as of 6.5 use getLogger().convertToLogWriterI18n() instead
*/
@Deprecated
public LogWriterI18n getLoggerI18n();
-
+
/**
- * Internal GemStone method for accessing the internationalized
- * logging object for GemFire, use {@link #getSecurityLogger()} instead.
- * This method does not throw
+ * Internal GemStone method for accessing the internationalized logging object for GemFire, use
+ * {@link #getSecurityLogger()} instead. This method does not throw
* <code>CacheClosedException</code> if the cache is closed.
+ *
* @return the security logging object
* @deprecated as of 6.5 use getSecurityLogger().convertToLogWriterI18n() instead
*/
@Deprecated
public LogWriterI18n getSecurityLoggerI18n();
-
+
/**
- * Gets the number of seconds a cache operation will wait to obtain
- * a distributed lock lease.
- * This method does not throw
- * <code>CacheClosedException</code> if the cache is closed.
+ * Gets the number of seconds a cache operation will wait to obtain a distributed lock lease. This
+ * method does not throw <code>CacheClosedException</code> if the cache is closed.
*/
public int getLockTimeout();
+
/**
- * Sets the number of seconds a cache operation may wait to obtain a
- * distributed lock lease before timing out.
+ * Sets the number of seconds a cache operation may wait to obtain a distributed lock lease before
+ * timing out.
*
* @throws IllegalArgumentException if <code>seconds</code> is less than zero
*/
public void setLockTimeout(int seconds);
/**
- * Gets the frequency (in seconds) at which a message will be sent by the
- * primary cache-server to all the secondary cache-server nodes to remove the
- * events which have already been dispatched from the queue.
+ * Gets the frequency (in seconds) at which a message will be sent by the primary cache-server to
+ * all the secondary cache-server nodes to remove the events which have already been dispatched
+ * from the queue.
*
* @return The time interval in seconds
*/
public int getMessageSyncInterval();
/**
- * Sets the frequency (in seconds) at which a message will be sent by the
- * primary cache-server node to all the secondary cache-server nodes to remove
- * the events which have already been dispatched from the queue.
+ * Sets the frequency (in seconds) at which a message will be sent by the primary cache-server
+ * node to all the secondary cache-server nodes to remove the events which have already been
+ * dispatched from the queue.
*
- * @param seconds -
- * the time interval in seconds
- * @throws IllegalArgumentException
- * if <code>seconds</code> is less than zero
+ * @param seconds - the time interval in seconds
+ * @throws IllegalArgumentException if <code>seconds</code> is less than zero
*/
public void setMessageSyncInterval(int seconds);
-
+
/**
- * Gets the length, in seconds, of distributed lock leases obtained
- * by this cache.
- * This method does not throw
- * <code>CacheClosedException</code> if the cache is closed.
+ * Gets the length, in seconds, of distributed lock leases obtained by this cache. This method
+ * does not throw <code>CacheClosedException</code> if the cache is closed.
*/
public int getLockLease();
+
/**
- * Sets the length, in seconds, of distributed lock leases obtained
- * by this cache.
+ * Sets the length, in seconds, of distributed lock leases obtained by this cache.
*
* @throws IllegalArgumentException if <code>seconds</code> is less than zero.
*/
public void setLockLease(int seconds);
-
- /**
- * Gets the number of seconds a cache
- * {@link org.apache.geode.cache.Region#get(Object) get} operation
- * can spend searching for a value before it times out.
- * The search includes any time spent loading the object.
- * When the search times out it causes the get to fail by throwing
- * an exception.
- * This method does not throw
- * <code>CacheClosedException</code> if the cache is closed.
+
+ /**
+ * Gets the number of seconds a cache {@link org.apache.geode.cache.Region#get(Object) get}
+ * operation can spend searching for a value before it times out. The search includes any time
+ * spent loading the object. When the search times out it causes the get to fail by throwing an
+ * exception. This method does not throw <code>CacheClosedException</code> if the cache is closed.
*/
public int getSearchTimeout();
+
/**
- * Sets the number of seconds a cache get operation can spend searching
- * for a value.
+ * Sets the number of seconds a cache get operation can spend searching for a value.
*
* @throws IllegalArgumentException if <code>seconds</code> is less than zero
*/
public void setSearchTimeout(int seconds);
/**
- * Creates a new cache server, with the default configuration,
- * that will allow clients to access this cache.
- * <p>For the default configuration see the constants in
+ * Creates a new cache server, with the default configuration, that will allow clients to access
+ * this cache.
+ * <p>
+ * For the default configuration see the constants in
* {@link org.apache.geode.cache.server.CacheServer}.
*
* @see org.apache.geode.cache.server.CacheServer
@@ -254,41 +245,40 @@ public interface Cache extends GemFireCache {
public CacheServer addCacheServer();
/**
- * Returns a collection of all of the <code>CacheServer</code>s
- * that can serve the contents of this <code>Cache</code> to clients.
+ * Returns a collection of all of the <code>CacheServer</code>s that can serve the contents of
+ * this <code>Cache</code> to clients.
*
* @see #addCacheServer
*
* @since GemFire 5.7
*/
public List<CacheServer> getCacheServers();
-
- /**
- * Adds a gateway event conflict resolution resolver. This is invoked
- * if an event is processed that comes from a different distributed system
- * than the last event to modify the affected entry. It may alter
- * the event or disallow the event. If it does neither the event is applied
- * to the cache if its timestamp is newer than what is in the cache or if
- * it is the same and the event's distributed system ID is larger than that
- * of the last event to modify the affected entry.
+
+ /**
+ * Adds a gateway event conflict resolution resolver. This is invoked if an event is processed
+ * that comes from a different distributed system than the last event to modify the affected
+ * entry. It may alter the event or disallow the event. If it does neither the event is applied to
+ * the cache if its timestamp is newer than what is in the cache or if it is the same and the
+ * event's distributed system ID is larger than that of the last event to modify the affected
+ * entry.
+ *
* @param resolver
* @since GemFire 7.0
*/
public void setGatewayConflictResolver(GatewayConflictResolver resolver);
-
+
/**
* Returns the current gateway event conflict resolver
+ *
* @since GemFire 7.0
*/
public GatewayConflictResolver getGatewayConflictResolver();
-
- /**
- * Sets whether or not this <code>Cache</code> resides in a
- * long-running "cache server" VM. A cache server may be an
- * application VM or may be a stand-along VM launched using {@linkplain
- * org.apache.geode.admin.AdminDistributedSystem#addCacheServer
- * administration API} or the <code>cacheserver</code> command line
- * utility.
+
+ /**
+ * Sets whether or not this <code>Cache</code> resides in a long-running "cache server" VM. A
+ * cache server may be an application VM or may be a stand-along VM launched using
+ * {@linkplain org.apache.geode.admin.AdminDistributedSystem#addCacheServer administration API} or
+ * the <code>cacheserver</code> command line utility.
*
* @since GemFire 4.0
*/
@@ -304,15 +294,13 @@ public interface Cache extends GemFireCache {
public boolean isServer();
/**
- * Notifies the server that this client is ready to receive updates.
- * This method is used by durable clients to notify servers that they
- * are ready to receive updates. As soon as the server receives this message,
- * it will forward updates to this client (if necessary).
+ * Notifies the server that this client is ready to receive updates. This method is used by
+ * durable clients to notify servers that they are ready to receive updates. As soon as the server
+ * receives this message, it will forward updates to this client (if necessary).
* <p>
- * Durable clients must call this method after they are done creating regions.
- * If it is called before the client creates the regions then updates will be lost.
- * Any time a new {@link Pool} is created and regions have been added to it then
- * this method needs to be called again.
+ * Durable clients must call this method after they are done creating regions. If it is called
+ * before the client creates the regions then updates will be lost. Any time a new {@link Pool} is
+ * created and regions have been added to it then this method needs to be called again.
* <p>
*
* @throws IllegalStateException if called by a non-durable client
@@ -324,8 +312,7 @@ public interface Cache extends GemFireCache {
public void readyForEvents();
/**
- * Creates {@link GatewaySenderFactory} for creating a
- * SerialGatewaySender
+ * Creates {@link GatewaySenderFactory} for creating a SerialGatewaySender
*
* @return SerialGatewaySenderFactory
* @since GemFire 7.0
@@ -333,14 +320,13 @@ public interface Cache extends GemFireCache {
public GatewaySenderFactory createGatewaySenderFactory();
/**
- * Creates {@link AsyncEventQueueFactory} for creating a
- * AsyncEventQueue
+ * Creates {@link AsyncEventQueueFactory} for creating a AsyncEventQueue
*
* @return AsyncEventQueueFactory
* @since GemFire 7.0
*/
public AsyncEventQueueFactory createAsyncEventQueueFactory();
-
+
/**
* Creates {@link GatewayReceiverFactory} for creating a GatewayReceiver
*
@@ -350,7 +336,7 @@ public interface Cache extends GemFireCache {
public GatewayReceiverFactory createGatewayReceiverFactory();
/**
- * Returns all {@link GatewaySender}s for this Cache.
+ * Returns all {@link GatewaySender}s for this Cache.
*
* @return Set of GatewaySenders
* @since GemFire 7.0
@@ -362,8 +348,9 @@ public interface Cache extends GemFireCache {
*
* @return GatewaySender with id
* @since GemFire 7.0
- */
+ */
public GatewaySender getGatewaySender(String id);
+
/**
* Returns all {@link GatewayReceiver}s for this Cache
*
@@ -371,66 +358,68 @@ public interface Cache extends GemFireCache {
* @since GemFire 7.0
*/
public Set<GatewayReceiver> getGatewayReceivers();
-
+
/**
* Returns all {@link AsyncEventQueue}s for this Cache
*
* @return Set of AsyncEventQueue
* @since GemFire 7.0
*/
- public Set<AsyncEventQueue> getAsyncEventQueues();
-
+ public Set<AsyncEventQueue> getAsyncEventQueues();
+
/**
* Returns the {@link AsyncEventQueue} with the given id added to this Cache.
*
* @return AsyncEventQueue with id
* @since GemFire 7.0
- */
+ */
public AsyncEventQueue getAsyncEventQueue(String id);
/**
* Returns a set of the other non-administrative members in the distributed system.
+ *
* @since GemFire 6.6
*/
public Set<DistributedMember> getMembers();
-
+
/**
* Returns a set of the administrative members in the distributed system.
+ *
* @since GemFire 6.6
*/
public Set<DistributedMember> getAdminMembers();
-
+
/**
- * Returns a set of the members in the distributed system that have the
- * given region. For regions with local scope an empty set is returned.
+ * Returns a set of the members in the distributed system that have the given region. For regions
+ * with local scope an empty set is returned.
+ *
* @param r a Region in the cache
* @since GemFire 6.6
*/
public Set<DistributedMember> getMembers(Region r);
-
+
/**
- * Obtains the snapshot service to allow the cache data to be imported
- * or exported.
+ * Obtains the snapshot service to allow the cache data to be imported or exported.
*
* @return the snapshot service
*/
public CacheSnapshotService getSnapshotService();
-
- /**
- * Test to see whether the Cache is in the process of reconnecting
- * and recreating a new cache after it has been removed from the system
- * by other members or has shut down due to missing Roles and is reconnecting.<p>
- * This will also return true if the Cache has finished reconnecting.
- * When reconnect has completed you can use {@link Cache#getReconnectedCache} to
- * retrieve the new cache instance.
+
+ /**
+ * Test to see whether the Cache is in the process of reconnecting and recreating a new cache
+ * after it has been removed from the system by other members or has shut down due to missing
+ * Roles and is reconnecting.
+ * <p>
+ * This will also return true if the Cache has finished reconnecting. When reconnect has completed
+ * you can use {@link Cache#getReconnectedCache} to retrieve the new cache instance.
*
* @return true if the Cache is attempting to reconnect or has finished reconnecting
*/
public boolean isReconnecting();
/**
- * Wait for the Cache to finish reconnecting to the distributed system
- * and recreate a new Cache.
+ * Wait for the Cache to finish reconnecting to the distributed system and recreate a new Cache.
+ *
* @see #getReconnectedCache
* @param time amount of time to wait, or -1 to wait forever
* @param units
@@ -438,17 +427,16 @@ public interface Cache extends GemFireCache {
* @throws InterruptedException if the thread is interrupted while waiting
*/
public boolean waitUntilReconnected(long time, TimeUnit units) throws InterruptedException;
-
+
/**
- * Force the Cache to stop reconnecting. If the Cache
- * is currently connected this will disconnect and close it.
+ * Force the Cache to stop reconnecting. If the Cache is currently connected this will disconnect
+ * and close it.
*
*/
public void stopReconnecting();
-
+
/**
- * Returns the new Cache if there was an auto-reconnect and the cache was
- * recreated.
+ * Returns the new Cache if there was an auto-reconnect and the cache was recreated.
*/
public Cache getReconnectedCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java b/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
index 9b6964d..a272afb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheCallback.java
@@ -1,40 +1,38 @@
/*
- * 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
+ * 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;
/**
- * User-defined objects that can be plugged into caching to receive callback
- * notifications.
+ * User-defined objects that can be plugged into caching to receive callback notifications.
*
*
* @since GemFire 3.0
*/
public interface CacheCallback {
- /** Called when the region containing this callback is closed or destroyed, when
- * the cache is closed, or when a callback is removed from a region
- * using an <code>AttributesMutator</code>.
+ /**
+ * Called when the region containing this callback is closed or destroyed, when the cache is
+ * closed, or when a callback is removed from a region using an <code>AttributesMutator</code>.
*
- * <p>Implementations should cleanup any external
- * resources such as database connections. Any runtime exceptions this method
- * throws will be logged.
+ * <p>
+ * Implementations should cleanup any external resources such as database connections. Any runtime
+ * exceptions this method throws will be logged.
*
- * <p>It is possible for this method to be called multiple times on a single
- * callback instance, so implementations must be tolerant of this.
+ * <p>
+ * It is possible for this method to be called multiple times on a single callback instance, so
+ * implementations must be tolerant of this.
*
* @see Cache#close()
* @see Region#close
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheClosedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheClosedException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheClosedException.java
index 9c2be5d..b24bc2f 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheClosedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheClosedException.java
@@ -1,18 +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
+ * 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;
@@ -20,9 +18,8 @@ import org.apache.geode.CancelException;
import org.apache.geode.internal.cache.GemFireCacheImpl;
/**
- * Indicates that the caching system has
- * been closed. Can be thrown from almost any method related to regions or the
- * <code>Cache</code> after the cache has been closed.
+ * Indicates that the caching system has been closed. Can be thrown from almost any method related
+ * to regions or the <code>Cache</code> after the cache has been closed.
*
*
*
@@ -30,15 +27,15 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
* @since GemFire 3.0
*/
public class CacheClosedException extends CancelException {
-private static final long serialVersionUID = -6479561694497811262L;
-
+ private static final long serialVersionUID = -6479561694497811262L;
+
/**
* Constructs a new <code>CacheClosedException</code>.
*/
public CacheClosedException() {
super();
}
-
+
/**
* Constructs a new <code>CacheClosedException</code> with a message string.
*
@@ -52,10 +49,9 @@ private static final long serialVersionUID = -6479561694497811262L;
initCause(cache.getDisconnectCause());
}
}
-
+
/**
- * Constructs a new <code>CacheClosedException</code> with a message string
- * and a cause.
+ * Constructs a new <code>CacheClosedException</code> with a message string and a cause.
*
* @param msg the message string
* @param cause a causal Throwable
@@ -63,7 +59,7 @@ private static final long serialVersionUID = -6479561694497811262L;
public CacheClosedException(String msg, Throwable cause) {
super(msg, cause);
}
-
+
/**
* Constructs a new <code>CacheClosedException</code> with a cause.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java b/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
index 44e4745..fc4cfc4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheEvent.java
@@ -1,18 +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
+ * 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;
@@ -22,14 +20,12 @@ import org.apache.geode.internal.cache.EnumListenerEvent;
/**
* A region- or entry-related event affecting the cache.
- * <P>
- * Prior to release <code>6.0</code> the <code>NOT_AVAILABLE</code> constant
- * was used to indicate an object value was not available.
- * However in <code>6.0</code> generic typing was added
- * to {@link Region} and since this constant's type will not be an
- * instance of the generic type <code>V</code> returning it would cause
- * a ClassCastException. So in <code>6.0</code> and later
- * <code>null</code> is now used in place of <code>NOT_AVAILABLE</code>.
+ * <P>
+ * Prior to release <code>6.0</code> the <code>NOT_AVAILABLE</code> constant was used to indicate an
+ * object value was not available. However in <code>6.0</code> generic typing was added to
+ * {@link Region} and since this constant's type will not be an instance of the generic type
+ * <code>V</code> returning it would cause a ClassCastException. So in <code>6.0</code> and later
+ * <code>null</code> is now used in place of <code>NOT_AVAILABLE</code>.
*
* @see CacheListener
*
@@ -37,56 +33,66 @@ import org.apache.geode.internal.cache.EnumListenerEvent;
*
* @since GemFire 2.0
*/
-public interface CacheEvent<K,V> {
+public interface CacheEvent<K, V> {
- /** Returns the region to which this cached object belongs or
- * the region that raised this event for <code>RegionEvent</code>s.
- * @return the region associated with this object or the region that raised
- * this event.
+ /**
+ * Returns the region to which this cached object belongs or the region that raised this event for
+ * <code>RegionEvent</code>s.
+ *
+ * @return the region associated with this object or the region that raised this event.
*/
- public Region<K,V> getRegion();
+ public Region<K, V> getRegion();
/**
* Return a description of the operation that triggered this event.
+ *
* @return the operation that triggered this event.
* @since GemFire 5.0
*/
public Operation getOperation();
-
- /** Returns the callbackArgument passed to the method that generated this event.
- * Provided primarily in case this object or region has already been
- * destroyed. See the {@link Region} interface methods that take a
- * callbackArgument parameter.
- * @return the callbackArgument associated with this event. <code>null</code>
- * is returned if the callback argument is not propagated to the event.
- * This happens for events given to {@link TransactionListener}
- * and to {@link CacheListener} on the remote side of a transaction commit.
+
+ /**
+ * Returns the callbackArgument passed to the method that generated this event. Provided primarily
+ * in case this object or region has already been destroyed. See the {@link Region} interface
+ * methods that take a callbackArgument parameter.
+ *
+ * @return the callbackArgument associated with this event. <code>null</code> is returned if the
+ * callback argument is not propagated to the event. This happens for events given to
+ * {@link TransactionListener} and to {@link CacheListener} on the remote side of a
+ * transaction commit.
*/
public Object getCallbackArgument();
+
/**
- * Returns <code>true</code> if the callback argument is "available".
- * Not available means that the callback argument may have existed but it could
- * not be obtained.
- * Note that {@link #getCallbackArgument} will return <code>null</code>
- * when this method returns <code>false</code>.
+ * Returns <code>true</code> if the callback argument is "available". Not available means that the
+ * callback argument may have existed but it could not be obtained. Note that
+ * {@link #getCallbackArgument} will return <code>null</code> when this method returns
+ * <code>false</code>.
+ *
* @since GemFire 6.0
*/
public boolean isCallbackArgumentAvailable();
- /** Answer true if this event originated in a cache other than this one.
- * Answer false if this event originated in this cache.
+ /**
+ * Answer true if this event originated in a cache other than this one. Answer false if this event
+ * originated in this cache.
+ *
* @return true if this event originated remotely
*
*/
public boolean isOriginRemote();
+
/**
* Returns the {@link DistributedMember} that this event originated in.
+ *
* @return the member that performed the operation that originated this event.
* @since GemFire 5.0
*/
public DistributedMember getDistributedMember();
- /** Answer true if this event resulted from expiration.
+ /**
+ * Answer true if this event resulted from expiration.
+ *
* @return true if this event resulted from expiration
* @deprecated as of GemFire 5.0, use {@link Operation#isExpiration} instead.
*
@@ -94,11 +100,11 @@ public interface CacheEvent<K,V> {
@Deprecated
public boolean isExpiration();
- /** Answers true if this event resulted from a distributed operation;
- * false if a local operation.
+ /**
+ * Answers true if this event resulted from a distributed operation; false if a local operation.
*
- * This is useful to distinguish between invalidate and localInvalidate, and
- * destroy and localDestroy.
+ * This is useful to distinguish between invalidate and localInvalidate, and destroy and
+ * localDestroy.
*
* @return true if this event resulted from a distributed operation
* @deprecated as of GemFire 5.0, use {@link Operation#isDistributed} instead.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheException.java
index cc39fb3..79591d6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheException.java
@@ -1,18 +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
+ * 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;
@@ -20,34 +18,33 @@ import org.apache.geode.GemFireException;
/**
- * A generic exception, which indicates
- * a cache error has occurred. All the other cache exceptions are
- * subclasses of this class. This class is abstract and therefore only
- * subclasses are instantiated.
+ * A generic exception, which indicates a cache error has occurred. All the other cache exceptions
+ * are subclasses of this class. This class is abstract and therefore only subclasses are
+ * instantiated.
*
*
* @since GemFire 2.0
*/
public abstract class CacheException extends GemFireException {
public static final long serialVersionUID = 7699432887938858940L;
-
+
/** Constructs a new <code>CacheException</code>. */
public CacheException() {
super();
}
-
+
/** Constructs a new <code>CacheException</code> with a message string. */
public CacheException(String s) {
super(s);
}
-
- /** Constructs a <code>CacheException</code> with a message string and
- * a base exception
+
+ /**
+ * Constructs a <code>CacheException</code> with a message string and a base exception
*/
public CacheException(String s, Throwable cause) {
super(s, cause);
}
-
+
/** Constructs a <code>CacheException</code> with a cause */
public CacheException(Throwable cause) {
super(cause);
@@ -61,9 +58,7 @@ public abstract class CacheException extends GemFireException {
String causeStr = cause.toString();
final String glue = ", caused by ";
StringBuffer sb = new StringBuffer(result.length() + causeStr.length() + glue.length());
- sb.append(result)
- .append(glue)
- .append(causeStr);
+ sb.append(result).append(glue).append(causeStr);
result = sb.toString();
}
return result;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheExistsException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheExistsException.java
index 610eb4c..ec79aa3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheExistsException.java
@@ -1,49 +1,50 @@
/*
- * 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
+ * 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;
-/** Thrown when attempting to create a {@link Cache} if one already exists.
+/**
+ * Thrown when attempting to create a {@link Cache} if one already exists.
*
*
* @see CacheFactory#create
* @since GemFire 3.0
*/
public class CacheExistsException extends CacheException {
-private static final long serialVersionUID = 4090002289325418100L;
+ private static final long serialVersionUID = 4090002289325418100L;
/** The <code>Cache</code> that already exists */
private final transient Cache cache;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
* Constructs an instance of <code>CacheExistsException</code> with the specified detail message.
+ *
* @param msg the detail message
*/
public CacheExistsException(Cache cache, String msg) {
super(msg);
this.cache = cache;
}
-
+
/**
* Constructs an instance of <code>CacheExistsException</code> with the specified detail message
* and cause.
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
@@ -52,7 +53,7 @@ private static final long serialVersionUID = 4090002289325418100L;
this.cache = cache;
}
- /////////////////////// Instance Methods ///////////////////////
+ /////////////////////// Instance Methods ///////////////////////
/**
* Returns the <code>Cache</code> that already exists.
[50/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index bc31c92..a734e05 100755
--- a/build.gradle
+++ b/build.gradle
@@ -24,6 +24,7 @@ buildscript {
classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.0"
classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.0.1'
+ classpath "com.diffplug.gradle.spotless:spotless:2.2.0"
}
}
@@ -45,7 +46,7 @@ allprojects {
// We want to see all test results. This is equivalatent to setting --continue
// on the command line.
gradle.startParameter.continueOnFailure = true
-
+
repositories {
mavenCentral()
maven { url "http://repo.spring.io/release" }
@@ -63,7 +64,7 @@ task cleanAll(type: Delete) {
delete rootProject.buildDir
if (!buildRoot.isEmpty()) {
delete buildRoot
- }
+ }
}
// allow external projects to override include location
@@ -84,6 +85,13 @@ apply from: "${scriptDir}/rat.gradle"
subprojects {
// Make sure clean task for rootProject runs last
clean.finalizedBy rootProject.cleanAll
+
+ apply plugin: "com.diffplug.gradle.spotless"
+ spotless {
+ java {
+ eclipseFormatFile "${rootProject.projectDir}/etc/eclipse-java-google-style.xml"
+ }
+ }
}
task cleanExamples(type: GradleBuild) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/etc/eclipse-java-google-style.xml
----------------------------------------------------------------------
diff --git a/etc/eclipse-java-google-style.xml b/etc/eclipse-java-google-style.xml
new file mode 100644
index 0000000..08d930a
--- /dev/null
+++ b/etc/eclipse-java-google-style.xml
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="13">
+<profile kind="CodeFormatterProfile" name="GoogleStyle" version="13">
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments.count_dependent" value="16|-1|16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_prefer_two_fragments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_comment_inline_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_local_variable_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="1040"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type.count_dependent" value="1585|-1|1585"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields.count_dependent" value="16|-1|16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression.count_dependent" value="16|4|80"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration.count_dependent" value="16|4|48"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration.count_dependent" value="16|4|49"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_cascading_method_invocation_with_arguments" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration.count_dependent" value="16|4|48"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_local_variable_annotation" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants.count_dependent" value="16|5|48"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation.count_dependent" value="16|4|48"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="1585"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_type_annotation" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_field_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment_new_line_at_start_of_html_paragraph" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comment_prefix" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_parameter_annotation" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="1585"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation.count_dependent" value="16|5|80"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter.count_dependent" value="1040|-1|1040"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package.count_dependent" value="1585|-1|1585"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.force_if_else_statement_brace" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="3"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_package_annotation" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation.count_dependent" value="16|-1|16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="1585"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_new_anonymous_class" value="20"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable.count_dependent" value="1585|-1|1585"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field.count_dependent" value="1585|-1|1585"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration.count_dependent" value="16|5|80"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant.count_dependent" value="16|-1|16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="1585"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer.count_dependent" value="16|5|80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.7"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration.count_dependent" value="16|4|48"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method.count_dependent" value="1585|-1|1585"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression.count_dependent" value="16|-1|16"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_non_simple_member_annotation" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="1585"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call.count_dependent" value="16|5|80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_generic_type_arguments.count_dependent" value="16|-1|16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression.count_dependent" value="16|5|80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration.count_dependent" value="16|5|80"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_for_statement" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+</profile>
+</profiles>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/etc/eclipseFormatterProfile.xml
----------------------------------------------------------------------
diff --git a/etc/eclipseFormatterProfile.xml b/etc/eclipseFormatterProfile.xml
deleted file mode 100755
index b9f8410..0000000
--- a/etc/eclipseFormatterProfile.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="12">
-<profile kind="CodeFormatterProfile" name="Apache Geode" version="12">
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="160"/>
-<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="18"/>
-<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="999"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-</profile>
-</profiles>
[85/98] [abbrv] incubator-geode git commit: GEODE-2024 Deadlock
creating a new lock service Grantor
Posted by ds...@apache.org.
GEODE-2024 Deadlock creating a new lock service Grantor
This change-set causes the code in TXLockServiceImpl.release() to
perform periodic checks to see if grantor recovery is being performed.
If so it skips releaseTryLocks, which requires a recovered grantor to
function. This is in line with the previous attempts to fix this
problem. The recovery message that is trying to obtain the recovery
write-lock now sets the "recovering" state in TXLockServiceImpl prior
to attempting to get the lock so that it is set when
TXLockServiceImpl.release() checks its state.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f02ea36f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f02ea36f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f02ea36f
Branch: refs/heads/feature/GEM-983
Commit: f02ea36f2e3a440e8aa39815539f3aa2855ce124
Parents: 69a0877
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed Oct 26 13:51:20 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Wed Oct 26 13:53:00 2016 -0700
----------------------------------------------------------------------
.../locks/DLockRecoverGrantorProcessor.java | 16 +-
.../internal/locks/DLockService.java | 108 ++++++----
.../internal/cache/locks/TXLockServiceImpl.java | 35 ++--
.../locks/TXRecoverGrantorMessageProcessor.java | 8 +-
.../cache/locks/TXLockServiceDUnitTest.java | 210 ++++++++++++++-----
5 files changed, 272 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f02ea36f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
index 37fbfbe..2a48308 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
@@ -91,7 +91,7 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
// process msg and reply from this VM...
if (msg.getSender() == null)
msg.setSender(dm.getId());
- msg.processMessage(dm);
+ msg.scheduleMessage(dm);
// keep waiting even if interrupted
try {
@@ -239,6 +239,20 @@ public class DLockRecoverGrantorProcessor extends ReplyProcessor21 {
processMessage(dm);
}
+ /**
+ * For unit testing we need to push the message through scheduleAction so that message observers
+ * are invoked
+ *
+ * @param dm the distribution manager
+ */
+ protected void scheduleMessage(DM dm) {
+ if (dm instanceof DistributionManager) {
+ super.scheduleAction((DistributionManager) dm);
+ } else {
+ processMessage(dm);
+ }
+ }
+
protected void processMessage(DM dm) {
MessageProcessor processor = nullServiceProcessor;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f02ea36f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
index a859299..ca012d3 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
@@ -15,8 +15,18 @@
package org.apache.geode.distributed.internal.locks;
-import org.apache.geode.*;
-import org.apache.geode.distributed.*;
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.CancelException;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.InternalGemFireException;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.distributed.DistributedLockService;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.DistributedSystemDisconnectedException;
+import org.apache.geode.distributed.LeaseExpiredException;
+import org.apache.geode.distributed.LockNotHeldException;
+import org.apache.geode.distributed.LockServiceDestroyedException;
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -39,8 +49,18 @@ import org.apache.logging.log4j.Logger;
import java.io.DataInput;
import java.io.DataOutput;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
/**
@@ -290,7 +310,7 @@ public class DLockService extends DistributedLockService {
statStart = getStats().startGrantorWait();
if (!ownLockGrantorFutureResult) {
LockGrantorId lockGrantorIdRef =
- waitForLockGrantorFutureResult(lockGrantorFutureResultRef);
+ waitForLockGrantorFutureResult(lockGrantorFutureResultRef, 0, TimeUnit.MILLISECONDS);
if (lockGrantorIdRef != null) {
return lockGrantorIdRef;
} else {
@@ -366,7 +386,7 @@ public class DLockService extends DistributedLockService {
/**
* Creates a local {@link DLockGrantor}.
- *
+ *
* if (!createLocalGrantor(xxx)) { theLockGrantorId = this.lockGrantorId; }
*
* @param elder the elder that told us to be the grantor
@@ -727,15 +747,24 @@ public class DLockService extends DistributedLockService {
* Returns lockGrantorId when lockGrantorFutureResultRef has been set by another thread.
*
* @param lockGrantorFutureResultRef FutureResult to wait for
+ * @param timeToWait how many ms to wait, 0 = forever
+ * @param timeUnit the unit of measure for timeToWait
* @return the LockGrantorId or null if FutureResult was cancelled
*/
- private LockGrantorId waitForLockGrantorFutureResult(FutureResult lockGrantorFutureResultRef) {
+ private LockGrantorId waitForLockGrantorFutureResult(FutureResult lockGrantorFutureResultRef,
+ long timeToWait, final TimeUnit timeUnit) {
LockGrantorId lockGrantorIdRef = null;
while (lockGrantorIdRef == null) {
boolean interrupted = Thread.interrupted();
try {
checkDestroyed();
- lockGrantorIdRef = (LockGrantorId) lockGrantorFutureResultRef.get();
+ if (timeToWait == 0) {
+ lockGrantorIdRef = (LockGrantorId) lockGrantorFutureResultRef.get();
+ } else {
+ lockGrantorIdRef = (LockGrantorId) lockGrantorFutureResultRef.get(timeToWait, timeUnit);
+ }
+ } catch (TimeoutException e) {
+ break;
} catch (InterruptedException e) {
interrupted = true;
this.dm.getCancelCriterion().checkCancelInProgress(e);
@@ -757,7 +786,14 @@ public class DLockService extends DistributedLockService {
return lockGrantorIdRef;
}
- private void notLockGrantorId(LockGrantorId notLockGrantorId, boolean waitForGrantor) {
+ /**
+ * nulls out grantor to force call to elder
+ *
+ * @param timeToWait how long to wait for a new grantor. -1 don't wait, 0 no time limit
+ * @param timeUnit the unit of measure of timeToWait
+ */
+ private void notLockGrantorId(LockGrantorId notLockGrantorId, long timeToWait,
+ final TimeUnit timeUnit) {
if (notLockGrantorId.isLocal(getSerialNumber())) {
if (logger.isTraceEnabled(LogMarker.DLS)) {
logger.trace(LogMarker.DLS,
@@ -793,8 +829,8 @@ public class DLockService extends DistributedLockService {
statStart = getStats().startGrantorWait();
if (!ownLockGrantorFutureResult) {
- if (waitForGrantor) { // fix for bug #43708
- waitForLockGrantorFutureResult(lockGrantorFutureResultRef);
+ if (timeToWait >= 0) {
+ waitForLockGrantorFutureResult(lockGrantorFutureResultRef, timeToWait, timeUnit);
}
return;
}
@@ -947,7 +983,7 @@ public class DLockService extends DistributedLockService {
}
}
if (!ownLockGrantorFutureResult) {
- waitForLockGrantorFutureResult(lockGrantorFutureResultRef);
+ waitForLockGrantorFutureResult(lockGrantorFutureResultRef, 0, TimeUnit.MILLISECONDS);
continue;
}
}
@@ -1329,7 +1365,7 @@ public class DLockService extends DistributedLockService {
* will be ignored if the lock is currently held by another client.
*
* @param interruptible true if this lock request is interruptible
- *
+ *
* @param disableAlerts true to disable logging alerts if the dlock is taking a long time to
* acquired.
*
@@ -1408,7 +1444,6 @@ public class DLockService extends DistributedLockService {
LocalizedStrings.DLockService_DEBUG_LOCKINTERRUPTIBLY_HAS_GONE_HOT_AND_LOOPED_0_TIMES
.toLocalizedString(count);
-
InternalGemFireError e = new InternalGemFireError(s);
logger.error(LogMarker.DLS,
LocalizedMessage.create(
@@ -1516,7 +1551,6 @@ public class DLockService extends DistributedLockService {
}
} // else: non-reentrant or reentrant w/ non-infinite lease
-
if (gotLock) {
// if (processor != null) (cannot be null)
{ // TODO: can be null after restoring above optimization
@@ -1539,9 +1573,7 @@ public class DLockService extends DistributedLockService {
this.lockGrantorId);
}
continue;
- }
-
- else if (isDestroyed()) {
+ } else if (isDestroyed()) {
// race: dls was destroyed
if (isDebugEnabled_DLS) {
logger.trace(LogMarker.DLS,
@@ -1549,9 +1581,7 @@ public class DLockService extends DistributedLockService {
theLockGrantorId);
}
needToReleaseOrphanedGrant = true;
- }
-
- else {
+ } else {
safeExit = true;
synchronized (this.tokens) {
checkDestroyed();
@@ -1603,7 +1633,7 @@ public class DLockService extends DistributedLockService {
// grantor replied NOT_GRANTOR or departed (getLock is false)
else if (processor.repliedNotGrantor() || processor.hadNoResponse()) {
safeExit = true;
- notLockGrantorId(theLockGrantorId, true);
+ notLockGrantorId(theLockGrantorId, 0, TimeUnit.MILLISECONDS);
// keepTrying is still true... loop back around
} // grantor replied NOT_GRANTOR or departed
@@ -1912,7 +1942,7 @@ public class DLockService extends DistributedLockService {
released = true;
} finally {
if (!released) {
- notLockGrantorId(theLockGrantorId, true);
+ notLockGrantorId(theLockGrantorId, 0, TimeUnit.MILLISECONDS);
}
}
} // while !released
@@ -1966,7 +1996,7 @@ public class DLockService extends DistributedLockService {
// loop back around to get next lock grantor
} finally {
if (queryReply != null && queryReply.repliedNotGrantor()) {
- notLockGrantorId(theLockGrantorId, true);
+ notLockGrantorId(theLockGrantorId, 0, TimeUnit.MILLISECONDS);
}
}
} // while querying
@@ -2076,7 +2106,7 @@ public class DLockService extends DistributedLockService {
return this.dlockStats;
}
- public void releaseTryLocks(DLockBatchId batchId, boolean onlyIfSameGrantor) {
+ public void releaseTryLocks(DLockBatchId batchId, Callable<Boolean> untilCondition) {
final boolean isDebugEnabled_DLS = logger.isTraceEnabled(LogMarker.DLS);
if (isDebugEnabled_DLS) {
logger.trace(LogMarker.DLS, "[DLockService.releaseTryLocks] enter: {}", batchId);
@@ -2088,26 +2118,29 @@ public class DLockService extends DistributedLockService {
boolean lockBatch = true;
boolean released = false;
while (!released) {
+ try {
+ boolean quit = untilCondition.call();
+ if (quit) {
+ return;
+ }
+ } catch (Exception e) {
+ throw new InternalGemFireException("unexpected exception", e);
+ }
checkDestroyed();
LockGrantorId theLockGrantorId = null;
- if (onlyIfSameGrantor) { // this was a fix for bug #38763, from r19555
- theLockGrantorId = batchId.getLockGrantorId();
- synchronized (this.lockGrantorIdLock) {
- if (!checkLockGrantorId(theLockGrantorId)) {
- // the grantor is different so break and skip DLockReleaseProcessor
- break;
- }
+ theLockGrantorId = batchId.getLockGrantorId();
+ synchronized (this.lockGrantorIdLock) {
+ if (!checkLockGrantorId(theLockGrantorId)) {
+ // the grantor is different so break and skip DLockReleaseProcessor
+ break;
}
- } else {
- theLockGrantorId = getLockGrantorId();
}
released =
callReleaseProcessor(theLockGrantorId.getLockGrantorMember(), batchId, lockBatch, -1);
if (!released) {
- final boolean waitForGrantor = onlyIfSameGrantor; // fix for bug #43708
- notLockGrantorId(theLockGrantorId, waitForGrantor);
+ notLockGrantorId(theLockGrantorId, 100, TimeUnit.MILLISECONDS);
}
}
} finally {
@@ -2185,7 +2218,7 @@ public class DLockService extends DistributedLockService {
// should have thrown LockServiceDestroyedException
Assert.assertTrue(isDestroyed(), "Grantor reports service " + this + " is destroyed");
} else if (processor.repliedNotGrantor() || processor.hadNoResponse()) {
- notLockGrantorId(theLockGrantorId, true);
+ notLockGrantorId(theLockGrantorId, 0, TimeUnit.MILLISECONDS);
} else {
keyIfFailed[0] = processor.getKeyIfFailed();
if (keyIfFailed[0] == null) {
@@ -2455,7 +2488,8 @@ public class DLockService extends DistributedLockService {
if (theLockGrantorId != null && !theLockGrantorId.isLocal(getSerialNumber())) {
if (!NonGrantorDestroyedProcessor.send(this.serviceName, theLockGrantorId, dm)) {
// grantor responded NOT_GRANTOR
- notLockGrantorId(theLockGrantorId, true); // nulls out grantor to force call to elder
+ notLockGrantorId(theLockGrantorId, 0, TimeUnit.MILLISECONDS); // nulls out grantor to
+ // force call to elder
retry = true;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f02ea36f/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
index f4ab02f..717d878 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXLockServiceImpl.java
@@ -15,13 +15,6 @@
package org.apache.geode.internal.cache.locks;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.logging.log4j.Logger;
-
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ReplyException;
@@ -32,6 +25,12 @@ import org.apache.geode.distributed.internal.membership.InternalDistributedMembe
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.util.concurrent.StoppableReentrantReadWriteLock;
+import org.apache.logging.log4j.Logger;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
/** Provides clean separation of implementation from public facade */
public class TXLockServiceImpl extends TXLockService {
@@ -50,13 +49,14 @@ public class TXLockServiceImpl extends TXLockService {
/** Instance of dlock service to use */
private DLockService dlock;
- /** List of active txLockIds */
+ /**
+ * List of active txLockIds
+ */
protected List txLockIdList = new ArrayList();
/**
* True if grantor recovery is in progress; used to keep <code>release</code> from waiting for
- * grantor. TODO: this boolean can probably be removed... it was insufficient and new fixes for
- * bug 38763 have the side effect of making this boolean obsolete (verify before removal!)
+ * grantor.
*/
private volatile boolean recovering = false;
@@ -225,10 +225,11 @@ public class TXLockServiceImpl extends TXLockService {
LocalizedStrings.TXLockServiceImpl_INVALID_TXLOCKID_NOT_FOUND_0
.toLocalizedString(txLockId));
}
- // only release w/ dlock if not in middle of recovery...
- if (!this.recovering) {
- this.dlock.releaseTryLocks(txLockId, true);
- }
+
+ this.dlock.releaseTryLocks(txLockId, () -> {
+ return this.recovering;
+ });
+
this.txLockIdList.remove(txLockId);
releaseRecoveryReadLock();
}
@@ -243,10 +244,14 @@ public class TXLockServiceImpl extends TXLockService {
// Internal implementation methods
// -------------------------------------------------------------------------
+ boolean isRecovering() {
+ return this.recovering;
+ }
+
/** Delays grantor recovery replies until finished with locks */
void acquireRecoveryWriteLock() throws InterruptedException {
- this.recoveryLock.writeLock().lockInterruptibly();
this.recovering = true;
+ this.recoveryLock.writeLock().lockInterruptibly();
}
void releaseRecoveryWriteLock() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f02ea36f/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java
old mode 100755
new mode 100644
index 77dec94..7ae2d2b
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/locks/TXRecoverGrantorMessageProcessor.java
@@ -15,10 +15,6 @@
package org.apache.geode.internal.cache.locks;
-import java.util.concurrent.RejectedExecutionException;
-
-import org.apache.logging.log4j.Logger;
-
import org.apache.geode.distributed.internal.DM;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.ReplyException;
@@ -30,11 +26,13 @@ import org.apache.geode.internal.cache.TXCommitMessage;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
+import org.apache.logging.log4j.Logger;
+
+import java.util.concurrent.RejectedExecutionException;
/**
* Provides processing of DLockRecoverGrantorProcessor. Reply will not be sent until all locks are
* released.
- *
*/
public class TXRecoverGrantorMessageProcessor
implements DLockRecoverGrantorProcessor.MessageProcessor {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f02ea36f/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
old mode 100755
new mode 100644
index fb16ea9..6a5eae8
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/locks/TXLockServiceDUnitTest.java
@@ -14,29 +14,25 @@
*/
package org.apache.geode.internal.cache.locks;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static com.jayway.awaitility.Awaitility.await;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import org.apache.geode.cache.CommitConflictException;
import org.apache.geode.distributed.DistributedLockService;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.DistributionMessageObserver;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.ReplyProcessor21;
import org.apache.geode.distributed.internal.locks.DLockRecoverGrantorProcessor;
+import org.apache.geode.distributed.internal.locks.DLockRecoverGrantorProcessor.DLockRecoverGrantorMessage;
import org.apache.geode.distributed.internal.locks.DLockService;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.internal.cache.TXRegionLockRequestImpl;
@@ -44,9 +40,19 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.Invoke;
import org.apache.geode.test.dunit.LogWriterUtils;
import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.dunit.ThreadUtils;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
/**
* This class tests distributed ownership via the DistributedLockService api.
@@ -75,22 +81,10 @@ public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
*/
@Override
public final void postSetUp() throws Exception {
- // Create a DistributedSystem in every VM
+ Invoke.invokeInEveryVM("connectDistributedSystem", () -> connectDistributedSystem());
connectDistributedSystem();
-
- for (int h = 0; h < Host.getHostCount(); h++) {
- Host host = Host.getHost(h);
-
- for (int v = 0; v < host.getVMCount(); v++) {
- // host.getVM(v).invoke(() -> TXLockServiceDUnitTest.dumpStack());
- host.getVM(v).invoke(TXLockServiceDUnitTest.class, "connectDistributedSystem", null);
- }
- }
}
- public static void dumpStack() {
- org.apache.geode.internal.OSProcess.printStacks(0);
- }
@Override
public final void preTearDown() throws Exception {
@@ -124,16 +118,13 @@ public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
*/
}
- @Ignore("TODO: test is disabled")
@Test
public void testGetAndDestroyAgain() {
testGetAndDestroy();
}
- @Ignore("TODO: test is disabled")
@Test
public void testTXRecoverGrantorMessageProcessor() throws Exception {
- LogWriterUtils.getLogWriter().info("[testTXOriginatorRecoveryProcessor]");
TXLockService.createDTLS();
checkDLockRecoverGrantorMessageProcessor();
@@ -162,29 +153,158 @@ public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
msg.setProcessorId(testProc.getProcessorId());
msg.setSender(dlock.getDistributionManager().getId());
- Thread thread = new Thread(new Runnable() {
- public void run() {
- TXRecoverGrantorMessageProcessor proc =
- (TXRecoverGrantorMessageProcessor) dlock.getDLockRecoverGrantorMessageProcessor();
- proc.processDLockRecoverGrantorMessage(dlock.getDistributionManager(), msg);
- }
+ Thread thread = new Thread(() -> {
+ TXRecoverGrantorMessageProcessor proc =
+ (TXRecoverGrantorMessageProcessor) dlock.getDLockRecoverGrantorMessageProcessor();
+ proc.processDLockRecoverGrantorMessage(dlock.getDistributionManager(), msg);
});
+ thread.setName("TXLockServiceDUnitTest thread");
+ thread.setDaemon(true);
thread.start();
- // pause to allow thread to be blocked before we release the lock
- sleep(999);
+ await("waiting for recovery message to block").atMost(999, TimeUnit.MILLISECONDS).until(() -> {
+ return ((TXLockServiceImpl) dtls).isRecovering();
+ });
- // release txLock
dtls.release(txLockId);
- // check results to verify no locks were provided in reply
- ThreadUtils.join(thread, 30 * 1000);
+ // check results to verify no locks were provided in the reply
+ await("waiting for thread to exit").atMost(30, TimeUnit.SECONDS).until(() -> {
+ return !thread.isAlive();
+ });
+
+ assertFalse(((TXLockServiceImpl) dtls).isRecovering());
+
assertEquals("testTXRecoverGrantor_replyCode_PASS is false", true,
testTXRecoverGrantor_replyCode_PASS);
assertEquals("testTXRecoverGrantor_heldLocks_PASS is false", true,
testTXRecoverGrantor_heldLocks_PASS);
}
+
+ @Test
+ public void testTXGrantorMigration() throws Exception {
+ // first make sure some other VM is the grantor
+ Host.getHost(0).getVM(0).invoke("become lock grantor", () -> {
+ TXLockService.createDTLS();
+ TXLockService vm0dtls = TXLockService.getDTLS();
+ DLockService vm0dlock = ((TXLockServiceImpl) vm0dtls).getInternalDistributedLockService();
+ vm0dlock.becomeLockGrantor();
+ });
+
+ TXLockService.createDTLS();
+ checkDLockRecoverGrantorMessageProcessor();
+
+ /*
+ * call TXRecoverGrantorMessageProcessor.process directly to make sure that correct behavior
+ * occurs
+ */
+
+ // get txLock and hold it
+ final List regionLockReqs = new ArrayList();
+ regionLockReqs.add(new TXRegionLockRequestImpl("/testTXRecoverGrantorMessageProcessor2",
+ new HashSet(Arrays.asList(new String[] {"KEY-1", "KEY-2", "KEY-3", "KEY-4"}))));
+ TXLockService dtls = TXLockService.getDTLS();
+ TXLockId txLockId = dtls.txLock(regionLockReqs, Collections.EMPTY_SET);
+
+ final DLockService dlock = ((TXLockServiceImpl) dtls).getInternalDistributedLockService();
+
+ // GEODE-2024: now cause grantor migration while holding the recoveryReadLock.
+ // It will lock up in TXRecoverGrantorMessageProcessor until the recoveryReadLock
+ // is released. Demonstrate that dtls.release() does not block forever and releases the
+ // recoveryReadLock
+ // allowing grantor migration to finish
+
+ // create an observer that will block recovery messages from being processed
+ MessageObserver observer = new MessageObserver();
+ DistributionMessageObserver.setInstance(observer);
+
+ try {
+ System.out.println("starting thread to take over being lock grantor from vm0");
+
+ // become the grantor - this will block waiting for a reply to the message blocked by the
+ // observer
+ Thread thread = new Thread(() -> {
+ dlock.becomeLockGrantor();
+ });
+ thread.setName("TXLockServiceDUnitTest thread2");
+ thread.setDaemon(true);
+ thread.start();
+
+ await("waiting for recovery to begin").atMost(10, TimeUnit.SECONDS).until(() -> {
+ return observer.isPreventingProcessing();
+ });
+
+
+ // spawn a thread that will unblock message processing
+ // so that TXLockServiceImpl's "recovering" variable will be set
+ System.out.println("starting a thread to unblock recovery in 5 seconds");
+ Thread unblockThread = new Thread(() -> {
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException e) {
+ throw new RuntimeException("sleep interrupted");
+ }
+ System.out.println("releasing block of recovery message processing");
+ observer.releasePreventionOfProcessing();
+ });
+ unblockThread.setName("TXLockServiceDUnitTest unblockThread");
+ unblockThread.setDaemon(true);
+ unblockThread.start();
+
+ // release txLock - this will block until unblockThread tells the observer
+ // that it can process its message. Then it should release the recovery read-lock
+ // allowing the grantor to finish recovery
+ System.out.println("releasing transaction locks, which should block for a bit");
+ dtls.release(txLockId);
+
+ await("waiting for recovery to finish").atMost(10, TimeUnit.SECONDS).until(() -> {
+ return !((TXLockServiceImpl) dtls).isRecovering();
+ });
+ } finally {
+ observer.releasePreventionOfProcessing();
+ DistributionMessageObserver.setInstance(null);
+ }
+ }
+
+ static class MessageObserver extends DistributionMessageObserver {
+ final boolean[] preventingMessageProcessing = new boolean[] {false};
+ final boolean[] preventMessageProcessing = new boolean[] {true};
+
+
+ public boolean isPreventingProcessing() {
+ synchronized (preventingMessageProcessing) {
+ return preventingMessageProcessing[0];
+ }
+ }
+
+ public void releasePreventionOfProcessing() {
+ synchronized (preventMessageProcessing) {
+ preventMessageProcessing[0] = false;
+ }
+ }
+
+ @Override
+ public void beforeProcessMessage(DistributionManager dm, DistributionMessage message) {
+ if (message instanceof DLockRecoverGrantorMessage) {
+ synchronized (preventingMessageProcessing) {
+ preventingMessageProcessing[0] = true;
+ }
+ synchronized (preventMessageProcessing) {
+ while (preventMessageProcessing[0]) {
+ try {
+ preventMessageProcessing.wait(50);
+ } catch (InterruptedException e) {
+ throw new RuntimeException("sleep interrupted");
+ }
+ }
+ }
+ }
+ }
+
+ }
+
+
protected static volatile TXLockId testTXLock_TXLockId;
@Test
@@ -384,7 +504,6 @@ public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
});
Host.getHost(0).getVM(originatorVM).invoke(() -> disconnectFromDS());
-
// grantor sends TXOriginatorRecoveryMessage...
// TODO: verify processing of message? and have test sleep until finished
sleep(200);
@@ -456,7 +575,7 @@ public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
/**
* Creates a new DistributedLockService in a remote VM.
- *
+ *
* @param name The name of the newly-created DistributedLockService. It is recommended that the
* name of the Region be the {@link #getUniqueName()} of the test, or at least derive from
* it.
@@ -594,9 +713,6 @@ public class TXLockServiceDUnitTest extends JUnit4DistributedTestCase {
/**
* Accessed via reflection. DO NOT REMOVE
- *
- * @param key
- * @return
*/
protected static Boolean unlock_DTLS(Object key) {
TXLockService dtls = TXLockService.getDTLS();
[09/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
index 6bf240f..1ba6b84 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -45,36 +43,31 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
private boolean isRunning;
/**
- * Constructor to configure RMI Registry to start using default RMI Registry
- * port: {@link Registry#REGISTRY_PORT}
+ * Constructor to configure RMI Registry to start using default RMI Registry port:
+ * {@link Registry#REGISTRY_PORT}
*/
public RMIRegistryService() {
this(Registry.REGISTRY_PORT);
}
/**
- * Constructor to configure RMI Registry to start using given RMI Registry
- * port.
+ * Constructor to configure RMI Registry to start using given RMI Registry port.
*
- * @param port
- * to run RMI Registry on
+ * @param port to run RMI Registry on
*/
public RMIRegistryService(int port) {
setPort(port);
}
/**
- * Constructor to configure RMI Registry to start using given RMI Registry
- * port & host bind address.
+ * Constructor to configure RMI Registry to start using given RMI Registry port & host bind
+ * address.
*
- * @param host
- * to bind RMI Registry to
- * @param port
- * to run RMI Registry on
+ * @param host to bind RMI Registry to
+ * @param port to run RMI Registry on
*
- * @throws UnknownHostException
- * if IP Address can not be resolved for the given host string while
- * creating the RMIServerSocketFactory
+ * @throws UnknownHostException if IP Address can not be resolved for the given host string while
+ * creating the RMIServerSocketFactory
*/
public RMIRegistryService(String host, int port) throws UnknownHostException {
setPort(port);
@@ -83,7 +76,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
ssf = new RMIServerSocketFactoryImpl(host);
}
}
-
+
/**
* Returns the host on which rmiregistry listens for incoming connections
*
@@ -96,16 +89,15 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Sets the host on which rmiregistry listens for incoming connections
*
- * @param host
- * the host on which rmiregistry listens for incoming connections
+ * @param host the host on which rmiregistry listens for incoming connections
*/
protected void setHost(String host) {
- if (isRunning()) {
+ if (isRunning()) {
throw new IllegalStateException("RMIRegistryService is running, cannot change the host");
}
this.host = host;
}
-
+
/**
* Returns the port on which rmiregistry listens for incoming connections
*
@@ -118,11 +110,10 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
/**
* Sets the port on which rmiregistry listens for incoming connections
*
- * @param port
- * the port on which rmiregistry listens for incoming connections
+ * @param port the port on which rmiregistry listens for incoming connections
*/
protected void setPort(int port) {
- if (isRunning()) {
+ if (isRunning()) {
throw new IllegalStateException("RMIRegistryService is running, cannot change the port");
}
this.port = port;
@@ -137,13 +128,12 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
public synchronized void start() throws RemoteException {
if (!isRunning()) {
if (ssf != null) {
- registry = LocateRegistry.createRegistry(port,
- null, //RMIClientSocketFactory
- ssf); //RMIServerSocketFactory
+ registry = LocateRegistry.createRegistry(port, null, // RMIClientSocketFactory
+ ssf); // RMIServerSocketFactory
} else {
registry = LocateRegistry.createRegistry(port);
}
-
+
isRunning = true;
}
}
@@ -195,6 +185,7 @@ public class RMIRegistryService implements RMIRegistryServiceMBean {
}
}
+
/**
* Custom implementation of the {@link RMIServerSocketFactory}
*
@@ -204,34 +195,27 @@ class RMIServerSocketFactoryImpl implements RMIServerSocketFactory {
private InetAddress bindAddress;
/**
- * Constructs a RMIServerSocketFactory. The given rmiBindAddress is used to
- * bind the ServerSockets created from this factory.
+ * Constructs a RMIServerSocketFactory. The given rmiBindAddress is used to bind the ServerSockets
+ * created from this factory.
*
- * @param rmiBindAddress
- * String representation of the address to bind the ServerSockets to
+ * @param rmiBindAddress String representation of the address to bind the ServerSockets to
*
- * @throws UnknownHostException
- * if IP Address can not be resolved for the given host string
+ * @throws UnknownHostException if IP Address can not be resolved for the given host string
*/
- /*default */RMIServerSocketFactoryImpl(String rmiBindAddress)
- throws UnknownHostException {
+ /* default */ RMIServerSocketFactoryImpl(String rmiBindAddress) throws UnknownHostException {
this.bindAddress = InetAddress.getByName(rmiBindAddress);
}
/**
- * Create a server socket on the specified port (port 0 indicates an anonymous
- * port).
+ * Create a server socket on the specified port (port 0 indicates an anonymous port).
*
- * @param port
- * the port number
+ * @param port the port number
* @return the server socket on the specified port
- * @exception IOException
- * if an I/O error occurs during server socket creation
+ * @exception IOException if an I/O error occurs during server socket creation
*/
public ServerSocket createServerSocket(int port) throws IOException {
- return new ServerSocket(port,
- 0/*backlog - for '0' internally uses the default*/,
- bindAddress);
+ return new ServerSocket(port, 0/* backlog - for '0' internally uses the default */,
+ bindAddress);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
index f2ac079..9d9bfb4 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryServiceMBean.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -21,11 +19,9 @@ import java.rmi.NotBoundException;
import java.rmi.RemoteException;
/**
- * This interface is similar to mx4j.tools.naming.NamingServiceMBean.
- * Features that differ are:
- * 1. This MBean interface additionally provides a way to specify the host that
- * the RMI Registry should get bound to.
- * 2. Port property can not be changed once set.
+ * This interface is similar to mx4j.tools.naming.NamingServiceMBean. Features that differ are: 1.
+ * This MBean interface additionally provides a way to specify the host that the RMI Registry should
+ * get bound to. 2. Port property can not be changed once set.
*
*/
public interface RMIRegistryServiceMBean {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
index 93513e5..14be6cb 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RefreshNotificationType.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -21,110 +19,108 @@ import org.apache.commons.lang.StringUtils;
/**
* Type-safe definition for refresh notifications.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
public class RefreshNotificationType implements java.io.Serializable {
private static final long serialVersionUID = 4376763592395613794L;
-
+
/** Notify StatisticResource to refresh statistics */
- public static final RefreshNotificationType STATISTIC_RESOURCE_STATISTICS =
- new RefreshNotificationType(
- "GemFire.Timer.StatisticResource.statistics.refresh",
- "refresh");
+ public static final RefreshNotificationType STATISTIC_RESOURCE_STATISTICS =
+ new RefreshNotificationType("GemFire.Timer.StatisticResource.statistics.refresh", "refresh");
/** Notify SystemMember to refresh config */
- public static final RefreshNotificationType SYSTEM_MEMBER_CONFIG =
- new RefreshNotificationType(
- "GemFire.Timer.SystemMember.config.refresh",
- "refresh");
+ public static final RefreshNotificationType SYSTEM_MEMBER_CONFIG =
+ new RefreshNotificationType("GemFire.Timer.SystemMember.config.refresh", "refresh");
/** Notification type for the javax.management.Notification */
private final transient String type;
-
+
/** Notification msg for the javax.management.Notification */
private final transient String msg;
-
+
// The 4 declarations below are necessary for serialization
/** int used as ordinal to represent this Scope */
public final int ordinal = nextOrdinal++;
private static int nextOrdinal = 0;
-
+
private static final RefreshNotificationType[] VALUES =
- { STATISTIC_RESOURCE_STATISTICS, SYSTEM_MEMBER_CONFIG };
+ {STATISTIC_RESOURCE_STATISTICS, SYSTEM_MEMBER_CONFIG};
private Object readResolve() throws java.io.ObjectStreamException {
- return VALUES[ordinal]; // Canonicalize
+ return VALUES[ordinal]; // Canonicalize
}
-
+
/** Creates a new instance of RefreshNotificationType. */
private RefreshNotificationType(String type, String msg) {
this.type = type;
this.msg = msg;
}
-
+
/** Return the RefreshNotificationType represented by specified ordinal */
public static RefreshNotificationType fromOrdinal(int ordinal) {
return VALUES[ordinal];
}
- public String getType() {
- return this.type;
- }
+ public String getType() {
+ return this.type;
+ }
+
+ public String getMessage() {
+ return this.msg;
+ }
- public String getMessage() {
- return this.msg;
- }
-
- /**
+ /**
* Returns a string representation for this notification type.
*
* @return the type string for this Notification
*/
@Override
public String toString() {
- return this.type;
+ return this.type;
}
- /**
- * Indicates whether some other object is "equal to" this one.
- *
- * @param other the reference object with which to compare.
- * @return true if this object is the same as the obj argument;
- * false otherwise.
- */
+ /**
+ * Indicates whether some other object is "equal to" this one.
+ *
+ * @param other the reference object with which to compare.
+ * @return true if this object is the same as the obj argument; false otherwise.
+ */
@Override
- public boolean equals(Object other) {
- if (other == this) return true;
- if (other == null) return false;
- if (!(other instanceof RefreshNotificationType)) return false;
- final RefreshNotificationType that = (RefreshNotificationType) other;
-
- if (!StringUtils.equals(this.type, that.type)) return false;
- if (!StringUtils.equals(this.msg, that.msg)) return false;
-
- return true;
- }
-
- /**
- * Returns a hash code for the object. This method is supported for the
- * benefit of hashtables such as those provided by java.util.Hashtable.
- *
- * @return the integer 0 if description is null; otherwise a unique integer.
- */
+ public boolean equals(Object other) {
+ if (other == this)
+ return true;
+ if (other == null)
+ return false;
+ if (!(other instanceof RefreshNotificationType))
+ return false;
+ final RefreshNotificationType that = (RefreshNotificationType) other;
+
+ if (!StringUtils.equals(this.type, that.type))
+ return false;
+ if (!StringUtils.equals(this.msg, that.msg))
+ return false;
+
+ return true;
+ }
+
+ /**
+ * Returns a hash code for the object. This method is supported for the benefit of hashtables such
+ * as those provided by java.util.Hashtable.
+ *
+ * @return the integer 0 if description is null; otherwise a unique integer.
+ */
@Override
- public int hashCode() {
- int result = 17;
- final int mult = 37;
-
- result = mult * result +
- (this.type == null ? 0 : this.type.hashCode());
- result = mult * result +
- (this.msg == null ? 0 : this.msg.hashCode());
-
- return result;
- }
-
+ public int hashCode() {
+ int result = 17;
+ final int mult = 37;
+
+ result = mult * result + (this.type == null ? 0 : this.type.hashCode());
+ result = mult * result + (this.msg == null ? 0 : this.msg.hashCode());
+
+ return result;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
index 59d7948..40ca11b 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertNotification.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -36,12 +34,12 @@ import org.apache.geode.internal.admin.StatAlertDefinition;
*
* @since GemFire 5.7
*/
-public class StatAlertNotification extends StatAlert implements Serializable, DataSerializable, DataSerializableFixedID {
+public class StatAlertNotification extends StatAlert
+ implements Serializable, DataSerializable, DataSerializableFixedID {
private static final long serialVersionUID = -1634729103430107871L;
private String memberId;
- public StatAlertNotification() {
- }
+ public StatAlertNotification() {}
public StatAlertNotification(StatAlert statAlert, String memberId) {
this.setDefinitionId(statAlert.getDefinitionId());
@@ -63,8 +61,7 @@ public class StatAlertNotification extends StatAlert implements Serializable, Da
/**
*
- * @param id
- * of gemfire member which raised the alert
+ * @param id of gemfire member which raised the alert
*/
public void setMemberId(String id) {
memberId = id;
@@ -85,16 +82,10 @@ public class StatAlertNotification extends StatAlert implements Serializable, Da
}
/**
- * The notification is something like this
- * "For Member ID: <ID>
- * [
- * <StatName> = <Value>
- * ..
- * ]"
- * @param defn
- * {@link StatAlertDefinition}
- * @return String representation of this object based on
- * {@link StatAlertDefinition}
+ * The notification is something like this "For Member ID: <ID> [ <StatName> = <Value> .. ]"
+ *
+ * @param defn {@link StatAlertDefinition}
+ * @return String representation of this object based on {@link StatAlertDefinition}
*/
public String toString(StatAlertDefinition defn) {
StringBuffer buf = new StringBuffer();
@@ -103,8 +94,7 @@ public class StatAlertNotification extends StatAlert implements Serializable, Da
buf.append("\n");
buf.append("[ ");
for (int i = 0; i < getValues().length; i++) {
- buf.append(defn.getStatisticInfo()[i].toString() + "=" + getValues()[i]
- + "\n");
+ buf.append(defn.getStatisticInfo()[i].toString() + "=" + getValues()[i] + "\n");
}
buf.append("]");
return getTime().toString() + ":" + buf.toString();
@@ -116,7 +106,7 @@ public class StatAlertNotification extends StatAlert implements Serializable, Da
return false;
}
- StatAlertNotification other = (StatAlertNotification)object;
+ StatAlertNotification other = (StatAlertNotification) object;
int defId = getDefinitionId();
@@ -143,13 +133,12 @@ public class StatAlertNotification extends StatAlert implements Serializable, Da
DataSerializer.writeString(this.memberId, out);
}
- public void fromData(DataInput in)
- throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
// Do not modify StatAlert to allow 57 cacheservers to function with 57+ agent
// However, update of a new StatAlertDefn on 57 server from 57+ agent not covered with this
this.setDefinitionId(DataSerializer.readPrimitiveInt(in));
this.setTime(DataSerializer.readDate(in));
- this.setValues((Number[])DataSerializer.readObjectArray(in));
+ this.setValues((Number[]) DataSerializer.readObjectArray(in));
this.memberId = DataSerializer.readString(in);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
index b80b18b..106fa35 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatAlertsAggregator.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -21,14 +19,14 @@ import org.apache.geode.internal.admin.StatAlert;
import org.apache.geode.internal.admin.StatAlertDefinition;
/**
- * This interface represents an Aggregator entity and resides in JMXAgent.
- * Responsibilities are as follows:
+ * This interface represents an Aggregator entity and resides in JMXAgent. Responsibilities are as
+ * follows:
* <ol>
- * <li> set AlertsManager in the newly joined members
- * <li> create/update/remove alert
- * <li> manage refresh interval
- * <li> process notification from members
- * <li> Aggregate stats & make available for clients thro' JMXAgent
+ * <li>set AlertsManager in the newly joined members
+ * <li>create/update/remove alert
+ * <li>manage refresh interval
+ * <li>process notification from members
+ * <li>Aggregate stats & make available for clients thro' JMXAgent
* </ol>
*
*/
@@ -37,12 +35,10 @@ public interface StatAlertsAggregator {
/**
* This method can be used to get an alert definition.
*
- * @param alertDefinition
- * StatAlertDefinition to retrieve
+ * @param alertDefinition StatAlertDefinition to retrieve
* @return StatAlertDefinition
*/
- public StatAlertDefinition getAlertDefinition(
- StatAlertDefinition alertDefinition);
+ public StatAlertDefinition getAlertDefinition(StatAlertDefinition alertDefinition);
/**
* This method can be used to retrieve all available stat alert definitions.
@@ -52,43 +48,38 @@ public interface StatAlertsAggregator {
public StatAlertDefinition[] getAllStatAlertDefinitions();
/**
- * This method can be used to update alert definition for the Stat mentioned.
- * This method should update the collection maintained at the aggregator and
- * should notify members for the newly added alert definitions.
+ * This method can be used to update alert definition for the Stat mentioned. This method should
+ * update the collection maintained at the aggregator and should notify members for the newly
+ * added alert definitions.
* <p>
* A new alert definition will be created if matching one not found.
*
- * @param alertDefinition
- * alertDefinition to be updated
+ * @param alertDefinition alertDefinition to be updated
*/
public void updateAlertDefinition(StatAlertDefinition alertDefinition);
/**
* This method can be used to remove alert definition for the Stat mentioned.
* <p>
- * This method should update the collection maintained at the aggregator and
- * should notify members for the newly added alert definitions.
+ * This method should update the collection maintained at the aggregator and should notify members
+ * for the newly added alert definitions.
*
- * @param defId
- * id of the alert definition to be removed
+ * @param defId id of the alert definition to be removed
*/
public void removeAlertDefinition(Integer defId);
/**
* Convenience method to check whether an alert definition is created.
*
- * @param alert
- * alert definition to check whether already created
+ * @param alert alert definition to check whether already created
* @return true if the alert definition is already created, false otherwise
*/
public boolean isAlertDefinitionCreated(StatAlertDefinition alert);
/**
- * This method can be used to set the AlertManager for the newly joined member
- * VM.
+ * This method can be used to set the AlertManager for the newly joined member VM.
*
- * @param memberVM
- * Member VM to set AlertsManager for
+ * @param memberVM Member VM to set AlertsManager for
*/
public void setAlertsManager(GemFireVM memberVM);
@@ -100,22 +91,18 @@ public interface StatAlertsAggregator {
public int getRefreshIntervalForStatAlerts();
/**
- * This method is used to set the refresh interval for the Stats Alerts in
- * seconds
+ * This method is used to set the refresh interval for the Stats Alerts in seconds
*
- * @param refreshInterval
- * refresh interval for the Stats(in seconds)
+ * @param refreshInterval refresh interval for the Stats(in seconds)
*/
public void setRefreshIntervalForStatAlerts(int refreshInterval);
/**
- * This method can be used to process the notifications sent by the member(s).
- * Actual aggregation of stats can occur here. The array contains alert
- * objects with alert def. ID & value. AlertHelper class can be used to
- * retrieve the corresponding alert definition.
+ * This method can be used to process the notifications sent by the member(s). Actual aggregation
+ * of stats can occur here. The array contains alert objects with alert def. ID & value.
+ * AlertHelper class can be used to retrieve the corresponding alert definition.
*
- * @param alerts
- * array of Alert class(contains alert def. ID & value)
+ * @param alerts array of Alert class(contains alert def. ID & value)
* @param remoteVM
*/
public void processNotifications(StatAlert[] alerts, GemFireVM remoteVM);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
index 92c6091..c257ad5 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticAttributeInfo.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -23,55 +21,50 @@ import javax.management.Descriptor;
import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.ModelMBeanAttributeInfo;
-/**
- * Subclass of AttributeInfo with {@link org.apache.geode.admin.Statistic}
- * added for use as the {@link
- * javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's
- * <i>targetObject</i> value.
+/**
+ * Subclass of AttributeInfo with {@link org.apache.geode.admin.Statistic} added for use as the
+ * {@link javax.management.modelmbean.ModelMBeanAttributeInfo} descriptor's <i>targetObject</i>
+ * value.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
class StatisticAttributeInfo extends org.apache.commons.modeler.AttributeInfo {
private static final long serialVersionUID = 28022387514935560L;
-
+
private Statistic stat;
-
+
public StatisticAttributeInfo() {
super();
}
-
+
public Statistic getStat() {
return this.stat;
}
+
public void setStat(Statistic stat) {
- //System.out.println(">> stat = " + stat);
+ // System.out.println(">> stat = " + stat);
Assert.assertTrue(stat != null, "Attempting to set stat to null");
this.stat = stat;
}
-
+
@Override
public ModelMBeanAttributeInfo createAttributeInfo() {
- Descriptor desc = new DescriptorSupport(
- new String[] {
- "name=" + this.displayName,
- "descriptorType=attribute",
- "currencyTimeLimit=-1", // always stale
- "displayName=" + this.displayName,
- "getMethod=getValue" });
+ Descriptor desc = new DescriptorSupport(new String[] {"name=" + this.displayName,
+ "descriptorType=attribute", "currencyTimeLimit=-1", // always stale
+ "displayName=" + this.displayName, "getMethod=getValue"});
Assert.assertTrue(this.stat != null, "Stat target object is null!");
desc.setField("targetObject", this.stat);
- ModelMBeanAttributeInfo info = new ModelMBeanAttributeInfo(
- this.displayName, // name
- this.type, // type
+ ModelMBeanAttributeInfo info = new ModelMBeanAttributeInfo(this.displayName, // name
+ this.type, // type
this.description, // description
- this.readable, // isReadable
- this.writeable, // isWritable
- this.is, // isIs
+ this.readable, // isReadable
+ this.writeable, // isWritable
+ this.is, // isIs
desc);
-
+
return info;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
index 3e04500..4f46d5a 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/StatisticResourceJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -36,22 +34,20 @@ import org.apache.geode.internal.logging.LogService;
/**
* Provides MBean support for the monitoring of a statistic resource.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
-public class StatisticResourceJmxImpl
-extends org.apache.geode.admin.internal.StatisticResourceImpl
-implements javax.management.NotificationListener,
- org.apache.geode.admin.jmx.internal.ManagedResource {
+public class StatisticResourceJmxImpl extends org.apache.geode.admin.internal.StatisticResourceImpl
+ implements javax.management.NotificationListener,
+ org.apache.geode.admin.jmx.internal.ManagedResource {
private static final Logger logger = LogService.getLogger();
-
- /**
- * Interval in seconds between refreshes. Values less than one results in no
- * refreshing .
+
+ /**
+ * Interval in seconds between refreshes. Values less than one results in no refreshing .
*/
private int refreshInterval = 0;
-
+
/** The JMX object name of this managed resource */
private ObjectName objectName;
@@ -59,47 +55,45 @@ implements javax.management.NotificationListener,
private boolean timerInited = false;
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
-
+
/**
* Constructor for the StatisticResource object
*
- * @param statResource the admin StatResource to manage/monitor
- * @param member the SystemMember owning this resource
- * @exception org.apache.geode.admin.AdminException
- * if unable to create this StatisticResource for administration
+ * @param statResource the admin StatResource to manage/monitor
+ * @param member the SystemMember owning this resource
+ * @exception org.apache.geode.admin.AdminException if unable to create this StatisticResource for
+ * administration
*/
- public StatisticResourceJmxImpl(StatResource statResource,
- SystemMemberJmx member)
- throws org.apache.geode.admin.AdminException {
+ public StatisticResourceJmxImpl(StatResource statResource, SystemMemberJmx member)
+ throws org.apache.geode.admin.AdminException {
super(statResource, member);
initializeMBean();
}
/** Create and register the MBean to manage this resource */
- private void initializeMBean()
- throws org.apache.geode.admin.AdminException {
- this.mbeanName = new StringBuffer("GemFire.Statistic:")
- .append("source=").append(MBeanUtil.makeCompliantMBeanNameProperty(this.member.getId()))
- .append(",type=").append(MBeanUtil.makeCompliantMBeanNameProperty(getType()))
- .append(",name=").append(MBeanUtil.makeCompliantMBeanNameProperty(getName()))
- .append(",uid=").append(getUniqueId()).toString();
-
+ private void initializeMBean() throws org.apache.geode.admin.AdminException {
+ this.mbeanName = new StringBuffer("GemFire.Statistic:").append("source=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(this.member.getId())).append(",type=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(getType())).append(",name=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(getName())).append(",uid=")
+ .append(getUniqueId()).toString();
+
this.objectName =
- MBeanUtil.createMBean(this,
- addDynamicAttributes(MBeanUtil.lookupManagedBean(this)));
+ MBeanUtil.createMBean(this, addDynamicAttributes(MBeanUtil.lookupManagedBean(this)));
// Refresh Interval
- AdminDistributedSystemJmxImpl sysJmx = (AdminDistributedSystemJmxImpl)this.member.getDistributedSystem();
- if (sysJmx.getRefreshInterval()>0)
+ AdminDistributedSystemJmxImpl sysJmx =
+ (AdminDistributedSystemJmxImpl) this.member.getDistributedSystem();
+ if (sysJmx.getRefreshInterval() > 0)
this.refreshInterval = sysJmx.getRefreshInterval();
}
// -------------------------------------------------------------------------
- // MBean attributes - accessors/mutators
+ // MBean attributes - accessors/mutators
// -------------------------------------------------------------------------
-
+
/**
* Gets the interval in seconds between statistics refreshes
*
@@ -110,11 +104,10 @@ implements javax.management.NotificationListener,
}
/**
- * Sets interval in seconds between statistic refreshes; zero or less turns
- * off auto refreshing. Manual refreshing has no effect on when the next
- * scheduled refresh will occur.
+ * Sets interval in seconds between statistic refreshes; zero or less turns off auto refreshing.
+ * Manual refreshing has no effect on when the next scheduled refresh will occur.
*
- * @param refreshInterval the new refresh interval in seconds
+ * @param refreshInterval the new refresh interval in seconds
*/
private void _setRefreshInterval(int refreshInterval) {
boolean isRegistered = MBeanUtil.isRefreshNotificationRegistered(this,
@@ -124,11 +117,9 @@ implements javax.management.NotificationListener,
return;
try {
- MBeanUtil.registerRefreshNotification(
- this, // NotificationListener
+ MBeanUtil.registerRefreshNotification(this, // NotificationListener
getMBeanName(), // User Data as MBean Name
- RefreshNotificationType.STATISTIC_RESOURCE_STATISTICS,
- refreshInterval); // int
+ RefreshNotificationType.STATISTIC_RESOURCE_STATISTICS, refreshInterval); // int
this.refreshInterval = refreshInterval;
timerInited = true;
@@ -151,51 +142,46 @@ implements javax.management.NotificationListener,
this.refreshInterval = 0; // zero out to avoid more exceptions
}
}
-
+
/**
- * RefreshInterval is now set only through the AdminDistributedSystem property
- * refreshInterval. Attempt to set refreshInterval on StatisticResourceJmx
- * MBean would result in an OperationNotSupportedException
- * Auto-refresh is enabled on demand when a call to getStatistics is made
+ * RefreshInterval is now set only through the AdminDistributedSystem property refreshInterval.
+ * Attempt to set refreshInterval on StatisticResourceJmx MBean would result in an
+ * OperationNotSupportedException Auto-refresh is enabled on demand when a call to getStatistics
+ * is made
*
- * @param refreshInterval
- * the new refresh interval in seconds
+ * @param refreshInterval the new refresh interval in seconds
* @deprecated since 6.0 use DistributedSystemConfig.refreshInterval instead
*/
@Deprecated
- public void setRefreshInterval(int refreshInterval)
- throws OperationNotSupportedException {
+ public void setRefreshInterval(int refreshInterval) throws OperationNotSupportedException {
throw new OperationNotSupportedException(
- LocalizedStrings.MANAGED_RESOURCE_REFRESH_INTERVAL_CANT_BE_SET_DIRECTLY.toLocalizedString());
+ LocalizedStrings.MANAGED_RESOURCE_REFRESH_INTERVAL_CANT_BE_SET_DIRECTLY
+ .toLocalizedString());
}
-
+
// -------------------------------------------------------------------------
- // JMX Notification listener
+ // JMX Notification listener
// -------------------------------------------------------------------------
/**
- * Handles notification to refresh. Reacts by refreshing the values of this
- * SystemMember's ConfigurationParamaters. Any other notification is ignored.
- * Given notification is handled only if there is any JMX client connected to
- * the system.
+ * Handles notification to refresh. Reacts by refreshing the values of this SystemMember's
+ * ConfigurationParamaters. Any other notification is ignored. Given notification is handled only
+ * if there is any JMX client connected to the system.
* <p>
* TODO: investigate use of NotificationFilter instead of explicit check...
*
- * @param notification
- * the JMX notification being received
- * @param hb
- * handback object is unused
+ * @param notification the JMX notification being received
+ * @param hb handback object is unused
*/
public void handleNotification(Notification notification, Object hb) {
- AdminDistributedSystemJmxImpl adminDSJmx =
- (AdminDistributedSystemJmxImpl) this.member.getDistributedSystem();
-
- String typeStatResourceStats =
- RefreshNotificationType.STATISTIC_RESOURCE_STATISTICS.getType();
-
- if (typeStatResourceStats.equals(notification.getType()) &&
- getMBeanName().equals(notification.getUserData()) &&
- !adminDSJmx.isRmiClientCountZero()) {
+ AdminDistributedSystemJmxImpl adminDSJmx =
+ (AdminDistributedSystemJmxImpl) this.member.getDistributedSystem();
+
+ String typeStatResourceStats = RefreshNotificationType.STATISTIC_RESOURCE_STATISTICS.getType();
+
+ if (typeStatResourceStats.equals(notification.getType())
+ && getMBeanName().equals(notification.getUserData())
+ && !adminDSJmx.isRmiClientCountZero()) {
try {
refresh();
@@ -212,12 +198,12 @@ implements javax.management.NotificationListener,
_setRefreshInterval(0); // zero out to avoid more exceptions
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -227,26 +213,27 @@ implements javax.management.NotificationListener,
}
}
}
-
+
// -------------------------------------------------------------------------
- // Create MBean attributes for each Statistic
+ // Create MBean attributes for each Statistic
// -------------------------------------------------------------------------
-
+
/**
* Add MBean attribute definitions for each Statistic.
*
- * @param managed the mbean definition to add attributes to
- * @return a new instance of ManagedBean copied from <code>managed</code> but
- * with the new attributes added
+ * @param managed the mbean definition to add attributes to
+ * @return a new instance of ManagedBean copied from <code>managed</code> but with the new
+ * attributes added
*/
- ManagedBean addDynamicAttributes(ManagedBean managed)
- throws org.apache.geode.admin.AdminException {
+ ManagedBean addDynamicAttributes(ManagedBean managed)
+ throws org.apache.geode.admin.AdminException {
if (managed == null) {
- throw new IllegalArgumentException(LocalizedStrings.StatisticResourceJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.StatisticResourceJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString());
}
-
+
refresh(); // to get the stats...
-
+
// need to create a new instance of ManagedBean to clean the "slate"...
ManagedBean newManagedBean = new DynamicManagedBean(managed);
for (int i = 0; i < this.statistics.length; i++) {
@@ -262,7 +249,7 @@ implements javax.management.NotificationListener,
attrInfo.setWriteable(false);
attrInfo.setStat(this.statistics[i]);
-
+
newManagedBean.addAttribute(attrInfo);
}
return newManagedBean;
@@ -272,7 +259,7 @@ implements javax.management.NotificationListener,
if (!timerInited) {
// 1st call to getStatistics would trigger
// the auto-refresh if an interval is set
- if (this.refreshInterval>0) {
+ if (this.refreshInterval > 0) {
this._setRefreshInterval(this.refreshInterval);
}
}
@@ -280,8 +267,7 @@ implements javax.management.NotificationListener,
if (this.statistics == null) {
try {
this.refresh();
- }
- catch (AdminException e) {
+ } catch (AdminException e) {
this.statistics = new Statistic[0];
}
}
@@ -290,26 +276,27 @@ implements javax.management.NotificationListener,
}
// -------------------------------------------------------------------------
- // ManagedResource implementation
+ // ManagedResource implementation
// -------------------------------------------------------------------------
-
+
/** The name of the MBean that will manage this resource */
private String mbeanName;
/** The ModelMBean that is configured to manage this resource */
private ModelMBean modelMBean;
-
- public String getMBeanName() {
- return this.mbeanName;
- }
-
- public ModelMBean getModelMBean() {
- return this.modelMBean;
- }
- public void setModelMBean(ModelMBean modelMBean) {
- this.modelMBean = modelMBean;
- }
-
+
+ public String getMBeanName() {
+ return this.mbeanName;
+ }
+
+ public ModelMBean getModelMBean() {
+ return this.modelMBean;
+ }
+
+ public void setModelMBean(ModelMBean modelMBean) {
+ this.modelMBean = modelMBean;
+ }
+
public ObjectName getObjectName() {
return this.objectName;
}
@@ -317,38 +304,35 @@ implements javax.management.NotificationListener,
public ManagedResourceType getManagedResourceType() {
return ManagedResourceType.STATISTIC_RESOURCE;
}
-
+
public void cleanupResource() {
this.modelMBean = null;
this.member = null;
this.statistics = null;
this.statResource = null;
}
-
+
/**
- * Checks equality of the given object with <code>this</code> based on the
- * type (Class) and the MBean Name returned by <code>getMBeanName()</code>
- * methods.
+ * Checks equality of the given object with <code>this</code> based on the type (Class) and the
+ * MBean Name returned by <code>getMBeanName()</code> methods.
*
- * @param obj
- * object to check equality with
- * @return true if the given object is if the same type and its MBean Name is
- * same as <code>this</code> object's MBean Name, false otherwise
+ * @param obj object to check equality with
+ * @return true if the given object is if the same type and its MBean Name is same as
+ * <code>this</code> object's MBean Name, false otherwise
*/
@Override
public boolean equals(Object obj) {
- if ( !(obj instanceof StatisticResourceJmxImpl) ) {
+ if (!(obj instanceof StatisticResourceJmxImpl)) {
return false;
}
-
+
StatisticResourceJmxImpl other = (StatisticResourceJmxImpl) obj;
return this.getMBeanName().equals(other.getMBeanName());
}
/**
- * Returns hash code for <code>this</code> object which is based on the MBean
- * Name generated.
+ * Returns hash code for <code>this</code> object which is based on the MBean Name generated.
*
* @return hash code for <code>this</code> object
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
index 0040cb0..6206340 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberBridgeServerJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -26,13 +24,12 @@ import javax.management.ObjectName;
import javax.management.modelmbean.ModelMBean;
/**
- * MBean representation of a {@link
- * org.apache.geode.admin.SystemMemberBridgeServer}.
+ * MBean representation of a {@link org.apache.geode.admin.SystemMemberBridgeServer}.
*
* @since GemFire 4.0
*/
-public class SystemMemberBridgeServerJmxImpl
- extends SystemMemberBridgeServerImpl implements ManagedResource {
+public class SystemMemberBridgeServerJmxImpl extends SystemMemberBridgeServerImpl
+ implements ManagedResource {
/** The object name of this managed resource */
private ObjectName objectName;
@@ -43,52 +40,48 @@ public class SystemMemberBridgeServerJmxImpl
/** The ModelMBean that is configured to manage this resource */
private ModelMBean modelMBean;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
- * Creates a new <code>SystemMemberBridgeServerJmxImpl</code> that
- * serves the contents of the given cache.
+ * Creates a new <code>SystemMemberBridgeServerJmxImpl</code> that serves the contents of the
+ * given cache.
*/
- SystemMemberBridgeServerJmxImpl(SystemMemberCacheImpl cache,
- AdminBridgeServer bridgeInfo)
- throws AdminException {
+ SystemMemberBridgeServerJmxImpl(SystemMemberCacheImpl cache, AdminBridgeServer bridgeInfo)
+ throws AdminException {
super(cache, bridgeInfo);
initializeMBean(cache);
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
- /**
+ /**
* Creates and registers the MBean to manage this resource
*/
- private void initializeMBean(SystemMemberCacheImpl cache)
- throws AdminException {
-
+ private void initializeMBean(SystemMemberCacheImpl cache) throws AdminException {
+
GemFireVM vm = cache.getVM();
- this.mbeanName = new StringBuffer("GemFire.Cache:")
- .append("name=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(cache.getName()))
- .append(",id=")
- .append(this.getBridgeId())
- .append(",owner=")
+ this.mbeanName = new StringBuffer("GemFire.Cache:").append("name=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(cache.getName())).append(",id=")
+ .append(this.getBridgeId()).append(",owner=")
.append(MBeanUtil.makeCompliantMBeanNameProperty(vm.getId().toString()))
.append(",type=CacheServer").toString();
-
+
this.objectName = MBeanUtil.createMBean(this);
}
public String getMBeanName() {
return this.mbeanName;
}
-
+
public ModelMBean getModelMBean() {
return this.modelMBean;
}
+
public void setModelMBean(ModelMBean modelMBean) {
this.modelMBean = modelMBean;
}
-
+
public ObjectName getObjectName() {
return this.objectName;
}
@@ -96,34 +89,30 @@ public class SystemMemberBridgeServerJmxImpl
public ManagedResourceType getManagedResourceType() {
return ManagedResourceType.SYSTEM_MEMBER_CACHE_SERVER;
}
-
+
public void cleanupResource() {}
-
+
/**
- * Checks equality of the given object with <code>this</code> based on the
- * type (Class) and the MBean Name returned by <code>getMBeanName()</code>
- * methods.
+ * Checks equality of the given object with <code>this</code> based on the type (Class) and the
+ * MBean Name returned by <code>getMBeanName()</code> methods.
*
- * @param obj
- * object to check equality with
- * @return true if the given object is if the same type and its MBean Name is
- * same as <code>this</code> object's MBean Name, false otherwise
+ * @param obj object to check equality with
+ * @return true if the given object is if the same type and its MBean Name is same as
+ * <code>this</code> object's MBean Name, false otherwise
*/
@Override
public boolean equals(Object obj) {
- if ( !(obj instanceof SystemMemberBridgeServerJmxImpl) ) {
+ if (!(obj instanceof SystemMemberBridgeServerJmxImpl)) {
return false;
}
-
- SystemMemberBridgeServerJmxImpl other =
- (SystemMemberBridgeServerJmxImpl) obj;
-
+
+ SystemMemberBridgeServerJmxImpl other = (SystemMemberBridgeServerJmxImpl) obj;
+
return this.getMBeanName().equals(other.getMBeanName());
}
/**
- * Returns hash code for <code>this</code> object which is based on the MBean
- * Name generated.
+ * Returns hash code for <code>this</code> object which is based on the MBean Name generated.
*
* @return hash code for <code>this</code> object
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
index b8cc255..ebce869 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberCacheJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -44,78 +42,65 @@ import org.apache.geode.internal.logging.InternalLogWriter;
/**
* MBean representation of {@link org.apache.geode.admin.SystemMemberCache}.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
-public class SystemMemberCacheJmxImpl
-extends org.apache.geode.admin.internal.SystemMemberCacheImpl
-implements org.apache.geode.admin.jmx.internal.ManagedResource {
+public class SystemMemberCacheJmxImpl extends org.apache.geode.admin.internal.SystemMemberCacheImpl
+ implements org.apache.geode.admin.jmx.internal.ManagedResource {
/** The object name of this managed resource */
private ObjectName objectName;
-
+
/** collection to collect all the resources created for this member */
- private Map<String, SystemMemberRegionJmxImpl> managedRegionResourcesMap = new HashMap<String, SystemMemberRegionJmxImpl>();
- private Map<Number, SystemMemberBridgeServerJmxImpl> managedCacheServerResourcesMap = new HashMap<Number, SystemMemberBridgeServerJmxImpl>();
+ private Map<String, SystemMemberRegionJmxImpl> managedRegionResourcesMap =
+ new HashMap<String, SystemMemberRegionJmxImpl>();
+ private Map<Number, SystemMemberBridgeServerJmxImpl> managedCacheServerResourcesMap =
+ new HashMap<Number, SystemMemberBridgeServerJmxImpl>();
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
-
- /**
+
+ /**
* Constructs an instance of SystemMemberCacheJmxImpl.
*
- * @param vm
- * The vm owning the cache this object will manage
+ * @param vm The vm owning the cache this object will manage
*/
- public SystemMemberCacheJmxImpl(GemFireVM vm)
- throws org.apache.geode.admin.AdminException {
+ public SystemMemberCacheJmxImpl(GemFireVM vm) throws org.apache.geode.admin.AdminException {
super(vm);
initializeMBean();
}
/** Create and register the MBean to manage this resource */
- private void initializeMBean()
- throws org.apache.geode.admin.AdminException {
- this.mbeanName = new StringBuffer("GemFire.Cache:")
- .append("name=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(getName()))
- .append(",id=")
- .append(getId())
- .append(",owner=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(vm.getId().toString()))
+ private void initializeMBean() throws org.apache.geode.admin.AdminException {
+ this.mbeanName = new StringBuffer("GemFire.Cache:").append("name=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(getName())).append(",id=").append(getId())
+ .append(",owner=").append(MBeanUtil.makeCompliantMBeanNameProperty(vm.getId().toString()))
.append(",type=Cache").toString();
-
- this.objectName =
- MBeanUtil.createMBean(this,
- addDynamicAttributes(MBeanUtil.lookupManagedBean(this)));
+
+ this.objectName =
+ MBeanUtil.createMBean(this, addDynamicAttributes(MBeanUtil.lookupManagedBean(this)));
}
-
+
// -------------------------------------------------------------------------
- // Template methods overriden from superclass...
+ // Template methods overriden from superclass...
// -------------------------------------------------------------------------
/**
- * Override createSystemMemberRegion by instantiating
- * SystemMemberRegionJmxImpl. This instance is also added to the
- * managedResources collection.
+ * Override createSystemMemberRegion by instantiating SystemMemberRegionJmxImpl. This instance is
+ * also added to the managedResources collection.
*
- * @param r
- * reference to Region instance for which this JMX resource is to be
- * created
- * @return SystemMemberRegionJmxImpl - JMX Implementation of
- * SystemMemberRegion
- * @throws AdminException
- * if constructing SystemMemberRegionJmxImpl instance fails
+ * @param r reference to Region instance for which this JMX resource is to be created
+ * @return SystemMemberRegionJmxImpl - JMX Implementation of SystemMemberRegion
+ * @throws AdminException if constructing SystemMemberRegionJmxImpl instance fails
*/
- @Override
+ @Override
protected SystemMemberRegion createSystemMemberRegion(Region r)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
SystemMemberRegionJmxImpl managedSystemMemberRegion = null;
boolean needsRefresh = false;
synchronized (this.managedRegionResourcesMap) {
- /*
- * Ensuring that a single instance of System Member Region is created
- * per Region.
+ /*
+ * Ensuring that a single instance of System Member Region is created per Region.
*/
SystemMemberRegionJmxImpl managedResource = managedRegionResourcesMap.get(r.getFullPath());
if (managedResource != null) {
@@ -133,28 +118,24 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource {
}
/**
- * Creates a SystemMemberBridgeServerJmxImpl instance. This instance is also
- * added to the managedResources collection.
+ * Creates a SystemMemberBridgeServerJmxImpl instance. This instance is also added to the
+ * managedResources collection.
*
- * @param bridge
- * reference to AdminBridgeServer for which this JMX resource is to
- * be created
- * @return SystemMemberBridgeServerJmxImpl - JMX Implementation of
- * SystemMemberBridgeServerImpl
- * @throws AdminException
- * if constructing SystemMemberBridgeServerJmxImpl instance fails
+ * @param bridge reference to AdminBridgeServer for which this JMX resource is to be created
+ * @return SystemMemberBridgeServerJmxImpl - JMX Implementation of SystemMemberBridgeServerImpl
+ * @throws AdminException if constructing SystemMemberBridgeServerJmxImpl instance fails
*/
- @Override
- protected SystemMemberBridgeServerImpl
- createSystemMemberBridgeServer(AdminBridgeServer bridge)
- throws AdminException {
+ @Override
+ protected SystemMemberBridgeServerImpl createSystemMemberBridgeServer(AdminBridgeServer bridge)
+ throws AdminException {
SystemMemberBridgeServerJmxImpl managedSystemMemberBridgeServer = null;
synchronized (this.managedCacheServerResourcesMap) {
- /*
- * Ensuring that a single instance of SystemMember BridgeServer is
- * created per AdminBridgeServer.
+ /*
+ * Ensuring that a single instance of SystemMember BridgeServer is created per
+ * AdminBridgeServer.
*/
- SystemMemberBridgeServerJmxImpl managedCacheServerResource = managedCacheServerResourcesMap.get(bridge.getId());
+ SystemMemberBridgeServerJmxImpl managedCacheServerResource =
+ managedCacheServerResourcesMap.get(bridge.getId());
if (managedCacheServerResource != null) {
managedSystemMemberBridgeServer = managedCacheServerResource;
} else {
@@ -166,24 +147,25 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource {
}
// -------------------------------------------------------------------------
- // Create MBean attributes for each Statistic
+ // Create MBean attributes for each Statistic
// -------------------------------------------------------------------------
-
+
/**
* Add MBean attribute definitions for each Statistic.
*
- * @param managed the mbean definition to add attributes to
- * @return a new instance of ManagedBean copied from <code>managed</code> but
- * with the new attributes added
+ * @param managed the mbean definition to add attributes to
+ * @return a new instance of ManagedBean copied from <code>managed</code> but with the new
+ * attributes added
*/
ManagedBean addDynamicAttributes(ManagedBean managed)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
if (managed == null) {
- throw new IllegalArgumentException(LocalizedStrings.SystemMemberCacheJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.SystemMemberCacheJmxImpl_MANAGEDBEAN_IS_NULL.toLocalizedString());
}
-
+
refresh(); // to get the stats...
-
+
// need to create a new instance of ManagedBean to clean the "slate"...
ManagedBean newManagedBean = new DynamicManagedBean(managed);
for (int i = 0; i < this.statistics.length; i++) {
@@ -199,7 +181,7 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource {
attrInfo.setWriteable(false);
attrInfo.setStat(this.statistics[i]);
-
+
newManagedBean.addAttribute(attrInfo);
}
@@ -207,17 +189,15 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource {
}
// -------------------------------------------------------------------------
- // MBean Operations
+ // MBean Operations
// -------------------------------------------------------------------------
- /**
+ /**
* Returns the ObjectName of the Region for the specified path.
*
- * @throws AdminException
- * If no region with path <code>path</code> exists
+ * @throws AdminException If no region with path <code>path</code> exists
*/
- public ObjectName manageRegion(String path)
- throws AdminException, MalformedObjectNameException {
+ public ObjectName manageRegion(String path) throws AdminException, MalformedObjectNameException {
try {
SystemMemberRegionJmxImpl region = null;
@@ -230,143 +210,139 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource {
}
if (region == null) {
- throw new AdminException(LocalizedStrings.SystemMemberCacheJmxImpl_THIS_CACHE_DOES_NOT_CONTAIN_REGION_0.toLocalizedString(path));
-
+ throw new AdminException(
+ LocalizedStrings.SystemMemberCacheJmxImpl_THIS_CACHE_DOES_NOT_CONTAIN_REGION_0
+ .toLocalizedString(path));
+
} else {
return ObjectName.getInstance(region.getMBeanName());
}
- } catch (RuntimeException e) {
+ } catch (RuntimeException e) {
MBeanUtil.logStackTrace(Level.WARN, e);
- throw e;
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
MBeanUtil.logStackTrace(Level.ERROR, e);
- throw e;
+ throw e;
}
}
/**
- * Creates a new cache server MBean and returns its
- * <code>ObjectName</code>.
+ * Creates a new cache server MBean and returns its <code>ObjectName</code>.
*
* @since GemFire 5.7
*/
- public ObjectName manageCacheServer()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName manageCacheServer() throws AdminException, MalformedObjectNameException {
try {
- SystemMemberBridgeServerJmxImpl bridge =
- (SystemMemberBridgeServerJmxImpl) addCacheServer();
+ SystemMemberBridgeServerJmxImpl bridge = (SystemMemberBridgeServerJmxImpl) addCacheServer();
return ObjectName.getInstance(bridge.getMBeanName());
- } catch (AdminException e) {
- MBeanUtil.logStackTrace(Level.WARN, e);
- throw e;
- } catch (RuntimeException e) {
- MBeanUtil.logStackTrace(Level.WARN, e);
- throw e;
+ } catch (AdminException e) {
+ MBeanUtil.logStackTrace(Level.WARN, e);
+ throw e;
+ } catch (RuntimeException e) {
+ MBeanUtil.logStackTrace(Level.WARN, e);
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- MBeanUtil.logStackTrace(Level.ERROR, e);
- throw e;
+ MBeanUtil.logStackTrace(Level.ERROR, e);
+ throw e;
}
}
/**
- * Returns the MBean <code>ObjectName</code>s for all cache servers
- * that serve this cache to clients.
+ * Returns the MBean <code>ObjectName</code>s for all cache servers that serve this cache to
+ * clients.
*
* @since GemFire 4.0
*/
- public ObjectName[] manageCacheServers()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName[] manageCacheServers() throws AdminException, MalformedObjectNameException {
try {
SystemMemberCacheServer[] bridges = getCacheServers();
ObjectName[] names = new ObjectName[bridges.length];
for (int i = 0; i < bridges.length; i++) {
- SystemMemberBridgeServerJmxImpl bridge =
- (SystemMemberBridgeServerJmxImpl) bridges[i];
+ SystemMemberBridgeServerJmxImpl bridge = (SystemMemberBridgeServerJmxImpl) bridges[i];
names[i] = ObjectName.getInstance(bridge.getMBeanName());
}
return names;
- } catch (AdminException e) {
- MBeanUtil.logStackTrace(Level.WARN, e);
- throw e;
- } catch (RuntimeException e) {
- MBeanUtil.logStackTrace(Level.WARN, e);
- throw e;
+ } catch (AdminException e) {
+ MBeanUtil.logStackTrace(Level.WARN, e);
+ throw e;
+ } catch (RuntimeException e) {
+ MBeanUtil.logStackTrace(Level.WARN, e);
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- MBeanUtil.logStackTrace(Level.ERROR, e);
+ MBeanUtil.logStackTrace(Level.ERROR, e);
throw e;
}
}
/**
- * Returns the MBean <code>ObjectName</code>s for all bridge servers
- * that serve this cache.
+ * Returns the MBean <code>ObjectName</code>s for all bridge servers that serve this cache.
*
* @since GemFire 4.0
* @deprecated as of 5.7
*/
@Deprecated
- public ObjectName[] manageBridgeServers()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName[] manageBridgeServers() throws AdminException, MalformedObjectNameException {
return manageCacheServers();
}
// -------------------------------------------------------------------------
- // ManagedResource implementation
+ // ManagedResource implementation
// -------------------------------------------------------------------------
-
+
/** The name of the MBean that will manage this resource */
private String mbeanName;
/** The ModelMBean that is configured to manage this resource */
private ModelMBean modelMBean;
-
- public String getMBeanName() {
- return this.mbeanName;
- }
-
- public ModelMBean getModelMBean() {
- return this.modelMBean;
- }
- public void setModelMBean(ModelMBean modelMBean) {
- this.modelMBean = modelMBean;
- }
-
+
+ public String getMBeanName() {
+ return this.mbeanName;
+ }
+
+ public ModelMBean getModelMBean() {
+ return this.modelMBean;
+ }
+
+ public void setModelMBean(ModelMBean modelMBean) {
+ this.modelMBean = modelMBean;
+ }
+
public ObjectName getObjectName() {
return this.objectName;
}
@@ -375,61 +351,60 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource {
return ManagedResourceType.SYSTEM_MEMBER_CACHE;
}
-
+
/**
- * Un-registers all the statistics & cache managed resource created for this
- * member. After un-registering the resource MBean instances, clears
- * this.memberResources collection.
+ * Un-registers all the statistics & cache managed resource created for this member. After
+ * un-registering the resource MBean instances, clears this.memberResources collection.
*
- * Creates ConfigurationParameterJmxImpl, StatisticResourceJmxImpl and
- * SystemMemberCacheJmxImpl. But cleans up only StatisticResourceJmxImpl and
- * SystemMemberCacheJmxImpl which are of type ManagedResource.
+ * Creates ConfigurationParameterJmxImpl, StatisticResourceJmxImpl and SystemMemberCacheJmxImpl.
+ * But cleans up only StatisticResourceJmxImpl and SystemMemberCacheJmxImpl which are of type
+ * ManagedResource.
*/
public void cleanupResource() {
synchronized (this.managedRegionResourcesMap) {
Collection<SystemMemberRegionJmxImpl> values = managedRegionResourcesMap.values();
-
+
for (SystemMemberRegionJmxImpl systemMemberRegionJmxImpl : values) {
MBeanUtil.unregisterMBean(systemMemberRegionJmxImpl);
}
-
+
this.managedRegionResourcesMap.clear();
}
-
+
synchronized (this.managedCacheServerResourcesMap) {
Collection<SystemMemberBridgeServerJmxImpl> values = managedCacheServerResourcesMap.values();
-
+
for (SystemMemberBridgeServerJmxImpl SystemMemberBridgeServerJmxImpl : values) {
MBeanUtil.unregisterMBean(SystemMemberBridgeServerJmxImpl);
}
-
+
this.managedCacheServerResourcesMap.clear();
}
}
/**
- * Cleans up managed resources created for the region that was (created and)
- * destroyed in a cache represented by this Managed Resource.
+ * Cleans up managed resources created for the region that was (created and) destroyed in a cache
+ * represented by this Managed Resource.
*
- * @param regionPath
- * path of the region that got destroyed
+ * @param regionPath path of the region that got destroyed
* @return a managed resource related to this region path
*/
public ManagedResource cleanupRegionResources(String regionPath) {
ManagedResource cleaned = null;
-
+
synchronized (this.managedRegionResourcesMap) {
Set<Entry<String, SystemMemberRegionJmxImpl>> entries = managedRegionResourcesMap.entrySet();
- for (Iterator<Entry<String, SystemMemberRegionJmxImpl>> it = entries.iterator(); it.hasNext();) {
+ for (Iterator<Entry<String, SystemMemberRegionJmxImpl>> it = entries.iterator(); it
+ .hasNext();) {
Entry<String, SystemMemberRegionJmxImpl> entry = it.next();
SystemMemberRegionJmxImpl managedResource = entry.getValue();
- ObjectName objName = managedResource.getObjectName();
-
+ ObjectName objName = managedResource.getObjectName();
+
String pathProp = objName.getKeyProperty("path");
if (pathProp != null && pathProp.equals(regionPath)) {
cleaned = managedResource;
it.remove();
-
+
break;
}
}
@@ -437,31 +412,28 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource {
return cleaned;
}
-
+
/**
- * Checks equality of the given object with <code>this</code> based on the
- * type (Class) and the MBean Name returned by <code>getMBeanName()</code>
- * methods.
+ * Checks equality of the given object with <code>this</code> based on the type (Class) and the
+ * MBean Name returned by <code>getMBeanName()</code> methods.
*
- * @param obj
- * object to check equality with
- * @return true if the given object is if the same type and its MBean Name is
- * same as <code>this</code> object's MBean Name, false otherwise
+ * @param obj object to check equality with
+ * @return true if the given object is if the same type and its MBean Name is same as
+ * <code>this</code> object's MBean Name, false otherwise
*/
@Override
public boolean equals(Object obj) {
- if ( !(obj instanceof SystemMemberCacheJmxImpl) ) {
+ if (!(obj instanceof SystemMemberCacheJmxImpl)) {
return false;
}
-
+
SystemMemberCacheJmxImpl other = (SystemMemberCacheJmxImpl) obj;
return this.getMBeanName().equals(other.getMBeanName());
}
-
+
/**
- * Returns hash code for <code>this</code> object which is based on the MBean
- * Name generated.
+ * Returns hash code for <code>this</code> object which is based on the MBean Name generated.
*
* @return hash code for <code>this</code> object
*/
[27/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java b/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
index b785125..5b4e59e 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
@@ -1,18 +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
+ * 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.admin;
@@ -39,10 +37,12 @@ import java.net.InetAddress;
import java.util.*;
/**
- * Class <code>GemFireMemberStatus</code> provides the status of a specific
- * GemFire member VM. This VM can be a peer, a client, a server and/or a
- * gateway.
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * Class <code>GemFireMemberStatus</code> provides the status of a specific GemFire member VM. This
+ * VM can be a peer, a client, a server and/or a gateway.
+ *
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class GemFireMemberStatus implements Serializable {
private static final long serialVersionUID = 3389997790525991310L;
@@ -69,7 +69,7 @@ public class GemFireMemberStatus implements Serializable {
protected boolean _isPrimaryGatewayHub;
- protected Object/*GatewayHubStatus*/ _gatewayHubStatus;
+ protected Object/* GatewayHubStatus */ _gatewayHubStatus;
protected boolean _isConnected;
protected Serializable _memberId;
@@ -96,11 +96,11 @@ public class GemFireMemberStatus implements Serializable {
protected long _maximumHeapSize;
protected long _freeHeapSize;
-
+
protected long upTime = -1;
protected transient final Cache cache;
-
+
public GemFireMemberStatus() {
this(null);
}
@@ -124,6 +124,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* Returns whether this member is a client to a cache server
+ *
* @return whether this member is a client to a cache server
*/
public boolean getIsClient() {
@@ -132,8 +133,8 @@ public class GemFireMemberStatus implements Serializable {
/**
* Sets whether this member is a client to a cache server
- * @param isClient Boolean defining whether this member is a client to a
- * cache server
+ *
+ * @param isClient Boolean defining whether this member is a client to a cache server
*/
protected void setIsClient(boolean isClient) {
this._isClient = isClient;
@@ -141,6 +142,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* Returns whether this member is a cache server
+ *
* @return whether this member is a cache server
*/
public boolean getIsServer() {
@@ -149,6 +151,7 @@ public class GemFireMemberStatus implements Serializable {
/**
* Sets whether this member is a cache server
+ *
* @param isServer Boolean defining whether this member is a cache server
*/
protected void setIsServer(boolean isServer) {
@@ -156,15 +159,16 @@ public class GemFireMemberStatus implements Serializable {
}
public int getServerPort() {
- return this._serverPort;
+ return this._serverPort;
}
-
+
protected void setServerPort(int port) {
- this._serverPort = port;
+ this._serverPort = port;
}
-
+
/**
* Returns whether this member is a hub for WAN gateways
+ *
* @return whether this member is a hub for WAN gateways
*/
public boolean getIsGatewayHub() {
@@ -173,8 +177,8 @@ public class GemFireMemberStatus implements Serializable {
/**
* Sets whether this member is a cache server
- * @param isGatewayHub Boolean defining whether this member is a hub for
- * WAN gateways
+ *
+ * @param isGatewayHub Boolean defining whether this member is a hub for WAN gateways
*/
protected void setIsGatewayHub(boolean isGatewayHub) {
this._isGatewayHub = isGatewayHub;
@@ -198,15 +202,16 @@ public class GemFireMemberStatus implements Serializable {
/**
* For internal use only
+ *
* @return status of the gateway hub
*/
- public Object/*GatewayHubStatus*/ getGatewayHubStatus() {
+ public Object/* GatewayHubStatus */ getGatewayHubStatus() {
return this._gatewayHubStatus;
}
-// protected void setGatewayHubStatus(GatewayHubStatus gatewayHubStatus) {
-// this._gatewayHubStatus = gatewayHubStatus;
-// }
+ // protected void setGatewayHubStatus(GatewayHubStatus gatewayHubStatus) {
+ // this._gatewayHubStatus = gatewayHubStatus;
+ // }
public boolean getIsSecondaryGatewayHub() {
return !this._isPrimaryGatewayHub;
@@ -253,7 +258,7 @@ public class GemFireMemberStatus implements Serializable {
}
public Map getOutgoingGateways() {
- return this._outgoingGateways;
+ return this._outgoingGateways;
}
public Map getConnectedIncomingGateways() {
@@ -284,42 +289,44 @@ public class GemFireMemberStatus implements Serializable {
public Map getClientHealthStats() {
return this._clientHealthStats;
}
-
+
protected void setClientHealthStats(Map stats) {
this._clientHealthStats = stats;
}
-
+
/**
* For internal use only
+ *
* @param clientID client for health
* @return the client's health
*/
- public Object/*ClientHealthStats*/ getClientHealthStats(String clientID) {
+ public Object/* ClientHealthStats */ getClientHealthStats(String clientID) {
return this._clientHealthStats.get(clientID);
}
-
+
protected void setClientHealthStats(String clientID, ClientHealthStats stats) {
this._clientHealthStats.put(clientID, stats);
}
-
+
protected void putClientHostName(String clientId, String hostName) {
this._clientHostNames.put(clientId, hostName);
}
-
+
public String getClientHostName(String clientId) {
- return (String)this._clientHostNames.get(clientId);
+ return (String) this._clientHostNames.get(clientId);
}
-
+
public Map getRegionStatuses() {
return this._regionStatuses;
}
/**
* For internal use only
+ *
* @param fullRegionPath region path
* @return status for the region
*/
- public Object/*RegionStatus*/ getRegionStatus(String fullRegionPath) {
+ public Object/* RegionStatus */ getRegionStatus(String fullRegionPath) {
return getRegionStatuses().get(fullRegionPath);
}
@@ -402,11 +409,11 @@ public class GemFireMemberStatus implements Serializable {
public long getUsedHeapSize() {
return getMaximumHeapSize() - getFreeHeapSize();
}
-
+
public long getUpTime() {
return upTime;
}
-
+
public void setUpTime(long upTime) {
this.upTime = upTime;
}
@@ -414,66 +421,29 @@ public class GemFireMemberStatus implements Serializable {
@Override
public String toString() {
StringBuffer buffer = new StringBuffer();
- buffer
- .append("GemFireMemberStatus[")
- .append("isConnected=")
- .append(this._isConnected)
- .append("; memberName=")
- .append(this._memberName)
- .append("; memberId=")
- .append(this._memberId)
- .append("; hostAddress=")
- .append(this._hostAddress)
- .append("; mcastPort=")
- .append(this._mcastPort)
- .append("; mcastAddress=")
- .append(this._mcastAddress)
- .append("; bindAddress=")
- .append(this._bindAddress)
- .append("; serverPort=")
- .append(this._serverPort)
- .append("; locators=")
- .append(this._locators)
- .append("; isClient=")
- .append(this._isClient)
- .append("; isServer=")
- .append(this._isServer)
- .append("; isGatewayHub=")
- .append(this._isGatewayHub)
- .append("; isLocator=")
- .append(this._isLocator)
- .append("; isPrimaryGatewayHub=")
- .append(this._isPrimaryGatewayHub)
- .append("; gatewayHubStatus=")
- .append(this._gatewayHubStatus)
- .append("; connectedPeers=")
- .append(this._connectedPeers)
- .append("; connectedServers=")
- .append(this._connectedServers)
- .append("; unconnectedServers=")
- .append(this._unconnectedServers)
- .append("; connectedClients=")
- .append(this._connectedClients)
- .append("; clientHostNames=")
- .append(this._clientHostNames)
- .append("; clientQueueSizes=")
- .append(this._clientQueueSizes)
- .append("; clientHealthStats=")
- .append(this._clientHealthStats)
- .append("; gatewayQueueSizes=")
- .append(this._gatewayQueueSizes)
- .append("; regionStatuses=")
- .append(this._regionStatuses)
- .append("; maximumHeapSize=")
- .append(this._maximumHeapSize)
- .append("; freeHeapSize=")
- .append(this._freeHeapSize)
- .append("; upTime=")
- .append(this.upTime)
- .append("]");
+ buffer.append("GemFireMemberStatus[").append("isConnected=").append(this._isConnected)
+ .append("; memberName=").append(this._memberName).append("; memberId=")
+ .append(this._memberId).append("; hostAddress=").append(this._hostAddress)
+ .append("; mcastPort=").append(this._mcastPort).append("; mcastAddress=")
+ .append(this._mcastAddress).append("; bindAddress=").append(this._bindAddress)
+ .append("; serverPort=").append(this._serverPort).append("; locators=")
+ .append(this._locators).append("; isClient=").append(this._isClient).append("; isServer=")
+ .append(this._isServer).append("; isGatewayHub=").append(this._isGatewayHub)
+ .append("; isLocator=").append(this._isLocator).append("; isPrimaryGatewayHub=")
+ .append(this._isPrimaryGatewayHub).append("; gatewayHubStatus=")
+ .append(this._gatewayHubStatus).append("; connectedPeers=").append(this._connectedPeers)
+ .append("; connectedServers=").append(this._connectedServers)
+ .append("; unconnectedServers=").append(this._unconnectedServers)
+ .append("; connectedClients=").append(this._connectedClients).append("; clientHostNames=")
+ .append(this._clientHostNames).append("; clientQueueSizes=").append(this._clientQueueSizes)
+ .append("; clientHealthStats=").append(this._clientHealthStats)
+ .append("; gatewayQueueSizes=").append(this._gatewayQueueSizes).append("; regionStatuses=")
+ .append(this._regionStatuses).append("; maximumHeapSize=").append(this._maximumHeapSize)
+ .append("; freeHeapSize=").append(this._freeHeapSize).append("; upTime=")
+ .append(this.upTime).append("]");
return buffer.toString();
}
-
+
protected void initialize(DistributedSystem distributedSystem) {
// Initialize instance variables
initializeInstanceVariables();
@@ -512,8 +482,8 @@ public class GemFireMemberStatus implements Serializable {
// Variables for gateway hubs
this._outgoingGateways = new HashMap();
- //this._connectedOutgoingGateways = new HashSet();
- //this._unconnectedOutgoingGateways = new HashSet();
+ // this._connectedOutgoingGateways = new HashSet();
+ // this._unconnectedOutgoingGateways = new HashSet();
this._connectedIncomingGateways = new HashMap();
this._gatewayQueueSizes = new HashMap();
@@ -537,55 +507,56 @@ public class GemFireMemberStatus implements Serializable {
// The following method returns a map of client member id to a cache
// client info. For now, keep track of the member ids in the set of
// _connectedClients.
- Map allConnectedClients = InternalClientMembership.getStatusForAllClientsIgnoreSubscriptionStatus();
+ Map allConnectedClients =
+ InternalClientMembership.getStatusForAllClientsIgnoreSubscriptionStatus();
Iterator allConnectedClientsIterator = allConnectedClients.values().iterator();
while (allConnectedClientsIterator.hasNext()) {
CacheClientStatus ccs = (CacheClientStatus) allConnectedClientsIterator.next();
addConnectedClient(ccs.getMemberId());
// host address is available directly by id, hence CacheClientStatus need not be populated
- putClientHostName(ccs.getMemberId(), ccs.getHostAddress());
+ putClientHostName(ccs.getMemberId(), ccs.getHostAddress());
}
// Get client queue sizes
Map clientQueueSize = getClientIDMap(InternalClientMembership.getClientQueueSizes());
setClientQueueSizes(clientQueueSize);
-
+
// Set server acceptor port (set it based on the first CacheServer)
CacheServer server = (CacheServer) servers.toArray()[0];
setServerPort(server.getPort());
-
+
// Get Client Health Stats
-// Assert.assertTrue(cache != null); (cannot be null)
- Region clientHealthMonitoringRegion = ClientHealthMonitoringRegion.getInstance(
- (GemFireCacheImpl)cache);
- if(clientHealthMonitoringRegion != null) {
- String [] clients = (String[])clientHealthMonitoringRegion.keySet().toArray(new String[0]);
+ // Assert.assertTrue(cache != null); (cannot be null)
+ Region clientHealthMonitoringRegion =
+ ClientHealthMonitoringRegion.getInstance((GemFireCacheImpl) cache);
+ if (clientHealthMonitoringRegion != null) {
+ String[] clients = (String[]) clientHealthMonitoringRegion.keySet().toArray(new String[0]);
for (int i = 0; i < clients.length; i++) {
String clientId = clients[i];
- ClientHealthStats stats = (ClientHealthStats)clientHealthMonitoringRegion.get(clientId);
+ ClientHealthStats stats = (ClientHealthStats) clientHealthMonitoringRegion.get(clientId);
setClientHealthStats(clientId, stats);
- }
+ }
}
}
}
-
- /**
- * returning Map of client queue size against client Id
- *
- * param clientMap is a Map of client queue size against ClientProxyMembershipID
- */
- private Map getClientIDMap(Map ClientProxyMembershipIDMap) {
- Map clientIdMap = new HashMap();
- Set entrySet = ClientProxyMembershipIDMap.entrySet();
- Iterator entries = entrySet.iterator();
- while (entries.hasNext()) {
- Map.Entry entry = (Map.Entry)entries.next();
- ClientProxyMembershipID key = (ClientProxyMembershipID)entry.getKey();
- Integer size = (Integer)entry.getValue();
- clientIdMap.put(key.getDSMembership(), size);
- }
- return clientIdMap;
- }
+
+ /**
+ * returning Map of client queue size against client Id
+ *
+ * param clientMap is a Map of client queue size against ClientProxyMembershipID
+ */
+ private Map getClientIDMap(Map ClientProxyMembershipIDMap) {
+ Map clientIdMap = new HashMap();
+ Set entrySet = ClientProxyMembershipIDMap.entrySet();
+ Iterator entries = entrySet.iterator();
+ while (entries.hasNext()) {
+ Map.Entry entry = (Map.Entry) entries.next();
+ ClientProxyMembershipID key = (ClientProxyMembershipID) entry.getKey();
+ Integer size = (Integer) entry.getValue();
+ clientIdMap.put(key.getDSMembership(), size);
+ }
+ return clientIdMap;
+ }
protected void initializeClient() {
Map poolMap = PoolManager.getAll();
@@ -607,13 +578,13 @@ public class GemFireMemberStatus implements Serializable {
while (connected.hasNext()) {
Map.Entry entry = (Map.Entry) connected.next();
String server = (String) entry.getKey();
-// Integer connections = (Integer) entry.getValue();
-// if (connections.intValue()==0) {
-// addUnconnectedServer(server);
-// } else {
- addConnectedServer(server);
-// }
- //System.out.println(connections.size() + " logical connnections to server " + server);
+ // Integer connections = (Integer) entry.getValue();
+ // if (connections.intValue()==0) {
+ // addUnconnectedServer(server);
+ // } else {
+ addConnectedServer(server);
+ // }
+ // System.out.println(connections.size() + " logical connnections to server " + server);
}
}
}
@@ -646,9 +617,9 @@ public class GemFireMemberStatus implements Serializable {
setUpTime(System.currentTimeMillis() - ids.getStartTime());
try {
setHostAddress((bindAddress != null && bindAddress.length() > 0)
- ? InetAddress.getByName(bindAddress)
- : SocketCreator.getLocalHost());
- } catch (IOException e) {/*ignore - leave null host address*/}
+ ? InetAddress.getByName(bindAddress) : SocketCreator.getLocalHost());
+ } catch (IOException e) {
+ /* ignore - leave null host address */}
}
protected void initializePeers(DistributedSystem distributedSystem) {
@@ -656,17 +627,18 @@ public class GemFireMemberStatus implements Serializable {
DM dm = ids.getDistributionManager();
Set connections = dm.getOtherNormalDistributionManagerIds();
Set connectionsIDs = new HashSet(connections.size());
- for (Iterator iter=connections.iterator(); iter.hasNext() ; ) {
- InternalDistributedMember idm = (InternalDistributedMember)iter.next();
+ for (Iterator iter = connections.iterator(); iter.hasNext();) {
+ InternalDistributedMember idm = (InternalDistributedMember) iter.next();
connectionsIDs.add(idm.getId());
}
setConnectedPeers(connectionsIDs);
}
protected void initializeMemory() {
- //InternalDistributedSystem system = (InternalDistributedSystem) region.getCache().getDistributedSystem();
- //GemFireStatSampler sampler = system.getStatSampler();
- //VMStatsContract statsContract = sampler.getVMStats();
+ // InternalDistributedSystem system = (InternalDistributedSystem)
+ // region.getCache().getDistributedSystem();
+ // GemFireStatSampler sampler = system.getStatSampler();
+ // VMStatsContract statsContract = sampler.getVMStats();
Runtime rt = Runtime.getRuntime();
setMaximumHeapSize(rt.maxMemory());
@@ -680,15 +652,15 @@ public class GemFireMemberStatus implements Serializable {
LocalRegion rootRegion = (LocalRegion) rootRegions.next();
if (!(rootRegion instanceof HARegion)) {
RegionStatus rootRegionStatus = rootRegion instanceof PartitionedRegion
- ? new PartitionedRegionStatus((PartitionedRegion) rootRegion)
- : new RegionStatus(rootRegion);
+ ? new PartitionedRegionStatus((PartitionedRegion) rootRegion)
+ : new RegionStatus(rootRegion);
putRegionStatus(rootRegion.getFullPath(), rootRegionStatus);
Iterator subRegions = rootRegion.subregions(true).iterator();
while (subRegions.hasNext()) {
LocalRegion subRegion = (LocalRegion) subRegions.next();
RegionStatus subRegionStatus = subRegion instanceof PartitionedRegion
- ? new PartitionedRegionStatus((PartitionedRegion) subRegion)
- : new RegionStatus(subRegion);
+ ? new PartitionedRegionStatus((PartitionedRegion) subRegion)
+ : new RegionStatus(subRegion);
putRegionStatus(subRegion.getFullPath(), subRegionStatus);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/ManagedEntity.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/ManagedEntity.java b/geode-core/src/main/java/org/apache/geode/admin/ManagedEntity.java
index 0b4851e..1eaa892 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/ManagedEntity.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/ManagedEntity.java
@@ -1,18 +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
+ * 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.admin;
@@ -22,101 +20,79 @@ package org.apache.geode.admin;
* @see ManagedEntityConfig
*
* @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface ManagedEntity {
/**
- * Starts this managed entity. Note that this method may return
- * before the managed entity is actually started.
+ * Starts this managed entity. Note that this method may return before the managed entity is
+ * actually started.
*
- * @throws AdminException
- * If a problem is encountered while starting this managed
- * entity.
- * @throws IllegalStateException
- * If this managed entity resides on a remote machine and a
- * <code>null</code> or empty (<code>""</code>) {@linkplain
- * ManagedEntityConfig#getRemoteCommand remote command} has
- * been specified.
+ * @throws AdminException If a problem is encountered while starting this managed entity.
+ * @throws IllegalStateException If this managed entity resides on a remote machine and a
+ * <code>null</code> or empty (<code>""</code>)
+ * {@linkplain ManagedEntityConfig#getRemoteCommand remote command} has been specified.
*
* @see #waitToStart
*/
public void start() throws AdminException;
/**
- * Stops this managed entity. Note that this method may return
- * before the managed entity is actually stopped.
+ * Stops this managed entity. Note that this method may return before the managed entity is
+ * actually stopped.
*
- * @throws AdminException
- * If a problem is encountered while stopping this managed
- * entity.
- * @throws IllegalStateException
- * If this managed entity resides on a remote machine and a
- * <code>null</code> or empty (<code>""</code>) {@linkplain
- * ManagedEntityConfig#getRemoteCommand remote command} has
- * been specified.
+ * @throws AdminException If a problem is encountered while stopping this managed entity.
+ * @throws IllegalStateException If this managed entity resides on a remote machine and a
+ * <code>null</code> or empty (<code>""</code>)
+ * {@linkplain ManagedEntityConfig#getRemoteCommand remote command} has been specified.
*
* @see #waitToStop
*/
public void stop() throws AdminException;
/**
- * Waits for up to a given number of milliseconds for this managed
- * entity to {@linkplain #start start}.
+ * Waits for up to a given number of milliseconds for this managed entity to {@linkplain #start
+ * start}.
*
- * @param timeout
- * The number of milliseconds to wait for this managed entity
- * to start.
+ * @param timeout The number of milliseconds to wait for this managed entity to start.
*
- * @return Whether or not the entity has started.
- * <code>false</code>, if the method times out.
+ * @return Whether or not the entity has started. <code>false</code>, if the method times out.
*
- * @throws InterruptedException
- * If the thread invoking this method is interrupted while
- * waiting.
+ * @throws InterruptedException If the thread invoking this method is interrupted while waiting.
*/
- public boolean waitToStart(long timeout)
- throws InterruptedException;
+ public boolean waitToStart(long timeout) throws InterruptedException;
/**
- * Waits for up to a given number of milliseconds for this managed
- * entity to {@linkplain #stop stop}.
+ * Waits for up to a given number of milliseconds for this managed entity to {@linkplain #stop
+ * stop}.
*
- * @param timeout
- * The number of milliseconds to wait for this managed entity
- * to stop.
+ * @param timeout The number of milliseconds to wait for this managed entity to stop.
*
- * @return Whether or not the entity has stopped.
- * <code>false</code>, if the method times out.
+ * @return Whether or not the entity has stopped. <code>false</code>, if the method times out.
*
- * @throws InterruptedException
- * If the thread invoking this method is interrupted while
- * waiting.
+ * @throws InterruptedException If the thread invoking this method is interrupted while waiting.
*/
- public boolean waitToStop(long timeout)
- throws InterruptedException;
+ public boolean waitToStop(long timeout) throws InterruptedException;
/**
- * Returns whether or not this managed entity is running. Note that
- * this operation may attempt to contact the managed entity.
+ * Returns whether or not this managed entity is running. Note that this operation may attempt to
+ * contact the managed entity.
*
- * @throws IllegalStateException
- * If this managed entity resides on a remote machine and a
- * <code>null</code> or empty (<code>""</code>) {@linkplain
- * ManagedEntityConfig#getRemoteCommand remote command} has
- * been specified.
+ * @throws IllegalStateException If this managed entity resides on a remote machine and a
+ * <code>null</code> or empty (<code>""</code>)
+ * {@linkplain ManagedEntityConfig#getRemoteCommand remote command} has been specified.
*/
public boolean isRunning();
/**
- * Returns the tail of this manage entity's log file. Note that not
- * all managed entities implement this functionality.
+ * Returns the tail of this manage entity's log file. Note that not all managed entities implement
+ * this functionality.
*
- * @throws AdminException
- * If a problem is encountered while getting the log of this
- * managed entity.
- * @throws UnsupportedOperationException
- * If this managed entity does not support retrieving its
+ * @throws AdminException If a problem is encountered while getting the log of this managed
+ * entity.
+ * @throws UnsupportedOperationException If this managed entity does not support retrieving its
* log.
*/
public String getLog() throws AdminException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/ManagedEntityConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/ManagedEntityConfig.java b/geode-core/src/main/java/org/apache/geode/admin/ManagedEntityConfig.java
index 9a95b44..0b7acd7 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/ManagedEntityConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/ManagedEntityConfig.java
@@ -1,38 +1,35 @@
/*
- * 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
+ * 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.admin;
/**
- * Common configuration for all entities that can be managed using the
- * GemFire administration API. Note that once a managed entity has
- * been {@linkplain ManagedEntity#start started}, attempts to modify
- * its configuration will cause an {@link IllegalStateException} to be
- * thrown.
+ * Common configuration for all entities that can be managed using the GemFire administration API.
+ * Note that once a managed entity has been {@linkplain ManagedEntity#start started}, attempts to
+ * modify its configuration will cause an {@link IllegalStateException} to be thrown.
*
* @see ManagedEntity
*
* @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface ManagedEntityConfig extends Cloneable {
/**
- * Returns the name of the host on which the managed entity runs or
- * will run.
+ * Returns the name of the host on which the managed entity runs or will run.
*/
public String getHost();
@@ -42,58 +39,50 @@ public interface ManagedEntityConfig extends Cloneable {
public void setHost(String host);
/**
- * Returns the name of the working directory in which the managed
- * entity runs or will run.
+ * Returns the name of the working directory in which the managed entity runs or will run.
*/
public String getWorkingDirectory();
/**
- * Sets the name of the working directory in which the managed
- * entity will run.
+ * Sets the name of the working directory in which the managed entity will run.
*/
public void setWorkingDirectory(String dir);
/**
- * Returns the name of the GemFire product directory to use when
- * administering the managed entity.
+ * Returns the name of the GemFire product directory to use when administering the managed entity.
*/
public String getProductDirectory();
/**
- * Sets the name of the GemFire product directory to use when
- * administering the managed entity.
+ * Sets the name of the GemFire product directory to use when administering the managed entity.
*/
public void setProductDirectory(String dir);
/**
- * Returns the command prefix used to administer a managed entity
- * that is hosted on a remote machine. If the remote command is
- * <code>null</code> (the default value), then the remote command
- * associated with the {@linkplain
- * AdminDistributedSystem#getRemoteCommand() distributed system}
- * will be used.
+ * Returns the command prefix used to administer a managed entity that is hosted on a remote
+ * machine. If the remote command is <code>null</code> (the default value), then the remote
+ * command associated with the {@linkplain AdminDistributedSystem#getRemoteCommand() distributed
+ * system} will be used.
*/
public String getRemoteCommand();
/**
- * Sets the command prefix used to administer a managed entity that
- * is hosted on a remote machine.
+ * Sets the command prefix used to administer a managed entity that is hosted on a remote machine.
*/
public void setRemoteCommand(String remoteCommand);
/**
* Validates this configuration.
*
- * @throws IllegalStateException
- * If a managed entity cannot be administered using this
- * configuration
+ * @throws IllegalStateException If a managed entity cannot be administered using this
+ * configuration
*/
public void validate();
/**
- * Returns a new <code>ManagedEntityConfig</code> with the same
- * configuration as this <code>ManagedEntityConfig</code>.
+ * Returns a new <code>ManagedEntityConfig</code> with the same configuration as this
+ * <code>ManagedEntityConfig</code>.
*/
- public Object clone() throws CloneNotSupportedException;
+ public Object clone() throws CloneNotSupportedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
index e0a90c6..63dd605 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/MemberHealthConfig.java
@@ -1,45 +1,41 @@
/*
- * 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
+ * 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.admin;
/**
- * Provides configuration information relating to the health of a
- * member of a GemFire distributed system.
+ * Provides configuration information relating to the health of a member of a GemFire distributed
+ * system.
*
* <P>
*
- * If any of the following criteria is true, then a member is
- * considered to be in {@link GemFireHealth#OKAY_HEALTH OKAY_HEALTH}.
+ * If any of the following criteria is true, then a member is considered to be in
+ * {@link GemFireHealth#OKAY_HEALTH OKAY_HEALTH}.
*
* <UL>
*
- * <LI>The size of the {@linkplain #getMaxVMProcessSize VM process} is
- * too large.</LI>
+ * <LI>The size of the {@linkplain #getMaxVMProcessSize VM process} is too large.</LI>
*
- * <LI>There are too many {@linkplain #getMaxMessageQueueSize enqueued}
- * incoming/outgoing messages.</LI>
+ * <LI>There are too many {@linkplain #getMaxMessageQueueSize enqueued} incoming/outgoing
+ * messages.</LI>
*
- * <LI>Too many message sends {@link #getMaxReplyTimeouts timeout}
- * while waiting for a reply.</LI>
+ * <LI>Too many message sends {@link #getMaxReplyTimeouts timeout} while waiting for a reply.</LI>
*
* </UL>
*
- * If any of the following criteria is true, then a member is
- * considered to be in {@link GemFireHealth#POOR_HEALTH POOR_HEALTH}.
+ * If any of the following criteria is true, then a member is considered to be in
+ * {@link GemFireHealth#POOR_HEALTH POOR_HEALTH}.
*
* <UL>
*
@@ -47,95 +43,100 @@ package org.apache.geode.admin;
*
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- * */
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
+ */
public interface MemberHealthConfig {
- /** The default maximum VM process size (in megabytes) of a health
- * member of the distributed system. The default value is 1000. */
+ /**
+ * The default maximum VM process size (in megabytes) of a health member of the distributed
+ * system. The default value is 1000.
+ */
public static final long DEFAULT_MAX_VM_PROCESS_SIZE = 1000;
- /** The default maximum number of enqueued incoming or outgoing
- * messages that a healthy member of a distributed system can have.
- * The default value is 1000. */
+ /**
+ * The default maximum number of enqueued incoming or outgoing messages that a healthy member of a
+ * distributed system can have. The default value is 1000.
+ */
public static final long DEFAULT_MAX_MESSAGE_QUEUE_SIZE = 1000;
- /** The default maximum number of message reply timeouts that can
- * occur in a given health monitoring interval. The default value
- * is zero. */
+ /**
+ * The default maximum number of message reply timeouts that can occur in a given health
+ * monitoring interval. The default value is zero.
+ */
public static final long DEFAULT_MAX_REPLY_TIMEOUTS = 0;
- /** The default maximum multicast retransmission ratio. The default
- * value is 0.20 (twenty percent of messages retransmitted)
+ /**
+ * The default maximum multicast retransmission ratio. The default value is 0.20 (twenty percent
+ * of messages retransmitted)
*/
public static final double DEFAULT_MAX_RETRANSMISSION_RATIO = 0.20;
-
- /////////////////////// Instance Methods ///////////////////////
+
+ /////////////////////// Instance Methods ///////////////////////
/**
- * Returns the maximum VM process size (in megabytes) of a healthy
- * member of the distributed system.
+ * Returns the maximum VM process size (in megabytes) of a healthy member of the distributed
+ * system.
*
* @see #DEFAULT_MAX_VM_PROCESS_SIZE
*/
public long getMaxVMProcessSize();
/**
- * Sets the maximum VM process size (in megabytes) of a healthy
- * member of the distributed system.
+ * Sets the maximum VM process size (in megabytes) of a healthy member of the distributed system.
*
* @see #getMaxVMProcessSize
*/
public void setMaxVMProcessSize(long size);
-
+
/**
- * Returns the maximum number of enqueued incoming or outgoing
- * messages that a healthy member of a distributed system can have.
+ * Returns the maximum number of enqueued incoming or outgoing messages that a healthy member of a
+ * distributed system can have.
*
* @see #DEFAULT_MAX_MESSAGE_QUEUE_SIZE
*/
public long getMaxMessageQueueSize();
/**
- * Sets the maximum number of enqueued incoming or outgoing
- * messages that a healthy member of a distributed system can have.
+ * Sets the maximum number of enqueued incoming or outgoing messages that a healthy member of a
+ * distributed system can have.
*
* @see #getMaxMessageQueueSize
*/
public void setMaxMessageQueueSize(long maxMessageQueueSize);
/**
- * Returns the maximum number message replies that can timeout in a
- * healthy member.
+ * Returns the maximum number message replies that can timeout in a healthy member.
*
* @see #DEFAULT_MAX_REPLY_TIMEOUTS
*/
public long getMaxReplyTimeouts();
/**
- * Sets the maximum number message replies that can timeout in a
- * healthy member.
+ * Sets the maximum number message replies that can timeout in a healthy member.
*
* @see #getMaxReplyTimeouts
*/
public void setMaxReplyTimeouts(long maxReplyTimeouts);
/**
- * Returns the maximum ratio of multicast retransmissions / total multicast
- * messages. Retransmissions are requestor-specific (i.e., unicast), so
- * a single lost message may result in multiple retransmissions.<p>
- * A high retransmission ratio may indicate
- * poor network conditions requiring reduced flow-control settings,
- * a udp-fragment-size setting that is too high.
+ * Returns the maximum ratio of multicast retransmissions / total multicast messages.
+ * Retransmissions are requestor-specific (i.e., unicast), so a single lost message may result in
+ * multiple retransmissions.
+ * <p>
+ * A high retransmission ratio may indicate poor network conditions requiring reduced flow-control
+ * settings, a udp-fragment-size setting that is too high.
+ *
* @see #DEFAULT_MAX_RETRANSMISSION_RATIO
*/
public double getMaxRetransmissionRatio();
-
+
/**
- * Sets the maximum ratio of multicast retransmissions / total multicast
- * messages.
+ * Sets the maximum ratio of multicast retransmissions / total multicast messages.
+ *
* @see #getMaxRetransmissionRatio
*/
public void setMaxRetransmissionRatio(double ratio);
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java b/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
index d765c21..0328641 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/OperationCancelledException.java
@@ -1,48 +1,47 @@
/*
- * 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
+ * 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.admin;
-//import org.apache.geode.GemFireException;
+// import org.apache.geode.GemFireException;
/**
- * Thrown when an administration operation that accesses information
- * in a remote system member is cancelled. The cancelation may occur
- * because the system member has left the distributed system.
+ * Thrown when an administration operation that accesses information in a remote system member is
+ * cancelled. The cancelation may occur because the system member has left the distributed system.
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class OperationCancelledException extends RuntimeAdminException {
- private static final long serialVersionUID = 5474068770227602546L;
-
- public OperationCancelledException() {
- super();
- }
-
- public OperationCancelledException( String message ) {
- super( message );
- }
-
- public OperationCancelledException( Throwable cause ){
- super(cause);
- }
-
- public OperationCancelledException( String message, Throwable cause ) {
- super(message, cause);
- }
+ private static final long serialVersionUID = 5474068770227602546L;
+
+ public OperationCancelledException() {
+ super();
+ }
+
+ public OperationCancelledException(String message) {
+ super(message);
+ }
+
+ public OperationCancelledException(Throwable cause) {
+ super(cause);
+ }
+
+ public OperationCancelledException(String message, Throwable cause) {
+ super(message, cause);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/RegionNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/RegionNotFoundException.java b/geode-core/src/main/java/org/apache/geode/admin/RegionNotFoundException.java
index 29dfa98..e849a70 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/RegionNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/RegionNotFoundException.java
@@ -1,39 +1,39 @@
/*
- * 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
+ * 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.admin;
-//import org.apache.geode.cache.CacheException;
+// import org.apache.geode.cache.CacheException;
import org.apache.geode.cache.CacheRuntimeException;
/**
- * Thrown by the administration API when the region administered by a
- * {@link SystemMemberRegion} has been closed or destroyed in system
- * member.
- * <P>Also thrown by {@link org.apache.geode.DataSerializer#readRegion(java.io.DataInput)}
- * if the named region no longer exists.
+ * Thrown by the administration API when the region administered by a {@link SystemMemberRegion} has
+ * been closed or destroyed in system member.
+ * <P>
+ * Also thrown by {@link org.apache.geode.DataSerializer#readRegion(java.io.DataInput)} if the named
+ * region no longer exists.
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class RegionNotFoundException extends CacheRuntimeException {
-private static final long serialVersionUID = 1758668137691463909L;
+ private static final long serialVersionUID = 1758668137691463909L;
public RegionNotFoundException(String message) {
super(message);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
index 1945566..19f89b2 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/RegionSubRegionSnapshot.java
@@ -1,18 +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
+ * 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.admin;
@@ -30,16 +28,18 @@ import org.apache.geode.i18n.LogWriterI18n;
import org.apache.geode.internal.cache.PartitionedRegion;
/**
- * Class <code>RegionSubRegionSnapshot</code> provides information about
- * <code>Region</code>s. This also provides the information about sub regions
- * This class is used by the monitoring tool.
+ * Class <code>RegionSubRegionSnapshot</code> provides information about <code>Region</code>s. This
+ * also provides the information about sub regions This class is used by the monitoring tool.
*
*
* @since GemFire 5.7
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class RegionSubRegionSnapshot implements DataSerializable {
private static final long serialVersionUID = -8052137675270041871L;
+
public RegionSubRegionSnapshot() {
this.parent = null;
this.subRegionSnapshots = new HashSet();
@@ -49,25 +49,22 @@ public class RegionSubRegionSnapshot implements DataSerializable {
this();
this.name = reg.getName();
if (reg instanceof PartitionedRegion) {
- PartitionedRegion p_reg = (PartitionedRegion)reg;
+ PartitionedRegion p_reg = (PartitionedRegion) reg;
this.entryCount = p_reg.entryCount(true);
- }
- else {
+ } else {
this.entryCount = reg.entrySet().size();
}
final LogWriterI18n logger = reg.getCache().getLoggerI18n();
- if((logger != null) && logger.fineEnabled()) {
- logger.fine(
- "RegionSubRegionSnapshot Region entry count =" + this.entryCount
- + " for region =" + this.name);
+ if ((logger != null) && logger.fineEnabled()) {
+ logger.fine("RegionSubRegionSnapshot Region entry count =" + this.entryCount + " for region ="
+ + this.name);
}
}
/**
* add the snapshot of sub region
*
- * @param snap
- * snapshot of sub region
+ * @param snap snapshot of sub region
* @return true if operation is successful
*/
public boolean addSubRegion(RegionSubRegionSnapshot snap) {
@@ -91,8 +88,7 @@ public class RegionSubRegionSnapshot implements DataSerializable {
}
/**
- * @param entryCount
- * entry count of region
+ * @param entryCount entry count of region
*/
public final void setEntryCount(int entryCount) {
this.entryCount = entryCount;
@@ -106,8 +102,7 @@ public class RegionSubRegionSnapshot implements DataSerializable {
}
/**
- * @param name
- * name of region
+ * @param name name of region
*/
public final void setName(String name) {
this.name = name;
@@ -121,8 +116,7 @@ public class RegionSubRegionSnapshot implements DataSerializable {
}
/**
- * @param subRegionSnapshots
- * subRegionSnapshots of all the sub regions
+ * @param subRegionSnapshots subRegionSnapshots of all the sub regions
*/
public final void setSubRegionSnapshots(Set subRegionSnapshots) {
this.subRegionSnapshots = subRegionSnapshots;
@@ -136,8 +130,7 @@ public class RegionSubRegionSnapshot implements DataSerializable {
}
/**
- * @param parent
- * snapshot of parent region
+ * @param parent snapshot of parent region
*/
public final void setParent(RegionSubRegionSnapshot parent) {
this.parent = parent;
@@ -148,14 +141,13 @@ public class RegionSubRegionSnapshot implements DataSerializable {
* @return full path of region
*/
public String getFullPath() {
- return (getParent() == null ? "/" : getParent().getFullPath()) + getName()
- + "/";
+ return (getParent() == null ? "/" : getParent().getFullPath()) + getName() + "/";
}
public void toData(DataOutput out) throws IOException {
DataSerializer.writeString(this.name, out);
out.writeInt(this.entryCount);
- DataSerializer.writeHashSet((HashSet)this.subRegionSnapshots, out);
+ DataSerializer.writeHashSet((HashSet) this.subRegionSnapshots, out);
}
public void fromData(DataInput in) throws IOException, ClassNotFoundException {
@@ -163,19 +155,18 @@ public class RegionSubRegionSnapshot implements DataSerializable {
this.entryCount = in.readInt();
this.subRegionSnapshots = DataSerializer.readHashSet(in);
for (Iterator iter = this.subRegionSnapshots.iterator(); iter.hasNext();) {
- ((RegionSubRegionSnapshot)iter.next()).setParent(this);
+ ((RegionSubRegionSnapshot) iter.next()).setParent(this);
}
}
@Override
public String toString() {
- String toStr = "RegionSnapshot [" + "path=" + this.getFullPath()
- + ",parent=" + (this.parent == null ? "null" : this.parent.name)
- + ", entryCount=" + this.entryCount + ", subRegionCount="
- + this.subRegionSnapshots.size() + "<<";
+ String toStr = "RegionSnapshot [" + "path=" + this.getFullPath() + ",parent="
+ + (this.parent == null ? "null" : this.parent.name) + ", entryCount=" + this.entryCount
+ + ", subRegionCount=" + this.subRegionSnapshots.size() + "<<";
for (Iterator iter = subRegionSnapshots.iterator(); iter.hasNext();) {
- toStr = toStr + ((RegionSubRegionSnapshot)iter.next()).getName() + ", ";
+ toStr = toStr + ((RegionSubRegionSnapshot) iter.next()).getName() + ", ";
}
toStr = toStr + ">>" + "]";
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/RuntimeAdminException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/RuntimeAdminException.java b/geode-core/src/main/java/org/apache/geode/admin/RuntimeAdminException.java
index 7a28867..359033b 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/RuntimeAdminException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/RuntimeAdminException.java
@@ -1,32 +1,31 @@
/*
- * 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
+ * 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.admin;
/**
- * A <code>RuntimeAdminException</code> is thrown when a runtime errors occurs
- * during administration or monitoring of GemFire.
+ * A <code>RuntimeAdminException</code> is thrown when a runtime errors occurs during administration
+ * or monitoring of GemFire.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
-public class RuntimeAdminException
-extends org.apache.geode.GemFireException {
+public class RuntimeAdminException extends org.apache.geode.GemFireException {
private static final long serialVersionUID = -7512771113818634005L;
@@ -45,5 +44,5 @@ extends org.apache.geode.GemFireException {
public RuntimeAdminException(Throwable cause) {
super(cause);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/Statistic.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/Statistic.java b/geode-core/src/main/java/org/apache/geode/admin/Statistic.java
index b1f1cc8..428281a 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/Statistic.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/Statistic.java
@@ -1,18 +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
+ * 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.admin;
@@ -20,41 +18,42 @@ package org.apache.geode.admin;
/**
* Interface to represent a single statistic of a <code>StatisticResource</code>
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface Statistic extends java.io.Serializable {
-
+
/**
* Gets the identifying name of this statistic.
*
- * @return the identifying name of this statistic
+ * @return the identifying name of this statistic
*/
public String getName();
-
+
/**
* Gets the value of this statistic as a <code>java.lang.Number</code>.
*
* @return the value of this statistic
*/
public Number getValue();
-
+
/**
* Gets the unit of measurement (if any) this statistic represents.
*
* @return the unit of measurement (if any) this statistic represents
*/
public String getUnits();
-
+
/**
- * Returns true if this statistic represents a numeric value which always
- * increases.
+ * Returns true if this statistic represents a numeric value which always increases.
*
* @return true if this statistic represents a value which always increases
*/
public boolean isCounter();
-
+
/**
* Gets the full description of this statistic.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/StatisticResource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/StatisticResource.java b/geode-core/src/main/java/org/apache/geode/admin/StatisticResource.java
index 43c51cd..1300c6a 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/StatisticResource.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/StatisticResource.java
@@ -1,32 +1,31 @@
/*
- * 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
+ * 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.admin;
/**
- * Adminitrative interface for monitoring a statistic resource in a GemFire
- * system member. A resource is comprised of one or many
- * <code>Statistics</code>.
+ * Adminitrative interface for monitoring a statistic resource in a GemFire system member. A
+ * resource is comprised of one or many <code>Statistics</code>.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface StatisticResource {
-
+
/**
* Gets the identifying name of this resource.
*
@@ -40,7 +39,7 @@ public interface StatisticResource {
* @return the full description of this resource
*/
public String getDescription();
-
+
/**
* Gets the classification type of this resource.
*
@@ -48,38 +47,36 @@ public interface StatisticResource {
* @since GemFire 5.0
*/
public String getType();
-
+
/**
- * Returns a display string of the {@link SystemMember} owning this
- * resource.
+ * Returns a display string of the {@link SystemMember} owning this resource.
*
* @return a display string of the owning {@link SystemMember}
*/
public String getOwner();
-
+
/**
- * Returns an ID that uniquely identifies the resource within the
- * {@link SystemMember} it belongs to.
+ * Returns an ID that uniquely identifies the resource within the {@link SystemMember} it belongs
+ * to.
*
* @return unique id within the owning {@link SystemMember}
*/
public long getUniqueId();
-
+
/**
* Returns a read-only array of every {@link Statistic} in this resource.
*
* @return read-only array of every {@link Statistic} in this resource
*/
public Statistic[] getStatistics();
-
+
/**
- * Refreshes the values of every {@link Statistic} in this resource by
- * retrieving them from the member's VM.
+ * Refreshes the values of every {@link Statistic} in this resource by retrieving them from the
+ * member's VM.
*
- * @throws org.apache.geode.admin.AdminException
- * if unable to refresh statistic values
+ * @throws org.apache.geode.admin.AdminException if unable to refresh statistic values
*/
public void refresh() throws org.apache.geode.admin.AdminException;
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMember.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMember.java
index 78cc9aa..ffd3f06 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMember.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMember.java
@@ -1,18 +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
+ * 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.admin;
@@ -23,42 +21,42 @@ import java.net.InetAddress;
/**
* Administrative interface for monitoring a GemFire system member.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface SystemMember {
-
+
/** Gets the {@link AdminDistributedSystem} this member belongs to. */
public AdminDistributedSystem getDistributedSystem();
-
- /**
- * Gets identifying name of this member.
- * For applications this is the string form of {@link #getDistributedMember}.
- * For cache servers it is a unique cache server string.
+
+ /**
+ * Gets identifying name of this member. For applications this is the string form of
+ * {@link #getDistributedMember}. For cache servers it is a unique cache server string.
*/
public String getId();
-
- /**
- * Retrieves display friendly name for this member. If this member defined
- * an optional name for its connection to the distributed system, that name
- * will be returned. Otherwise the returned value will be {@link
- * org.apache.geode.admin.SystemMember#getId}.
+
+ /**
+ * Retrieves display friendly name for this member. If this member defined an optional name for
+ * its connection to the distributed system, that name will be returned. Otherwise the returned
+ * value will be {@link org.apache.geode.admin.SystemMember#getId}.
*
* @see org.apache.geode.distributed.DistributedSystem#connect
* @see org.apache.geode.distributed.DistributedSystem#getName
*/
public String getName();
-
+
/** Gets the type of {@link SystemMemberType} this member is. */
public SystemMemberType getType();
-
+
/** Gets host name of the machine this member resides on. */
public String getHost();
/** Gets the host of this member as an <code>java.net.InetAddress<code>. */
public InetAddress getHostAddress();
-
+
/** Retrieves the log for this member. */
public String getLog();
@@ -67,66 +65,66 @@ public interface SystemMember {
*
* @deprecated Removed licensing in 8.0.
*/
- @Deprecated
- public java.util.Properties getLicense();
+ @Deprecated
+ public java.util.Properties getLicense();
/** Returns this member's GemFire version information. */
public String getVersion();
-
- /**
+
+ /**
* Gets the configuration parameters for this member.
*/
public ConfigurationParameter[] getConfiguration();
-
+
/**
- * Sets the configuration of this member. The argument is an array of any
- * and all configuration parameters that are to be updated in the member.
+ * Sets the configuration of this member. The argument is an array of any and all configuration
+ * parameters that are to be updated in the member.
* <p>
* The entire array of configuration parameters is then returned.
*
* @param parms subset of the configuration parameters to be changed
* @return all configuration parameters including those that were changed
- * @throws org.apache.geode.admin.AdminException
- * if this fails to make the configuration changes
+ * @throws org.apache.geode.admin.AdminException if this fails to make the configuration changes
*/
- public ConfigurationParameter[] setConfiguration(ConfigurationParameter[] parms) throws org.apache.geode.admin.AdminException;
-
+ public ConfigurationParameter[] setConfiguration(ConfigurationParameter[] parms)
+ throws org.apache.geode.admin.AdminException;
+
/** Refreshes this member's configuration from the member or it's properties */
public void refreshConfig() throws org.apache.geode.admin.AdminException;
-
- /**
- * Retrieves this members statistic resources. If the member is not running
- * then an empty array is returned.
+
+ /**
+ * Retrieves this members statistic resources. If the member is not running then an empty array is
+ * returned.
*
- *@param statisticsTypeName String ame of the Statistics Type
+ * @param statisticsTypeName String ame of the Statistics Type
* @return array of runtime statistic resources owned by this member
* @since GemFire 5.7
*/
- public StatisticResource[] getStat(String statisticsTypeName) throws org.apache.geode.admin.AdminException;
-
- /**
- * Retrieves this members statistic resources. If the member is not running
- * then an empty array is returned. All Stats are returned
+ public StatisticResource[] getStat(String statisticsTypeName)
+ throws org.apache.geode.admin.AdminException;
+
+ /**
+ * Retrieves this members statistic resources. If the member is not running then an empty array is
+ * returned. All Stats are returned
*
* @return array of runtime statistic resources owned by this member
*/
public StatisticResource[] getStats() throws org.apache.geode.admin.AdminException;
-
+
/**
- * Returns whether or not this system member hosts a GemFire {@link
- * org.apache.geode.cache.Cache Cache}.
+ * Returns whether or not this system member hosts a GemFire {@link org.apache.geode.cache.Cache
+ * Cache}.
*
* @see #getCache
*/
- public boolean hasCache()
- throws org.apache.geode.admin.AdminException;
+ public boolean hasCache() throws org.apache.geode.admin.AdminException;
/**
- * Returns an object that provides admin access to this member's cache.
- * If the member currently has no cache then <code>null</code> is returned.
+ * Returns an object that provides admin access to this member's cache. If the member currently
+ * has no cache then <code>null</code> is returned.
*/
public SystemMemberCache getCache() throws org.apache.geode.admin.AdminException;
-
+
/**
* Returns the names of the membership roles filled by this member.
*
@@ -134,10 +132,10 @@ public interface SystemMember {
* @since GemFire 5.0
*/
public String[] getRoles();
-
+
/**
- * Returns the {@link org.apache.geode.distributed.DistributedMember}
- * that represents this system member.
+ * Returns the {@link org.apache.geode.distributed.DistributedMember} that represents this system
+ * member.
*
* @return DistributedMember instance representing this system member
* @since GemFire 5.0
[98/98] [abbrv] incubator-geode git commit: shutdownAll now syncs on
class before this
Posted by ds...@apache.org.
shutdownAll now syncs on class before this
changed to an AtomicBoolean, remove cache sync on addPartitionedRegion and requiresNotificationFromPR
fixed formatting. Removed class sync on rmqFactory
back to volatile boolean so that second SDA will wait for the first
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/eb6ab1aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/eb6ab1aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/eb6ab1aa
Branch: refs/heads/feature/GEM-983
Commit: eb6ab1aaf18ffe9222c23cce6a3d6d61acc5bfca
Parents: 2ef50b2
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue Oct 11 15:04:43 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Fri Oct 28 14:37:14 2016 -0700
----------------------------------------------------------------------
.../geode/internal/cache/GemFireCacheImpl.java | 157 +++++++++----------
1 file changed, 70 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/eb6ab1aa/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index ba4f1f4..3c4718c 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -664,7 +664,7 @@ public class GemFireCacheImpl
sb.append("GemFireCache[");
sb.append("id = " + System.identityHashCode(this));
sb.append("; isClosing = " + this.isClosing);
- sb.append("; isShutDownAll = " + this.isShutDownAll);
+ sb.append("; isShutDownAll = " + isCacheAtShutdownAll());
sb.append("; created = " + this.creationDate);
sb.append("; server = " + this.isServer);
sb.append("; copyOnRead = " + this.copyOnRead);
@@ -874,7 +874,7 @@ public class GemFireCacheImpl
this.cqService = CqServiceProvider.create(this);
- initReliableMessageQueueFactory();
+ this.rmqFactory = new ReliableMessageQueueFactoryImpl();
// Create the CacheStatistics
this.cachePerfStats = new CachePerfStats(system);
@@ -1751,58 +1751,59 @@ public class GemFireCacheImpl
}
}
- public synchronized void shutDownAll() {
- boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
+ public void shutDownAll() {
+ synchronized (GemFireCacheImpl.class) {
+ boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
- if (testIGE) {
- InternalGemFireError assErr = new InternalGemFireError(
- LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
- throw assErr;
- }
- if (isCacheAtShutdownAll()) {
- // it's already doing shutdown by another thread
- return;
- }
- if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
- try {
- CacheObserverHolder.getInstance().beforeShutdownAll();
- } finally {
- LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
- }
- }
- this.isShutDownAll = true;
-
- // bug 44031 requires multithread shutdownall should be grouped
- // by root region. However, shutDownAllDuringRecovery.conf test revealed that
- // we have to close colocated child regions first.
- // Now check all the PR, if anyone has colocate-with attribute, sort all the
- // PRs by colocation relationship and close them sequentially, otherwise still
- // group them by root region.
- TreeMap<String, Map<String, PartitionedRegion>> prTrees = getPRTrees();
- if (prTrees.size() > 1 && shutdownAllPoolSize != 1) {
- ExecutorService es = getShutdownAllExecutorService(prTrees.size());
- for (final Map<String, PartitionedRegion> prSubMap : prTrees.values()) {
- es.execute(new Runnable() {
- public void run() {
- ConnectionTable.threadWantsSharedResources();
- shutdownSubTreeGracefully(prSubMap);
- }
- });
- } // for each root
- es.shutdown();
- try {
- es.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
- } catch (InterruptedException e) {
- logger.debug("Shutdown all interrupted while waiting for PRs to be shutdown gracefully.");
+ if (testIGE) {
+ InternalGemFireError assErr = new InternalGemFireError(LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
+ throw assErr;
+ }
+ if (isCacheAtShutdownAll()) {
+ // it's already doing shutdown by another thread
+ return;
}
+ if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
+ try {
+ CacheObserverHolder.getInstance().beforeShutdownAll();
+ } finally {
+ LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
+ }
+ }
+ this.isShutDownAll = true;
+
+ // bug 44031 requires multithread shutdownall should be grouped
+ // by root region. However, shutDownAllDuringRecovery.conf test revealed that
+ // we have to close colocated child regions first.
+ // Now check all the PR, if anyone has colocate-with attribute, sort all the
+ // PRs by colocation relationship and close them sequentially, otherwise still
+ // group them by root region.
+ TreeMap<String, Map<String, PartitionedRegion>> prTrees = getPRTrees();
+ if (prTrees.size() > 1 && shutdownAllPoolSize != 1) {
+ ExecutorService es = getShutdownAllExecutorService(prTrees.size());
+ for (final Map<String, PartitionedRegion> prSubMap : prTrees.values()) {
+ es.execute(new Runnable() {
+ public void run() {
+ ConnectionTable.threadWantsSharedResources();
+ shutdownSubTreeGracefully(prSubMap);
+ }
+ });
+ } // for each root
+ es.shutdown();
+ try {
+ es.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ logger.debug("Shutdown all interrupted while waiting for PRs to be shutdown gracefully.");
+ }
- } else {
- for (final Map<String, PartitionedRegion> prSubMap : prTrees.values()) {
- shutdownSubTreeGracefully(prSubMap);
+ } else {
+ for (final Map<String, PartitionedRegion> prSubMap : prTrees.values()) {
+ shutdownSubTreeGracefully(prSubMap);
+ }
}
- }
- close("Shut down all members", null, false, true);
+ close("Shut down all members", null, false, true);
+ }
}
private ExecutorService getShutdownAllExecutorService(int size) {
@@ -4180,17 +4181,15 @@ public class GemFireCacheImpl
* regions when this cache requires, or does not require notification of all region/entry events.
*/
public void addPartitionedRegion(PartitionedRegion r) {
- synchronized (GemFireCacheImpl.class) {
- synchronized (this.partitionedRegions) {
- if (r.isDestroyed()) {
- if (logger.isDebugEnabled()) {
- logger.debug("GemFireCache#addPartitionedRegion did not add destroyed {}", r);
- }
- return;
- }
- if (this.partitionedRegions.add(r)) {
- getCachePerfStats().incPartitionedRegions(1);
+ synchronized (this.partitionedRegions) {
+ if (r.isDestroyed()) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("GemFireCache#addPartitionedRegion did not add destroyed {}", r);
}
+ return;
+ }
+ if (this.partitionedRegions.add(r)) {
+ getCachePerfStats().incPartitionedRegions(1);
}
}
}
@@ -4288,22 +4287,20 @@ public class GemFireCacheImpl
* @return true if the region should deliver all of its events to this cache
*/
protected boolean requiresNotificationFromPR(PartitionedRegion r) {
- synchronized (GemFireCacheImpl.class) {
- boolean hasSerialSenders = hasSerialSenders(r);
- boolean result = hasSerialSenders;
- if (!result) {
- Iterator allCacheServersIterator = allCacheServers.iterator();
- while (allCacheServersIterator.hasNext()) {
- CacheServerImpl server = (CacheServerImpl) allCacheServersIterator.next();
- if (!server.getNotifyBySubscription()) {
- result = true;
- break;
- }
+ boolean hasSerialSenders = hasSerialSenders(r);
+ boolean result = hasSerialSenders;
+ if (!result) {
+ Iterator allCacheServersIterator = allCacheServers.iterator();
+ while (allCacheServersIterator.hasNext()) {
+ CacheServerImpl server = (CacheServerImpl) allCacheServersIterator.next();
+ if (!server.getNotifyBySubscription()) {
+ result = true;
+ break;
}
-
}
- return result;
+
}
+ return result;
}
private boolean hasSerialSenders(PartitionedRegion r) {
@@ -4483,25 +4480,11 @@ public class GemFireCacheImpl
/**
* This cache's reliable message queue factory. Should always have an instance of it.
*/
- private ReliableMessageQueueFactory rmqFactory;
+ private final ReliableMessageQueueFactory rmqFactory;
private List<File> backupFiles = Collections.emptyList();
/**
- * Initializes the reliable message queue. Needs to be called at cache creation
- *
- * @throws IllegalStateException if the factory is in use
- */
- private void initReliableMessageQueueFactory() {
- synchronized (GemFireCacheImpl.class) {
- if (this.rmqFactory != null) {
- this.rmqFactory.close(false);
- }
- this.rmqFactory = new ReliableMessageQueueFactoryImpl();
- }
- }
-
- /**
* Returns this cache's ReliableMessageQueueFactory.
*
* @since GemFire 5.0
[47/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java
index ed1ffab..71aa768 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionCachingFilter.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.filter;
@@ -36,51 +34,48 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Primary class which orchestrates everything. This is the class which gets
- * configured in the web.xml.
+ * Primary class which orchestrates everything. This is the class which gets configured in the
+ * web.xml.
*/
public class SessionCachingFilter implements Filter {
/**
* Logger instance
*/
- private static final Logger LOG =
- LoggerFactory.getLogger(SessionCachingFilter.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(SessionCachingFilter.class.getName());
/**
- * The filter configuration object we are associated with. If this value is
- * null, this filter instance is not currently configured.
+ * The filter configuration object we are associated with. If this value is null, this filter
+ * instance is not currently configured.
*/
private FilterConfig filterConfig = null;
/**
- * Some containers will want to instantiate multiple instances of this filter,
- * but we only need one SessionManager
+ * Some containers will want to instantiate multiple instances of this filter, but we only need
+ * one SessionManager
*/
private static SessionManager manager = null;
/**
* Can be overridden during testing.
*/
- private static AtomicInteger started =
- new AtomicInteger(
- Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "override.session.manager.count", 1));
+ private static AtomicInteger started = new AtomicInteger(
+ Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "override.session.manager.count", 1));
- private static int percentInactiveTimeTriggerRebuild =
- Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "session.inactive.trigger.rebuild", 80);
+ private static int percentInactiveTimeTriggerRebuild = Integer
+ .getInteger(DistributionConfig.GEMFIRE_PREFIX + "session.inactive.trigger.rebuild", 80);
/**
- * This latch ensures that at least one thread/instance has fired up the
- * session manager before any other threads complete the init method.
+ * This latch ensures that at least one thread/instance has fired up the session manager before
+ * any other threads complete the init method.
*/
private static CountDownLatch startingLatch = new CountDownLatch(1);
/**
- * This request wrapper class extends the support class
- * HttpServletRequestWrapper, which implements all the methods in the
- * HttpServletRequest interface, as delegations to the wrapped request. You
- * only need to override the methods that you need to change. You can get
- * access to the wrapped request using the method getRequest()
+ * This request wrapper class extends the support class HttpServletRequestWrapper, which
+ * implements all the methods in the HttpServletRequest interface, as delegations to the wrapped
+ * request. You only need to override the methods that you need to change. You can get access to
+ * the wrapped request using the method getRequest()
*/
public static class RequestWrapper extends HttpServletRequestWrapper {
@@ -105,8 +100,7 @@ public class SessionCachingFilter implements Filter {
*/
private HttpServletRequest originalRequest;
- public RequestWrapper(SessionManager manager,
- HttpServletRequest request,
+ public RequestWrapper(SessionManager manager, HttpServletRequest request,
ResponseWrapper response) {
super(request);
@@ -117,14 +111,12 @@ public class SessionCachingFilter implements Filter {
final Cookie[] cookies = request.getCookies();
if (cookies != null) {
for (final Cookie cookie : cookies) {
- if (cookie.getName().equalsIgnoreCase(
- manager.getSessionCookieName()) &&
- cookie.getValue().endsWith("-GF")) {
+ if (cookie.getName().equalsIgnoreCase(manager.getSessionCookieName())
+ && cookie.getValue().endsWith("-GF")) {
requestedSessionId = cookie.getValue();
sessionFromCookie = true;
- LOG.debug("Cookie contains sessionId: {}",
- requestedSessionId);
+ LOG.debug("Cookie contains sessionId: {}", requestedSessionId);
}
}
}
@@ -156,16 +148,16 @@ public class SessionCachingFilter implements Filter {
if (session != null && session.isValid()) {
session.setIsNew(false);
session.updateAccessTime();
- /*
- * This is a massively gross hack. Currently, there is no way
- * to actually update the last accessed time for a session, so
- * what we do here is once we're into X% of the session's TTL
- * we grab a new session from the container.
- *
- * (inactive * 1000) * (pct / 100) ==> (inactive * 10 * pct)
- */
- if (session.getLastAccessedTime() - session.getCreationTime() >
- (session.getMaxInactiveInterval() * 10 * percentInactiveTimeTriggerRebuild)) {
+ /*
+ * This is a massively gross hack. Currently, there is no way to actually update the last
+ * accessed time for a session, so what we do here is once we're into X% of the session's
+ * TTL we grab a new session from the container.
+ *
+ * (inactive * 1000) * (pct / 100) ==> (inactive * 10 * pct)
+ */
+ if (session.getLastAccessedTime()
+ - session.getCreationTime() > (session.getMaxInactiveInterval() * 10
+ * percentInactiveTimeTriggerRebuild)) {
HttpSession nativeSession = super.getSession();
session.failoverSession(nativeSession);
}
@@ -173,8 +165,7 @@ public class SessionCachingFilter implements Filter {
}
if (requestedSessionId != null) {
- session = (GemfireHttpSession) manager.getSession(
- requestedSessionId);
+ session = (GemfireHttpSession) manager.getSession(requestedSessionId);
if (session != null) {
session.setIsNew(false);
// This means we've failed over to another node
@@ -231,8 +222,7 @@ public class SessionCachingFilter implements Filter {
// Get the existing cookies
Cookie[] cookies = getCookies();
- Cookie cookie = new Cookie(manager.getSessionCookieName(),
- session.getId());
+ Cookie cookie = new Cookie(manager.getSessionCookieName(), session.getId());
cookie.setPath("".equals(getContextPath()) ? "/" : getContextPath());
// Clear out all old cookies and just set ours
response.addCookie(cookie);
@@ -296,16 +286,14 @@ public class SessionCachingFilter implements Filter {
}
}
- /*
- * Hmmm... not sure if this is right or even good to do. So, in some
- * cases - for ex. using a Spring security filter, we have 3 possible
- * wrappers to deal with - the original, this one and one created by
- * Spring. When a servlet or JSP is forwarded to the original request
- * is passed in, but then this (the wrapped) request is used by the JSP.
- * In some cases, the outer wrapper also contains information relevant
- * to the request - in this case security info. So here we allow access
- * to that. There's probably a better way....
- */
+ /*
+ * Hmmm... not sure if this is right or even good to do. So, in some cases - for ex. using a
+ * Spring security filter, we have 3 possible wrappers to deal with - the original, this one and
+ * one created by Spring. When a servlet or JSP is forwarded to the original request is passed
+ * in, but then this (the wrapped) request is used by the JSP. In some cases, the outer wrapper
+ * also contains information relevant to the request - in this case security info. So here we
+ * allow access to that. There's probably a better way....
+ */
/**
* {@inheritDoc}
@@ -370,11 +358,10 @@ public class SessionCachingFilter implements Filter {
}
/**
- * This response wrapper class extends the support class
- * HttpServletResponseWrapper, which implements all the methods in the
- * HttpServletResponse interface, as delegations to the wrapped response. You
- * only need to override the methods that you need to change. You can get
- * access to the wrapped response using the method getResponse()
+ * This response wrapper class extends the support class HttpServletResponseWrapper, which
+ * implements all the methods in the HttpServletResponse interface, as delegations to the wrapped
+ * response. You only need to override the methods that you need to change. You can get access to
+ * the wrapped response using the method getResponse()
*/
class ResponseWrapper extends HttpServletResponseWrapper {
@@ -401,27 +388,25 @@ public class SessionCachingFilter implements Filter {
}
- public SessionCachingFilter() {
- }
+ public SessionCachingFilter() {}
/**
- * @param request The servlet request we are processing
+ * @param request The servlet request we are processing
* @param response The servlet response we are creating
- * @param chain The filter chain we are processing
- * @throws IOException if an input/output error occurs
+ * @param chain The filter chain we are processing
+ * @throws IOException if an input/output error occurs
* @throws ServletException if a servlet error occurs
*/
@Override
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain)
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
HttpServletRequest httpReq = (HttpServletRequest) request;
HttpServletResponse httpResp = (HttpServletResponse) response;
/**
- * Early out if this isn't the right kind of request. We might see a
- * RequestWrapper instance during a forward or include request.
+ * Early out if this isn't the right kind of request. We might see a RequestWrapper instance
+ * during a forward or include request.
*/
if (alreadyWrapped(httpReq)) {
LOG.debug("Handling already-wrapped request");
@@ -439,8 +424,7 @@ public class SessionCachingFilter implements Filter {
// include requests.
ResponseWrapper wrappedResponse = new ResponseWrapper(httpResp);
- final RequestWrapper wrappedRequest =
- new RequestWrapper(manager, httpReq, wrappedResponse);
+ final RequestWrapper wrappedRequest = new RequestWrapper(manager, httpReq, wrappedResponse);
Throwable problem = null;
@@ -454,8 +438,7 @@ public class SessionCachingFilter implements Filter {
LOG.error("Exception processing filter chain", t);
}
- GemfireHttpSession session =
- (GemfireHttpSession) wrappedRequest.getSession(false);
+ GemfireHttpSession session = (GemfireHttpSession) wrappedRequest.getSession(false);
// If there was a problem, we want to rethrow it if it is
// a known type, otherwise log it.
@@ -470,8 +453,8 @@ public class SessionCachingFilter implements Filter {
}
/**
- * Commit any updates. What actually happens at that point is
- * dependent on the type of attributes defined for use by the sessions.
+ * Commit any updates. What actually happens at that point is dependent on the type of
+ * attributes defined for use by the sessions.
*/
if (session != null) {
session.commit();
@@ -479,21 +462,21 @@ public class SessionCachingFilter implements Filter {
}
/**
- * Test if a request has been wrapped with RequestWrapper somewhere
- * in the chain of wrapped requests.
+ * Test if a request has been wrapped with RequestWrapper somewhere in the chain of wrapped
+ * requests.
*/
private boolean alreadyWrapped(final ServletRequest request) {
- if(request instanceof RequestWrapper) {
+ if (request instanceof RequestWrapper) {
return true;
}
- if(!(request instanceof ServletRequestWrapper)) {
+ if (!(request instanceof ServletRequestWrapper)) {
return false;
}
final ServletRequest nestedRequest = ((ServletRequestWrapper) request).getRequest();
- if(nestedRequest == request) {
+ if (nestedRequest == request) {
return false;
}
@@ -541,8 +524,7 @@ public class SessionCachingFilter implements Filter {
/**
* Allow override for testing purposes
*/
- String managerClassStr =
- config.getInitParameter("session-manager-class");
+ String managerClassStr = config.getInitParameter("session-manager-class");
// Otherwise default
if (managerClassStr == null) {
@@ -550,8 +532,7 @@ public class SessionCachingFilter implements Filter {
}
try {
- manager = (SessionManager) Class.forName(
- managerClassStr).newInstance();
+ manager = (SessionManager) Class.forName(managerClassStr).newInstance();
manager.start(config, this.getClass().getClassLoader());
} catch (Exception ex) {
LOG.error("Exception creating Session Manager", ex);
@@ -564,8 +545,7 @@ public class SessionCachingFilter implements Filter {
} catch (InterruptedException iex) {
}
- LOG.debug("SessionManager and listener initialization skipped - "
- + "already done.");
+ LOG.debug("SessionManager and listener initialization skipped - " + "already done.");
}
LOG.info("Session Filter initialization complete");
@@ -596,13 +576,12 @@ public class SessionCachingFilter implements Filter {
response.setContentType("text/html");
PrintStream ps = new PrintStream(response.getOutputStream());
PrintWriter pw = new PrintWriter(ps);
- pw.print(
- "<html>\n<head>\n<title>Error</title>\n</head>\n<body>\n"); //NOI18N
+ pw.print("<html>\n<head>\n<title>Error</title>\n</head>\n<body>\n"); // NOI18N
// PENDING! Localize this for next official release
pw.print("<h1>The resource did not process correctly</h1>\n<pre>\n");
pw.print(stackTrace);
- pw.print("</pre></body>\n</html>"); //NOI18N
+ pw.print("</pre></body>\n</html>"); // NOI18N
pw.close();
ps.close();
response.getOutputStream().close();
@@ -634,8 +613,7 @@ public class SessionCachingFilter implements Filter {
}
/**
- * Retrieve the SessionManager. This is only here so that tests can get access
- * to the cache.
+ * Retrieve the SessionManager. This is only here so that tests can get access to the cache.
*/
public static SessionManager getSessionManager() {
return manager;
@@ -644,16 +622,15 @@ public class SessionCachingFilter implements Filter {
/**
* Return the GemFire session which wraps a native session
*
- * @param nativeSession the native session for which the corresponding GemFire
- * session should be returned.
- * @return the GemFire session or null if no session maps to the native
- * session
+ * @param nativeSession the native session for which the corresponding GemFire session should be
+ * returned.
+ * @return the GemFire session or null if no session maps to the native session
*/
public static HttpSession getWrappingSession(HttpSession nativeSession) {
- /*
- * This is a special case where the GemFire session has been set as a
- * ThreadLocal during session creation.
- */
+ /*
+ * This is a special case where the GemFire session has been set as a ThreadLocal during session
+ * creation.
+ */
GemfireHttpSession gemfireSession = (GemfireHttpSession) ThreadLocalSession.get();
if (gemfireSession != null) {
gemfireSession.setNativeSession(nativeSession);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionListener.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionListener.java
index 929740b..157566d 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionListener.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/filter/SessionListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.filter;
@@ -26,11 +24,9 @@ import javax.servlet.http.HttpSessionListener;
public class SessionListener implements HttpSessionListener {
- private static final Logger LOG =
- LoggerFactory.getLogger(SessionListener.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(SessionListener.class.getName());
- public void sessionCreated(HttpSessionEvent httpSessionEvent) {
- }
+ public void sessionCreated(HttpSessionEvent httpSessionEvent) {}
/**
* This will receive events from the container using the native sessions.
@@ -38,14 +34,11 @@ public class SessionListener implements HttpSessionListener {
public void sessionDestroyed(HttpSessionEvent event) {
String nativeId = event.getSession().getId();
try {
- String sessionId = SessionCachingFilter.getSessionManager().destroyNativeSession(
- nativeId);
- LOG.debug(
- "Received sessionDestroyed event for native session {} (wrapped by {})",
- nativeId, sessionId);
+ String sessionId = SessionCachingFilter.getSessionManager().destroyNativeSession(nativeId);
+ LOG.debug("Received sessionDestroyed event for native session {} (wrapped by {})", nativeId,
+ sessionId);
} catch (DistributedSystemDisconnectedException dex) {
- LOG.debug("Cache disconnected - unable to destroy native session {0}",
- nativeId);
+ LOG.debug("Cache disconnected - unable to destroy native session {0}", nativeId);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/Installer.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/Installer.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/Installer.java
index 2343c5b..b2d0bd0 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/Installer.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/Installer.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.installer;
@@ -53,25 +51,19 @@ public class Installer {
private ArgumentValues argValues;
private static final Argument ARG_HELP =
- new Argument("-h", false).
- setDescription("Displays this help message.");
-
- private static Argument ARG_GEMFIRE_PARAMETERS =
- new Argument("-p", false, "param=value").
- setDescription("Specific parameter for inclusion into the "
- + "session filter definition as a regular "
- + "init-param. Can be given multiple times.");
-
- private static Argument ARG_CACHE_TYPE =
- new Argument("-t", false, "cache-type").
- setDescription(
- "Type of cache. Must be one of 'peer-to-peer' or "
- + "'client-server'. Default is peer-to-peer.").
- setDefaults("peer-to-peer");
+ new Argument("-h", false).setDescription("Displays this help message.");
+
+ private static Argument ARG_GEMFIRE_PARAMETERS = new Argument("-p", false, "param=value")
+ .setDescription("Specific parameter for inclusion into the "
+ + "session filter definition as a regular " + "init-param. Can be given multiple times.");
+
+ private static Argument ARG_CACHE_TYPE = new Argument("-t", false, "cache-type")
+ .setDescription("Type of cache. Must be one of 'peer-to-peer' or "
+ + "'client-server'. Default is peer-to-peer.")
+ .setDefaults("peer-to-peer");
private static Argument ARG_WEB_XML_FILE =
- new Argument("-w", true, "web.xml file").
- setDescription("The web.xml file to be modified.");
+ new Argument("-w", true, "web.xml file").setDescription("The web.xml file to be modified.");
/**
@@ -102,18 +94,15 @@ public class Installer {
processor.setUnknownArgumentHandler(new UnknownArgumentHandler() {
@Override
- public void handleUnknownArgument(
- final String form, final String[] params) {
- log("Unknown argument being ignored: "
- + form + " (" + params.length + " params)");
+ public void handleUnknownArgument(final String form, final String[] params) {
+ log("Unknown argument being ignored: " + form + " (" + params.length + " params)");
log("Use '-h' argument to display usage");
}
});
argValues = processor.process(args);
if (argValues.isDefined(ARG_HELP)) {
- final UsageException usageException =
- new UsageException("Usage requested by user");
+ final UsageException usageException = new UsageException("Usage requested by user");
usageException.setUsage(processor.getUsage());
throw (usageException);
}
@@ -151,8 +140,7 @@ public class Installer {
}
- public void processWebXml(final InputStream webXml,
- final OutputStream out) throws Exception {
+ public void processWebXml(final InputStream webXml, final OutputStream out) throws Exception {
Document doc = createWebXmlDoc(webXml);
mangleWebXml(doc);
@@ -161,11 +149,9 @@ public class Installer {
}
- private Document createWebXmlDoc(final InputStream webXml)
- throws Exception {
+ private Document createWebXmlDoc(final InputStream webXml) throws Exception {
Document doc;
- final DocumentBuilderFactory factory =
- DocumentBuilderFactory.newInstance();
+ final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
final DocumentBuilder builder = factory.newDocumentBuilder();
doc = builder.parse(webXml);
@@ -205,8 +191,7 @@ public class Installer {
// Set the type of cache
initParam = append(doc, filter, "init-param", null);
append(doc, initParam, "param-name", "cache-type");
- append(doc, initParam, "param-value",
- argValues.getFirstResult(ARG_CACHE_TYPE));
+ append(doc, initParam, "param-value", argValues.getFirstResult(ARG_CACHE_TYPE));
if (argValues.isDefined(ARG_GEMFIRE_PARAMETERS)) {
@@ -235,8 +220,7 @@ public class Installer {
final Element contextListener = doc.createElement("listener");
append(doc, contextListener, "listener-class", GEMFIRE_LISTENER_CLASS);
docElement.insertBefore(filterMapping, after(docElement, "filter"));
- docElement.insertBefore(contextListener,
- after(docElement, "filter-mapping"));
+ docElement.insertBefore(contextListener, after(docElement, "filter-mapping"));
return doc;
}
@@ -258,8 +242,7 @@ public class Installer {
return null;
}
- private Node append(final Document doc, final Node parent,
- final String element,
+ private Node append(final Document doc, final Node parent, final String element,
final String value) {
final Element child = doc.createElement(element);
if (value != null)
@@ -279,8 +262,7 @@ public class Installer {
transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, systemId);
}
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
- transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount",
- "4");
+ transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "4");
final DOMSource source = new DOMSource(doc);
final StreamResult result = new StreamResult(out);
transformer.transform(source, result);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/JarClassLoader.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/JarClassLoader.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/JarClassLoader.java
index 4ddb278..5a27378 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/JarClassLoader.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/JarClassLoader.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.installer;
@@ -30,8 +28,8 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
/**
- * Classloader, which allows finding classes in jars within jars. This is used to check
- * whether a listener, as found in web.xml, is a ServletContextListener
+ * Classloader, which allows finding classes in jars within jars. This is used to check whether a
+ * listener, as found in web.xml, is a ServletContextListener
*/
@SuppressWarnings("deprecation")
public class JarClassLoader extends URLClassLoader {
@@ -90,21 +88,18 @@ public class JarClassLoader extends URLClassLoader {
}
private static boolean isJar(String fileName) {
- return fileName != null && (fileName.toLowerCase().endsWith(".jar") ||
- fileName.toLowerCase().endsWith(".war") ||
- fileName.toLowerCase().endsWith(".ear"));
+ return fileName != null && (fileName.toLowerCase().endsWith(".jar")
+ || fileName.toLowerCase().endsWith(".war") || fileName.toLowerCase().endsWith(".ear"));
}
- private static File jarEntryAsFile(JarFile jarFile,
- JarEntry jarEntry) throws IOException {
+ private static File jarEntryAsFile(JarFile jarFile, JarEntry jarEntry) throws IOException {
InputStream input = null;
OutputStream output = null;
try {
String name = jarEntry.getName().replace('/', '_');
int i = name.lastIndexOf(".");
String extension = i > -1 ? name.substring(i) : "";
- File file = File.createTempFile(
- name.substring(0, name.length() - extension.length()) + ".",
+ File file = File.createTempFile(name.substring(0, name.length() - extension.length()) + ".",
extension);
file.deleteOnExit();
input = jarFile.getInputStream(jarEntry);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/Argument.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/Argument.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/Argument.java
index 82ed232..53a6f77 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/Argument.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/Argument.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.installer.args;
@@ -36,9 +34,8 @@ public class Argument {
private String[] defaults;
/**
- * Environment variable names forfor each parameter where values will be
- * pulled in, if not explicitly provided and if the environment variable
- * exists.
+ * Environment variable names forfor each parameter where values will be pulled in, if not
+ * explicitly provided and if the environment variable exists.
*/
private String[] envVars;
@@ -68,16 +65,12 @@ public class Argument {
/**
* Contructor to create an argument definition.
*
- * @param primaryForm the form of the argument (e.g., --foo). Should start
- * with a dash.
- * @param argRequired flag indicating whether or not the argument is
- * required to be onthe command line
- * @param parameterNames names of the parameters to this argument for use in
- * the usage generation
+ * @param primaryForm the form of the argument (e.g., --foo). Should start with a dash.
+ * @param argRequired flag indicating whether or not the argument is required to be onthe command
+ * line
+ * @param parameterNames names of the parameters to this argument for use in the usage generation
*/
- public Argument(
- final String primaryForm,
- final boolean argRequired,
+ public Argument(final String primaryForm, final boolean argRequired,
final String... parameterNames) {
forms.add(primaryForm);
paramNames = parameterNames;
@@ -225,8 +218,8 @@ public class Argument {
}
/**
- * Sets the environment variables which will be checked for values before
- * falling back on the default values.
+ * Sets the environment variables which will be checked for values before falling back on the
+ * default values.
*
* @param newEnvVars environment variable name array
* @return this argument (for chained calls)
@@ -234,8 +227,7 @@ public class Argument {
public Argument setEnvVars(final String... newEnvVars) {
if (newEnvVars.length != paramNames.length) {
throw (new IllegalArgumentException(
- "Environment variables array length provided is not "
- + "the correct size"));
+ "Environment variables array length provided is not " + "the correct size"));
}
envVars = newEnvVars;
return this;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentHandler.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentHandler.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentHandler.java
index 28887d8..f9d457a 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentHandler.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentHandler.java
@@ -1,38 +1,35 @@
/*
-* 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.
-*/
+ * 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.modules.session.installer.args;
/**
- * Interface specifying the requirements for objects wiching to be able to
- * examine arguments (potentially tweaking parameters) at the time of parsing,
- * thereby allowing for usage display to occur automatically.
+ * Interface specifying the requirements for objects wiching to be able to examine arguments
+ * (potentially tweaking parameters) at the time of parsing, thereby allowing for usage display to
+ * occur automatically.
*/
public interface ArgumentHandler {
/**
* Process the argument values specified.
*
- * @param arg argument definition
- * @param form form which was used on the command line
+ * @param arg argument definition
+ * @param form form which was used on the command line
* @param params parameters supplied to the argument
* @throws UsageException when usage was suboptimal
*/
- void handleArgument(Argument arg, String form, String[] params)
- throws UsageException;
+ void handleArgument(Argument arg, String form, String[] params) throws UsageException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentProcessor.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentProcessor.java
index 4ed3061..43df4ac 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentProcessor.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentProcessor.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.installer.args;
@@ -22,15 +20,14 @@ import java.util.List;
import java.util.logging.Logger;
/**
- * This class is used to process command line arguments for Java programs in a
- * flexible and powerful manner.
+ * This class is used to process command line arguments for Java programs in a flexible and powerful
+ * manner.
*/
public class ArgumentProcessor {
/**
* Logger.
*/
- private static final Logger LOG =
- Logger.getLogger(ArgumentProcessor.class.getName());
+ private static final Logger LOG = Logger.getLogger(ArgumentProcessor.class.getName());
/**
* Description line length.
@@ -78,12 +75,10 @@ public class ArgumentProcessor {
* Constructor.
*
* @param theArgument the argument which matched
- * @param theForm the form used
- * @param theParams the parameters supplied
+ * @param theForm the form used
+ * @param theParams the parameters supplied
*/
- public Match(
- final Argument theArgument,
- final String theForm, final String[] theParams) {
+ public Match(final Argument theArgument, final String theForm, final String[] theParams) {
arg = theArgument;
form = theForm;
params = theParams;
@@ -147,8 +142,7 @@ public class ArgumentProcessor {
*
* @param aHandler unknown arg handler, or null to unset
*/
- public void setUnknownArgumentHandler(
- final UnknownArgumentHandler aHandler) {
+ public void setUnknownArgumentHandler(final UnknownArgumentHandler aHandler) {
handler = aHandler;
}
@@ -159,8 +153,7 @@ public class ArgumentProcessor {
* @return argument values parsed out of command line
* @throws UsageException when usge sucked
*/
- public ArgumentValues process(final String[] programArgs)
- throws UsageException {
+ public ArgumentValues process(final String[] programArgs) throws UsageException {
ArgumentHandler argHandler;
final ArgumentValues result = new ArgumentValues();
List<Argument> unmatched;
@@ -179,8 +172,8 @@ public class ArgumentProcessor {
// Error on unmatched yet required args
for (Argument arg : unmatched) {
if (arg.isRequired() && !arg.isDefinedInEnv()) {
- final UsageException usageException = new UsageException(
- "Required argument not provided: " + arg);
+ final UsageException usageException =
+ new UsageException("Required argument not provided: " + arg);
usageException.setUsage(getUsage());
throw usageException;
}
@@ -191,8 +184,7 @@ public class ArgumentProcessor {
final Argument arg = match.getArgument();
argHandler = arg.getArgumentHandler();
if (argHandler != null) {
- argHandler.handleArgument(
- arg, match.getForm(), match.getParams());
+ argHandler.handleArgument(arg, match.getForm(), match.getParams());
}
result.addResult(arg, match.getParams());
}
@@ -234,8 +226,7 @@ public class ArgumentProcessor {
builder.append("\n");
}
- descriptionLines =
- breakupString(arg.getDescription(), LINE_LENGTH);
+ descriptionLines = breakupString(arg.getDescription(), LINE_LENGTH);
if (descriptionLines.isEmpty()) {
builder.append(blank20);
builder.append("No argument description provided.");
@@ -263,12 +254,11 @@ public class ArgumentProcessor {
* Builds a listof all argument matches and sets the postArgs array.
*
* @param programArgs command line arguments to search through
- * @param values values object in which to store results
+ * @param values values object in which to store results
* @return list of matches
* @throws UsageException when there is EBKAC
*/
- private List<Match> checkMatches(
- final String[] programArgs, final ArgumentValues values)
+ private List<Match> checkMatches(final String[] programArgs, final ArgumentValues values)
throws UsageException {
final List<Match> result = new ArrayList<Match>();
Match match;
@@ -282,8 +272,7 @@ public class ArgumentProcessor {
if ("--".equals(programArgs[idx])) {
if (++idx < programArgs.length) {
postArgs = new String[programArgs.length - idx];
- System.arraycopy(programArgs, idx,
- postArgs, 0, postArgs.length);
+ System.arraycopy(programArgs, idx, postArgs, 0, postArgs.length);
values.setPostArgs(postArgs);
}
// We're done processing args'
@@ -292,8 +281,7 @@ public class ArgumentProcessor {
// Determine parameter count
idx2 = idx;
- while ((idx2 + 1) < programArgs.length
- && programArgs[idx2 + 1].charAt(0) != '-') {
+ while ((idx2 + 1) < programArgs.length && programArgs[idx2 + 1].charAt(0) != '-') {
idx2++;
}
@@ -319,8 +307,7 @@ public class ArgumentProcessor {
if (match == null) {
if (handler == null) {
final UsageException usageException = new UsageException(
- "Unknown argument: " + programArgs[idx]
- + " with " + params.length + " parameters.");
+ "Unknown argument: " + programArgs[idx] + " with " + params.length + " parameters.");
usageException.setUsage(getUsage());
throw (usageException);
} else {
@@ -338,17 +325,14 @@ public class ArgumentProcessor {
* Checks to see if an rgument form matches the suppies parameter list.
*
* @param argName argument name
- * @param arg argument
- * @param params parameters supplied
+ * @param arg argument
+ * @param params parameters supplied
* @return match object on match, null otherwise
*/
- private Match checkMatch(
- final String argName, final Argument arg, final String[] params) {
+ private Match checkMatch(final String argName, final Argument arg, final String[] params) {
// Look for a matching form
for (String form : arg.getForms()) {
- if (
- form.equals(argName)
- && arg.getParameterCount() == params.length) {
+ if (form.equals(argName) && arg.getParameterCount() == params.length) {
return new Match(arg, form, params);
}
}
@@ -357,15 +341,14 @@ public class ArgumentProcessor {
}
/**
- * Breaks up a string into sub-strings, each with a length equal to or less
- * than the max length specified.
+ * Breaks up a string into sub-strings, each with a length equal to or less than the max length
+ * specified.
*
- * @param str string to break up
+ * @param str string to break up
* @param maxLength maximum line length to use
* @return broken up string
*/
- private List<String> breakupString(
- final String str, final int maxLength) {
+ private List<String> breakupString(final String str, final int maxLength) {
final List<String> result = new ArrayList<String>();
int startIdx = -1;
int lastIdx;
@@ -380,8 +363,7 @@ public class ArgumentProcessor {
do {
lastIdx = idx;
idx = str.indexOf(' ', lastIdx + 1);
- LOG.fine("startIdx=" + startIdx + " lastIdx=" + lastIdx
- + " idx=" + idx);
+ LOG.fine("startIdx=" + startIdx + " lastIdx=" + lastIdx + " idx=" + idx);
if (idx < 0) {
// Canot break line up any further
result.add(str.substring(startIdx + 1));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentValues.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentValues.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentValues.java
index 22ab124..2c8a1b5 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentValues.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/ArgumentValues.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.installer.args;
@@ -31,7 +29,7 @@ public class ArgumentValues {
/**
* Storage location for all arguments found after the "--" pseudo-arg.
*/
- private String[] postArgs = new String[]{};
+ private String[] postArgs = new String[] {};
/**
* Storage location for the command line argument values.
@@ -56,9 +54,9 @@ public class ArgumentValues {
}
/**
- * After processing the command line arguments, this method may be used to
- * return all arguments which were excluded from processing by their placement
- * after the "<code>--</code>" psuedo-argument.
+ * After processing the command line arguments, this method may be used to return all arguments
+ * which were excluded from processing by their placement after the "<code>--</code>"
+ * psuedo-argument.
*
* @return all unprocess arguments
*/
@@ -69,7 +67,7 @@ public class ArgumentValues {
/**
* Sets the data values found for a specific argument.
*
- * @param arg argument
+ * @param arg argument
* @param paramValues parameter values for the argument
*/
public void addResult(final Argument arg, final String[] paramValues) {
@@ -93,11 +91,9 @@ public class ArgumentValues {
}
/**
- * Counts the number of arguments defined on the command line which are in the
- * list provided.
+ * Counts the number of arguments defined on the command line which are in the list provided.
*
- * @param ofThese the arguments to search for, or null to count all supplied
- * arguments
+ * @param ofThese the arguments to search for, or null to count all supplied arguments
* @return count of the defined arguments
*/
public int getDefinedCount(Argument... ofThese) {
@@ -119,12 +115,10 @@ public class ArgumentValues {
}
/**
- * Returns whetheror not the command line argument was actually provided on
- * the command line.
+ * Returns whetheror not the command line argument was actually provided on the command line.
*
* @param arg argument to query
- * @return true if the argument is defined by the command line, false
- * otherwise
+ * @return true if the argument is defined by the command line, false otherwise
*/
public boolean isDefined(final Argument arg) {
final List<String[]> result = values.get(arg);
@@ -132,8 +126,8 @@ public class ArgumentValues {
}
/**
- * Returns all results for the specified argument. If a command line option
- * is specified more than once, this is the method to use to get all values.
+ * Returns all results for the specified argument. If a command line option is specified more than
+ * once, this is the method to use to get all values.
*
* @param arg argument to query
* @return list of all parameter lists defined for this argument
@@ -169,8 +163,7 @@ public class ArgumentValues {
}
/**
- * Convenience method to retrieve the first instance of the command line
- * argument's values.
+ * Convenience method to retrieve the first instance of the command line argument's values.
*
* @param arg argument to query
* @return first parameter list defined for this argument
@@ -185,8 +178,8 @@ public class ArgumentValues {
}
/**
- * Convenience method to return the first value of the first instance of the
- * command line argument values for the specified argument.
+ * Convenience method to return the first value of the first instance of the command line argument
+ * values for the specified argument.
*
* @param arg argument to query
* @return first parameter of the first list of parameters supplied
@@ -201,16 +194,13 @@ public class ArgumentValues {
}
/**
- * Convenience method to return the result of getFirstResult method as an
- * integer.
+ * Convenience method to return the result of getFirstResult method as an integer.
*
- * @param arg argument to query
- * @param undefinedValue value to return when argument is not defined or is
- * illegally defined
+ * @param arg argument to query
+ * @param undefinedValue value to return when argument is not defined or is illegally defined
* @return value specified, or default value provided
*/
- public int getFirstResultAsInt(
- final Argument arg, final int undefinedValue) {
+ public int getFirstResultAsInt(final Argument arg, final int undefinedValue) {
final String value = getFirstResult(arg);
if (value == null) {
return undefinedValue;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/URLArgumentHandler.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/URLArgumentHandler.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/URLArgumentHandler.java
index 78082ce..313f469 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/URLArgumentHandler.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/URLArgumentHandler.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.installer.args;
@@ -24,31 +22,26 @@ import java.util.logging.Level;
import java.util.logging.Logger;
/**
- * Argument handler implementation which accepts file paths or URLs and
- * normalizes the parameters to URLs.
+ * Argument handler implementation which accepts file paths or URLs and normalizes the parameters to
+ * URLs.
*/
public class URLArgumentHandler implements ArgumentHandler {
/**
* Logger.
*/
- private static final Logger LOG =
- Logger.getLogger(URLArgumentHandler.class.getName());
+ private static final Logger LOG = Logger.getLogger(URLArgumentHandler.class.getName());
/**
- * Ensure that the argument is either a file path or a properly formatted URL.
- * If it is a file path, convert to a URL. If neither, throws a
- * UsageException.
+ * Ensure that the argument is either a file path or a properly formatted URL. If it is a file
+ * path, convert to a URL. If neither, throws a UsageException.
*
- * @param arg argument
- * @param form form used
+ * @param arg argument
+ * @param form form used
* @param parameters parameters supplied
* @throws UsageException when file not found or not a workable URL
*/
- public void handleArgument(
- final Argument arg,
- final String form,
- final String[] parameters)
+ public void handleArgument(final Argument arg, final String form, final String[] parameters)
throws UsageException {
final File file = new File(parameters[0]);
URL result = null;
@@ -69,8 +62,7 @@ public class URLArgumentHandler implements ArgumentHandler {
}
if (result == null) {
throw (new UsageException(
- "Argument parameter value is not a valid file "
- + "path or URL: " + arg));
+ "Argument parameter value is not a valid file " + "path or URL: " + arg));
}
parameters[0] = result.toString();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UnknownArgumentHandler.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UnknownArgumentHandler.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UnknownArgumentHandler.java
index 968a008..251aee4 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UnknownArgumentHandler.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UnknownArgumentHandler.java
@@ -1,36 +1,33 @@
/*
- * 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
+ * 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.modules.session.installer.args;
/**
- * Interface defining unknown argument handlers, given the opportunity to either
- * ignore the issue or force the parameter to be dealt with.
+ * Interface defining unknown argument handlers, given the opportunity to either ignore the issue or
+ * force the parameter to be dealt with.
*/
public interface UnknownArgumentHandler {
/**
* Called when an unknown argument is supplied.
*
- * @param form argument name used
+ * @param form argument name used
* @param params parameters passed into it
* @throws UsageException when the user needs to fix it
*/
- void handleUnknownArgument(String form, String[] params)
- throws UsageException;
+ void handleUnknownArgument(String form, String[] params) throws UsageException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UsageException.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UsageException.java b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UsageException.java
index 21dc9c3..cafacda 100644
--- a/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UsageException.java
+++ b/extensions/geode-modules-session/src/main/java/org/apache/geode/modules/session/installer/args/UsageException.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.installer.args;
@@ -52,7 +50,7 @@ public class UsageException extends Exception {
* Creates a new UsageException.
*
* @param message description of exceptional condition
- * @param cause provoking exception
+ * @param cause provoking exception
*/
public UsageException(final String message, final Throwable cause) {
super(message, cause);
@@ -71,8 +69,8 @@ public class UsageException extends Exception {
/**
* Attaches a usage message to the exception for later consumption.
*
- * @param usageText text to display to user to guide them to correct usage.
- * This is generated and set by the <code>ArgsProcessor</code>.
+ * @param usageText text to display to user to guide them to correct usage. This is generated and
+ * set by the <code>ArgsProcessor</code>.
*/
public void setUsage(final String usageText) {
usage = usageText;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
index 272e6de..0d02198 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/installer/InstallerJUnitTest.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.installer;
import static org.junit.Assert.*;
@@ -45,13 +43,10 @@ public class InstallerJUnitTest {
private void testTransformation(final String name) throws Exception {
File webXmlFile = temporaryFolder.newFile();
FileUtil.copy(getClass().getResource(name), webXmlFile);
- final String[] args = {
- "-t", "peer-to-peer",
- "-w", webXmlFile.getAbsolutePath()
- };
+ final String[] args = {"-t", "peer-to-peer", "-w", webXmlFile.getAbsolutePath()};
ByteArrayOutputStream output = new ByteArrayOutputStream();
- try(InputStream input = new FileInputStream(webXmlFile)){
+ try (InputStream input = new FileInputStream(webXmlFile)) {
new Installer(args).processWebXml(input, output);
}
@@ -59,4 +54,4 @@ public class InstallerJUnitTest {
assertEquals(expected, output.toString());
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
index de0d1c3..6e5a9c1 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/AbstractListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -26,8 +24,7 @@ import java.util.concurrent.TimeUnit;
*/
public abstract class AbstractListener {
- protected final List<ListenerEventType> events =
- new ArrayList<ListenerEventType>();
+ protected final List<ListenerEventType> events = new ArrayList<ListenerEventType>();
protected CountDownLatch latch;
@@ -45,8 +42,7 @@ public abstract class AbstractListener {
events.clear();
}
- public boolean await(long timeout,
- TimeUnit unit) throws InterruptedException {
+ public boolean await(long timeout, TimeUnit unit) throws InterruptedException {
return latch.await(timeout, unit);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
index 32ddc42..c1fd5a2 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/BasicServlet.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -25,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.jetty.servlet.DefaultServlet;
+
/**
*
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
index 044a364..0f40c10 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/Callback.java
@@ -1,18 +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
+ * 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.modules.session.internal.filter;
@@ -26,5 +24,6 @@ import java.io.IOException;
* Interface which, when implemented, can be put into a servlet context and executed by the servlet.
*/
public interface Callback {
- void call(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException;
+ void call(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
index 89287b2..d14b111 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CallbackServlet.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -28,16 +26,14 @@ public class CallbackServlet extends HttpServlet {
private Callback callback;
/**
- * Processes requests for both HTTP <code>GET</code> and <code>POST</code>
- * methods.
+ * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
*
- * @param request servlet request
+ * @param request servlet request
* @param response servlet response
* @throws ServletException if a servlet-specific error occurs
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
*/
- protected void processRequest(HttpServletRequest request,
- HttpServletResponse response)
+ protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
if (callback != null) {
@@ -52,10 +48,10 @@ public class CallbackServlet extends HttpServlet {
/**
* Handles the HTTP <code>GET</code> method.
*
- * @param request servlet request
+ * @param request servlet request
* @param response servlet response
* @throws ServletException if a servlet-specific error occurs
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
*/
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
@@ -66,14 +62,13 @@ public class CallbackServlet extends HttpServlet {
/**
* Handles the HTTP <code>POST</code> method.
*
- * @param request servlet request
+ * @param request servlet request
* @param response servlet response
* @throws ServletException if a servlet-specific error occurs
- * @throws IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
*/
@Override
- protected void doPost(HttpServletRequest request,
- HttpServletResponse response)
+ protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
}
[60/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/handlebars-1.0.0.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/handlebars-1.0.0.js b/geode-web-api/src/main/webapp/docs/lib/handlebars-1.0.0.js
deleted file mode 100644
index a5606ce..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/handlebars-1.0.0.js
+++ /dev/null
@@ -1,2278 +0,0 @@
-/*
-
-Copyright (C) 2011 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-*/
-
-// lib/handlebars/browser-prefix.js
-var Handlebars = {};
-
-(function(Handlebars, undefined) {
-;
-// lib/handlebars/base.js
-
-Handlebars.VERSION = "1.0.0";
-Handlebars.COMPILER_REVISION = 4;
-
-Handlebars.REVISION_CHANGES = {
- 1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
- 2: '== 1.0.0-rc.3',
- 3: '== 1.0.0-rc.4',
- 4: '>= 1.0.0'
-};
-
-Handlebars.helpers = {};
-Handlebars.partials = {};
-
-var toString = Object.prototype.toString,
- functionType = '[object Function]',
- objectType = '[object Object]';
-
-Handlebars.registerHelper = function(name, fn, inverse) {
- if (toString.call(name) === objectType) {
- if (inverse || fn) { throw new Handlebars.Exception('Arg not supported with multiple helpers'); }
- Handlebars.Utils.extend(this.helpers, name);
- } else {
- if (inverse) { fn.not = inverse; }
- this.helpers[name] = fn;
- }
-};
-
-Handlebars.registerPartial = function(name, str) {
- if (toString.call(name) === objectType) {
- Handlebars.Utils.extend(this.partials, name);
- } else {
- this.partials[name] = str;
- }
-};
-
-Handlebars.registerHelper('helperMissing', function(arg) {
- if(arguments.length === 2) {
- return undefined;
- } else {
- throw new Error("Missing helper: '" + arg + "'");
- }
-});
-
-Handlebars.registerHelper('blockHelperMissing', function(context, options) {
- var inverse = options.inverse || function() {}, fn = options.fn;
-
- var type = toString.call(context);
-
- if(type === functionType) { context = context.call(this); }
-
- if(context === true) {
- return fn(this);
- } else if(context === false || context == null) {
- return inverse(this);
- } else if(type === "[object Array]") {
- if(context.length > 0) {
- return Handlebars.helpers.each(context, options);
- } else {
- return inverse(this);
- }
- } else {
- return fn(context);
- }
-});
-
-Handlebars.K = function() {};
-
-Handlebars.createFrame = Object.create || function(object) {
- Handlebars.K.prototype = object;
- var obj = new Handlebars.K();
- Handlebars.K.prototype = null;
- return obj;
-};
-
-Handlebars.logger = {
- DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3,
-
- methodMap: {0: 'debug', 1: 'info', 2: 'warn', 3: 'error'},
-
- // can be overridden in the host environment
- log: function(level, obj) {
- if (Handlebars.logger.level <= level) {
- var method = Handlebars.logger.methodMap[level];
- if (typeof console !== 'undefined' && console[method]) {
- console[method].call(console, obj);
- }
- }
- }
-};
-
-Handlebars.log = function(level, obj) { Handlebars.logger.log(level, obj); };
-
-Handlebars.registerHelper('each', function(context, options) {
- var fn = options.fn, inverse = options.inverse;
- var i = 0, ret = "", data;
-
- var type = toString.call(context);
- if(type === functionType) { context = context.call(this); }
-
- if (options.data) {
- data = Handlebars.createFrame(options.data);
- }
-
- if(context && typeof context === 'object') {
- if(context instanceof Array){
- for(var j = context.length; i<j; i++) {
- if (data) { data.index = i; }
- ret = ret + fn(context[i], { data: data });
- }
- } else {
- for(var key in context) {
- if(context.hasOwnProperty(key)) {
- if(data) { data.key = key; }
- ret = ret + fn(context[key], {data: data});
- i++;
- }
- }
- }
- }
-
- if(i === 0){
- ret = inverse(this);
- }
-
- return ret;
-});
-
-Handlebars.registerHelper('if', function(conditional, options) {
- var type = toString.call(conditional);
- if(type === functionType) { conditional = conditional.call(this); }
-
- if(!conditional || Handlebars.Utils.isEmpty(conditional)) {
- return options.inverse(this);
- } else {
- return options.fn(this);
- }
-});
-
-Handlebars.registerHelper('unless', function(conditional, options) {
- return Handlebars.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn});
-});
-
-Handlebars.registerHelper('with', function(context, options) {
- var type = toString.call(context);
- if(type === functionType) { context = context.call(this); }
-
- if (!Handlebars.Utils.isEmpty(context)) return options.fn(context);
-});
-
-Handlebars.registerHelper('log', function(context, options) {
- var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
- Handlebars.log(level, context);
-});
-;
-// lib/handlebars/compiler/parser.js
-/* Jison generated parser */
-var handlebars = (function(){
-var parser = {trace: function trace() { },
-yy: {},
-symbols_: {"error":2,"root":3,"program":4,"EOF":5,"simpleInverse":6,"statements":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"params":27,"hash":28,"dataName":29,"param":30,"STRING":31,"INTEGER":32,"BOOLEAN":33,"hashSegments":34,"hashSegment":35,"ID":36,"EQUALS":37,"DATA":38,"pathSegments":39,"SEP":40,"$accept":0,"$end":1},
-terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",31:"STRING",32:"INTEGER",33:"BOOLEAN",36:"ID",37:"EQUALS",38:"DATA",40:"SEP"},
-productions_: [0,[3,2],[4,2],[4,3],[4,2],[4,1],[4,1],[4,0],[7,1],[7,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,3],[13,4],[6,2],[17,3],[17,2],[17,2],[17,1],[17,1],[27,2],[27,1],[30,1],[30,1],[30,1],[30,1],[30,1],[28,1],[34,2],[34,1],[35,3],[35,3],[35,3],[35,3],[35,3],[26,1],[26,1],[26,1],[29,2],[21,1],[39,3],[39,1]],
-performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
-
-var $0 = $$.length - 1;
-switch (yystate) {
-case 1: return $$[$0-1];
-break;
-case 2: this.$ = new yy.ProgramNode([], $$[$0]);
-break;
-case 3: this.$ = new yy.ProgramNode($$[$0-2], $$[$0]);
-break;
-case 4: this.$ = new yy.ProgramNode($$[$0-1], []);
-break;
-case 5: this.$ = new yy.ProgramNode($$[$0]);
-break;
-case 6: this.$ = new yy.ProgramNode([], []);
-break;
-case 7: this.$ = new yy.ProgramNode([]);
-break;
-case 8: this.$ = [$$[$0]];
-break;
-case 9: $$[$0-1].push($$[$0]); this.$ = $$[$0-1];
-break;
-case 10: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0]);
-break;
-case 11: this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0]);
-break;
-case 12: this.$ = $$[$0];
-break;
-case 13: this.$ = $$[$0];
-break;
-case 14: this.$ = new yy.ContentNode($$[$0]);
-break;
-case 15: this.$ = new yy.CommentNode($$[$0]);
-break;
-case 16: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]);
-break;
-case 17: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1]);
-break;
-case 18: this.$ = $$[$0-1];
-break;
-case 19:
- // Parsing out the '&' escape token at this level saves ~500 bytes after min due to the removal of one parser node.
- this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2][2] === '&');
-
-break;
-case 20: this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], true);
-break;
-case 21: this.$ = new yy.PartialNode($$[$0-1]);
-break;
-case 22: this.$ = new yy.PartialNode($$[$0-2], $$[$0-1]);
-break;
-case 23:
-break;
-case 24: this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]];
-break;
-case 25: this.$ = [[$$[$0-1]].concat($$[$0]), null];
-break;
-case 26: this.$ = [[$$[$0-1]], $$[$0]];
-break;
-case 27: this.$ = [[$$[$0]], null];
-break;
-case 28: this.$ = [[$$[$0]], null];
-break;
-case 29: $$[$0-1].push($$[$0]); this.$ = $$[$0-1];
-break;
-case 30: this.$ = [$$[$0]];
-break;
-case 31: this.$ = $$[$0];
-break;
-case 32: this.$ = new yy.StringNode($$[$0]);
-break;
-case 33: this.$ = new yy.IntegerNode($$[$0]);
-break;
-case 34: this.$ = new yy.BooleanNode($$[$0]);
-break;
-case 35: this.$ = $$[$0];
-break;
-case 36: this.$ = new yy.HashNode($$[$0]);
-break;
-case 37: $$[$0-1].push($$[$0]); this.$ = $$[$0-1];
-break;
-case 38: this.$ = [$$[$0]];
-break;
-case 39: this.$ = [$$[$0-2], $$[$0]];
-break;
-case 40: this.$ = [$$[$0-2], new yy.StringNode($$[$0])];
-break;
-case 41: this.$ = [$$[$0-2], new yy.IntegerNode($$[$0])];
-break;
-case 42: this.$ = [$$[$0-2], new yy.BooleanNode($$[$0])];
-break;
-case 43: this.$ = [$$[$0-2], $$[$0]];
-break;
-case 44: this.$ = new yy.PartialNameNode($$[$0]);
-break;
-case 45: this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0]));
-break;
-case 46: this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0]));
-break;
-case 47: this.$ = new yy.DataNode($$[$0]);
-break;
-case 48: this.$ = new yy.IdNode($$[$0]);
-break;
-case 49: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2];
-break;
-case 50: this.$ = [{part: $$[$0]}];
-break;
-}
-},
-table: [{3:1,4:2,5:[2,7],6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],22:[1,14],23:[1,15],25:[1,16]},{1:[3]},{5:[1,17]},{5:[2,6],7:18,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,6],22:[1,14],23:[1,15],25:[1,16]},{5:[2,5],6:20,8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,5],22:[1,14],23:[1,15],25:[1,16]},{17:23,18:[1,22],21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,8],14:[2,8],15:[2,8],16:[2,8],19:[2,8],20:[2,8],22:[2,8],23:[2,8],25:[2,8]},{4:29,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{4:30,6:3,7:4,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,5],20:[2,7],22:[1,14],23:[1,15],25:[1,16]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],2
2:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{17:31,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:32,21:24,29:25,36:[1,28],38:[1,27],39:26},{17:33,21:24,29:25,36:[1,28],38:[1,27],39:26},{21:35,26:34,31:[1,36],32:[1,37],36:[1,28],39:26},{1:[2,1]},{5:[2,2],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,2],22:[1,14],23:[1,15],25:[1,16]},{17:23,21:24,29:25,36:[1,28],38:[1,27],39:26},{5:[2,4],7:38,8:6,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,4],22:[1,14],23:[1,15],25:[1,16]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{5:[2,23],14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{18:[1,39]},{18:[2,27],21:44,24:[2,27],27:40,28:41,29:48,30:42,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,28],24:[2,28]},{18:[2,48],24:[2,48],31:[2,48],32:[2,48],33:[2,48],36:[2,48],38:[2,48],40
:[1,51]},{21:52,36:[1,28],39:26},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],38:[2,50],40:[2,50]},{10:53,20:[1,54]},{10:55,20:[1,54]},{18:[1,56]},{18:[1,57]},{24:[1,58]},{18:[1,59],21:60,36:[1,28],39:26},{18:[2,44],36:[2,44]},{18:[2,45],36:[2,45]},{18:[2,46],36:[2,46]},{5:[2,3],8:21,9:7,11:8,12:9,13:10,14:[1,11],15:[1,12],16:[1,13],19:[1,19],20:[2,3],22:[1,14],23:[1,15],25:[1,16]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{18:[2,25],21:44,24:[2,25],28:61,29:48,30:62,31:[1,45],32:[1,46],33:[1,47],34:43,35:49,36:[1,50],38:[1,27],39:26},{18:[2,26],24:[2,26]},{18:[2,30],24:[2,30],31:[2,30],32:[2,30],33:[2,30],36:[2,30],38:[2,30]},{18:[2,36],24:[2,36],35:63,36:[1,64]},{18:[2,31],24:[2,31],31:[2,31],32:[2,31],33:[2,31],36:[2,31],38:[2,31]},{18:[2,32],24:[2,32],31:[2,32],32:[2,32],33:[2,32],36:[2,32],38:[2,32]},{18:[2,33],24:[2,33],31:[2,33],32:[2,33],33:[2,33],36:[2,33],38:[2,33]},{18:[2,34],24:[2,34],31:[2,34],32:[2,34],33:[2,34],3
6:[2,34],38:[2,34]},{18:[2,35],24:[2,35],31:[2,35],32:[2,35],33:[2,35],36:[2,35],38:[2,35]},{18:[2,38],24:[2,38],36:[2,38]},{18:[2,50],24:[2,50],31:[2,50],32:[2,50],33:[2,50],36:[2,50],37:[1,65],38:[2,50],40:[2,50]},{36:[1,66]},{18:[2,47],24:[2,47],31:[2,47],32:[2,47],33:[2,47],36:[2,47],38:[2,47]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{21:67,36:[1,28],39:26},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,68]},{18:[2,24],24:[2,24]},{18:[2,29],24:[2,29],31:[2,29],32:[2,29],33:[2,29],36:[2,29],38:[2,29]},{18:[2,37],24:[2,37],36:[2,37]
},{37:[1,65]},{21:69,29:73,31:[1,70],32:[1,71],33:[1,72],36:[1,28],38:[1,27],39:26},{18:[2,49],24:[2,49],31:[2,49],32:[2,49],33:[2,49],36:[2,49],38:[2,49],40:[2,49]},{18:[1,74]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{18:[2,39],24:[2,39],36:[2,39]},{18:[2,40],24:[2,40],36:[2,40]},{18:[2,41],24:[2,41],36:[2,41]},{18:[2,42],24:[2,42],36:[2,42]},{18:[2,43],24:[2,43],36:[2,43]},{5:[2,18],14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]}],
-defaultActions: {17:[2,1]},
-parseError: function parseError(str, hash) {
- throw new Error(str);
-},
-parse: function parse(input) {
- var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
- this.lexer.setInput(input);
- this.lexer.yy = this.yy;
- this.yy.lexer = this.lexer;
- this.yy.parser = this;
- if (typeof this.lexer.yylloc == "undefined")
- this.lexer.yylloc = {};
- var yyloc = this.lexer.yylloc;
- lstack.push(yyloc);
- var ranges = this.lexer.options && this.lexer.options.ranges;
- if (typeof this.yy.parseError === "function")
- this.parseError = this.yy.parseError;
- function popStack(n) {
- stack.length = stack.length - 2 * n;
- vstack.length = vstack.length - n;
- lstack.length = lstack.length - n;
- }
- function lex() {
- var token;
- token = self.lexer.lex() || 1;
- if (typeof token !== "number") {
- token = self.symbols_[token] || token;
- }
- return token;
- }
- var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
- while (true) {
- state = stack[stack.length - 1];
- if (this.defaultActions[state]) {
- action = this.defaultActions[state];
- } else {
- if (symbol === null || typeof symbol == "undefined") {
- symbol = lex();
- }
- action = table[state] && table[state][symbol];
- }
- if (typeof action === "undefined" || !action.length || !action[0]) {
- var errStr = "";
- if (!recovering) {
- expected = [];
- for (p in table[state])
- if (this.terminals_[p] && p > 2) {
- expected.push("'" + this.terminals_[p] + "'");
- }
- if (this.lexer.showPosition) {
- errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'";
- } else {
- errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
- }
- this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
- }
- }
- if (action[0] instanceof Array && action.length > 1) {
- throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
- }
- switch (action[0]) {
- case 1:
- stack.push(symbol);
- vstack.push(this.lexer.yytext);
- lstack.push(this.lexer.yylloc);
- stack.push(action[1]);
- symbol = null;
- if (!preErrorSymbol) {
- yyleng = this.lexer.yyleng;
- yytext = this.lexer.yytext;
- yylineno = this.lexer.yylineno;
- yyloc = this.lexer.yylloc;
- if (recovering > 0)
- recovering--;
- } else {
- symbol = preErrorSymbol;
- preErrorSymbol = null;
- }
- break;
- case 2:
- len = this.productions_[action[1]][1];
- yyval.$ = vstack[vstack.length - len];
- yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
- if (ranges) {
- yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
- }
- r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
- if (typeof r !== "undefined") {
- return r;
- }
- if (len) {
- stack = stack.slice(0, -1 * len * 2);
- vstack = vstack.slice(0, -1 * len);
- lstack = lstack.slice(0, -1 * len);
- }
- stack.push(this.productions_[action[1]][0]);
- vstack.push(yyval.$);
- lstack.push(yyval._$);
- newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
- stack.push(newState);
- break;
- case 3:
- return true;
- }
- }
- return true;
-}
-};
-/* Jison generated lexer */
-var lexer = (function(){
-var lexer = ({EOF:1,
-parseError:function parseError(str, hash) {
- if (this.yy.parser) {
- this.yy.parser.parseError(str, hash);
- } else {
- throw new Error(str);
- }
- },
-setInput:function (input) {
- this._input = input;
- this._more = this._less = this.done = false;
- this.yylineno = this.yyleng = 0;
- this.yytext = this.matched = this.match = '';
- this.conditionStack = ['INITIAL'];
- this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
- if (this.options.ranges) this.yylloc.range = [0,0];
- this.offset = 0;
- return this;
- },
-input:function () {
- var ch = this._input[0];
- this.yytext += ch;
- this.yyleng++;
- this.offset++;
- this.match += ch;
- this.matched += ch;
- var lines = ch.match(/(?:\r\n?|\n).*/g);
- if (lines) {
- this.yylineno++;
- this.yylloc.last_line++;
- } else {
- this.yylloc.last_column++;
- }
- if (this.options.ranges) this.yylloc.range[1]++;
-
- this._input = this._input.slice(1);
- return ch;
- },
-unput:function (ch) {
- var len = ch.length;
- var lines = ch.split(/(?:\r\n?|\n)/g);
-
- this._input = ch + this._input;
- this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
- //this.yyleng -= len;
- this.offset -= len;
- var oldLines = this.match.split(/(?:\r\n?|\n)/g);
- this.match = this.match.substr(0, this.match.length-1);
- this.matched = this.matched.substr(0, this.matched.length-1);
-
- if (lines.length-1) this.yylineno -= lines.length-1;
- var r = this.yylloc.range;
-
- this.yylloc = {first_line: this.yylloc.first_line,
- last_line: this.yylineno+1,
- first_column: this.yylloc.first_column,
- last_column: lines ?
- (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
- this.yylloc.first_column - len
- };
-
- if (this.options.ranges) {
- this.yylloc.range = [r[0], r[0] + this.yyleng - len];
- }
- return this;
- },
-more:function () {
- this._more = true;
- return this;
- },
-less:function (n) {
- this.unput(this.match.slice(n));
- },
-pastInput:function () {
- var past = this.matched.substr(0, this.matched.length - this.match.length);
- return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
- },
-upcomingInput:function () {
- var next = this.match;
- if (next.length < 20) {
- next += this._input.substr(0, 20-next.length);
- }
- return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
- },
-showPosition:function () {
- var pre = this.pastInput();
- var c = new Array(pre.length + 1).join("-");
- return pre + this.upcomingInput() + "\n" + c+"^";
- },
-next:function () {
- if (this.done) {
- return this.EOF;
- }
- if (!this._input) this.done = true;
-
- var token,
- match,
- tempMatch,
- index,
- col,
- lines;
- if (!this._more) {
- this.yytext = '';
- this.match = '';
- }
- var rules = this._currentRules();
- for (var i=0;i < rules.length; i++) {
- tempMatch = this._input.match(this.rules[rules[i]]);
- if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
- match = tempMatch;
- index = i;
- if (!this.options.flex) break;
- }
- }
- if (match) {
- lines = match[0].match(/(?:\r\n?|\n).*/g);
- if (lines) this.yylineno += lines.length;
- this.yylloc = {first_line: this.yylloc.last_line,
- last_line: this.yylineno+1,
- first_column: this.yylloc.last_column,
- last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
- this.yytext += match[0];
- this.match += match[0];
- this.matches = match;
- this.yyleng = this.yytext.length;
- if (this.options.ranges) {
- this.yylloc.range = [this.offset, this.offset += this.yyleng];
- }
- this._more = false;
- this._input = this._input.slice(match[0].length);
- this.matched += match[0];
- token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
- if (this.done && this._input) this.done = false;
- if (token) return token;
- else return;
- }
- if (this._input === "") {
- return this.EOF;
- } else {
- return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
- {text: "", token: null, line: this.yylineno});
- }
- },
-lex:function lex() {
- var r = this.next();
- if (typeof r !== 'undefined') {
- return r;
- } else {
- return this.lex();
- }
- },
-begin:function begin(condition) {
- this.conditionStack.push(condition);
- },
-popState:function popState() {
- return this.conditionStack.pop();
- },
-_currentRules:function _currentRules() {
- return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
- },
-topState:function () {
- return this.conditionStack[this.conditionStack.length-2];
- },
-pushState:function begin(condition) {
- this.begin(condition);
- }});
-lexer.options = {};
-lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-
-var YYSTATE=YY_START
-switch($avoiding_name_collisions) {
-case 0: yy_.yytext = "\\"; return 14;
-break;
-case 1:
- if(yy_.yytext.slice(-1) !== "\\") this.begin("mu");
- if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1), this.begin("emu");
- if(yy_.yytext) return 14;
-
-break;
-case 2: return 14;
-break;
-case 3:
- if(yy_.yytext.slice(-1) !== "\\") this.popState();
- if(yy_.yytext.slice(-1) === "\\") yy_.yytext = yy_.yytext.substr(0,yy_.yyleng-1);
- return 14;
-
-break;
-case 4: yy_.yytext = yy_.yytext.substr(0, yy_.yyleng-4); this.popState(); return 15;
-break;
-case 5: return 25;
-break;
-case 6: return 16;
-break;
-case 7: return 20;
-break;
-case 8: return 19;
-break;
-case 9: return 19;
-break;
-case 10: return 23;
-break;
-case 11: return 22;
-break;
-case 12: this.popState(); this.begin('com');
-break;
-case 13: yy_.yytext = yy_.yytext.substr(3,yy_.yyleng-5); this.popState(); return 15;
-break;
-case 14: return 22;
-break;
-case 15: return 37;
-break;
-case 16: return 36;
-break;
-case 17: return 36;
-break;
-case 18: return 40;
-break;
-case 19: /*ignore whitespace*/
-break;
-case 20: this.popState(); return 24;
-break;
-case 21: this.popState(); return 18;
-break;
-case 22: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\"/g,'"'); return 31;
-break;
-case 23: yy_.yytext = yy_.yytext.substr(1,yy_.yyleng-2).replace(/\\'/g,"'"); return 31;
-break;
-case 24: return 38;
-break;
-case 25: return 33;
-break;
-case 26: return 33;
-break;
-case 27: return 32;
-break;
-case 28: return 36;
-break;
-case 29: yy_.yytext = yy_.yytext.substr(1, yy_.yyleng-2); return 36;
-break;
-case 30: return 'INVALID';
-break;
-case 31: return 5;
-break;
-}
-};
-lexer.rules = [/^(?:\\\\(?=(\{\{)))/,/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\{\{>)/,/^(?:\{\{#)/,/^(?:\{\{\/)/,/^(?:\{\{\^)/,/^(?:\{\{\s*else\b)/,/^(?:\{\{\{)/,/^(?:\{\{&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{)/,/^(?:=)/,/^(?:\.(?=[}\/ ]))/,/^(?:\.\.)/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}\}\})/,/^(?:\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=[}\s]))/,/^(?:false(?=[}\s]))/,/^(?:-?[0-9]+(?=[}\s]))/,/^(?:[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.]))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
-lexer.conditions = {"mu":{"rules":[5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31],"inclusive":false},"emu":{"rules":[3],"inclusive":false},"com":{"rules":[4],"inclusive":false},"INITIAL":{"rules":[0,1,2,31],"inclusive":true}};
-return lexer;})()
-parser.lexer = lexer;
-function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
-return new Parser;
-})();;
-// lib/handlebars/compiler/base.js
-
-Handlebars.Parser = handlebars;
-
-Handlebars.parse = function(input) {
-
- // Just return if an already-compile AST was passed in.
- if(input.constructor === Handlebars.AST.ProgramNode) { return input; }
-
- Handlebars.Parser.yy = Handlebars.AST;
- return Handlebars.Parser.parse(input);
-};
-;
-// lib/handlebars/compiler/ast.js
-Handlebars.AST = {};
-
-Handlebars.AST.ProgramNode = function(statements, inverse) {
- this.type = "program";
- this.statements = statements;
- if(inverse) { this.inverse = new Handlebars.AST.ProgramNode(inverse); }
-};
-
-Handlebars.AST.MustacheNode = function(rawParams, hash, unescaped) {
- this.type = "mustache";
- this.escaped = !unescaped;
- this.hash = hash;
-
- var id = this.id = rawParams[0];
- var params = this.params = rawParams.slice(1);
-
- // a mustache is an eligible helper if:
- // * its id is simple (a single part, not `this` or `..`)
- var eligibleHelper = this.eligibleHelper = id.isSimple;
-
- // a mustache is definitely a helper if:
- // * it is an eligible helper, and
- // * it has at least one parameter or hash segment
- this.isHelper = eligibleHelper && (params.length || hash);
-
- // if a mustache is an eligible helper but not a definite
- // helper, it is ambiguous, and will be resolved in a later
- // pass or at runtime.
-};
-
-Handlebars.AST.PartialNode = function(partialName, context) {
- this.type = "partial";
- this.partialName = partialName;
- this.context = context;
-};
-
-Handlebars.AST.BlockNode = function(mustache, program, inverse, close) {
- var verifyMatch = function(open, close) {
- if(open.original !== close.original) {
- throw new Handlebars.Exception(open.original + " doesn't match " + close.original);
- }
- };
-
- verifyMatch(mustache.id, close);
- this.type = "block";
- this.mustache = mustache;
- this.program = program;
- this.inverse = inverse;
-
- if (this.inverse && !this.program) {
- this.isInverse = true;
- }
-};
-
-Handlebars.AST.ContentNode = function(string) {
- this.type = "content";
- this.string = string;
-};
-
-Handlebars.AST.HashNode = function(pairs) {
- this.type = "hash";
- this.pairs = pairs;
-};
-
-Handlebars.AST.IdNode = function(parts) {
- this.type = "ID";
-
- var original = "",
- dig = [],
- depth = 0;
-
- for(var i=0,l=parts.length; i<l; i++) {
- var part = parts[i].part;
- original += (parts[i].separator || '') + part;
-
- if (part === ".." || part === "." || part === "this") {
- if (dig.length > 0) { throw new Handlebars.Exception("Invalid path: " + original); }
- else if (part === "..") { depth++; }
- else { this.isScoped = true; }
- }
- else { dig.push(part); }
- }
-
- this.original = original;
- this.parts = dig;
- this.string = dig.join('.');
- this.depth = depth;
-
- // an ID is simple if it only has one part, and that part is not
- // `..` or `this`.
- this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
-
- this.stringModeValue = this.string;
-};
-
-Handlebars.AST.PartialNameNode = function(name) {
- this.type = "PARTIAL_NAME";
- this.name = name.original;
-};
-
-Handlebars.AST.DataNode = function(id) {
- this.type = "DATA";
- this.id = id;
-};
-
-Handlebars.AST.StringNode = function(string) {
- this.type = "STRING";
- this.original =
- this.string =
- this.stringModeValue = string;
-};
-
-Handlebars.AST.IntegerNode = function(integer) {
- this.type = "INTEGER";
- this.original =
- this.integer = integer;
- this.stringModeValue = Number(integer);
-};
-
-Handlebars.AST.BooleanNode = function(bool) {
- this.type = "BOOLEAN";
- this.bool = bool;
- this.stringModeValue = bool === "true";
-};
-
-Handlebars.AST.CommentNode = function(comment) {
- this.type = "comment";
- this.comment = comment;
-};
-;
-// lib/handlebars/utils.js
-
-var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
-
-Handlebars.Exception = function(message) {
- var tmp = Error.prototype.constructor.apply(this, arguments);
-
- // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
- for (var idx = 0; idx < errorProps.length; idx++) {
- this[errorProps[idx]] = tmp[errorProps[idx]];
- }
-};
-Handlebars.Exception.prototype = new Error();
-
-// Build out our basic SafeString type
-Handlebars.SafeString = function(string) {
- this.string = string;
-};
-Handlebars.SafeString.prototype.toString = function() {
- return this.string.toString();
-};
-
-var escape = {
- "&": "&",
- "<": "<",
- ">": ">",
- '"': """,
- "'": "'",
- "`": "`"
-};
-
-var badChars = /[&<>"'`]/g;
-var possible = /[&<>"'`]/;
-
-var escapeChar = function(chr) {
- return escape[chr] || "&";
-};
-
-Handlebars.Utils = {
- extend: function(obj, value) {
- for(var key in value) {
- if(value.hasOwnProperty(key)) {
- obj[key] = value[key];
- }
- }
- },
-
- escapeExpression: function(string) {
- // don't escape SafeStrings, since they're already safe
- if (string instanceof Handlebars.SafeString) {
- return string.toString();
- } else if (string == null || string === false) {
- return "";
- }
-
- // Force a string conversion as this will be done by the append regardless and
- // the regex test will do this transparently behind the scenes, causing issues if
- // an object's to string has escaped characters in it.
- string = string.toString();
-
- if(!possible.test(string)) { return string; }
- return string.replace(badChars, escapeChar);
- },
-
- isEmpty: function(value) {
- if (!value && value !== 0) {
- return true;
- } else if(toString.call(value) === "[object Array]" && value.length === 0) {
- return true;
- } else {
- return false;
- }
- }
-};
-;
-// lib/handlebars/compiler/compiler.js
-
-/*jshint eqnull:true*/
-var Compiler = Handlebars.Compiler = function() {};
-var JavaScriptCompiler = Handlebars.JavaScriptCompiler = function() {};
-
-// the foundHelper register will disambiguate helper lookup from finding a
-// function in a context. This is necessary for mustache compatibility, which
-// requires that context functions in blocks are evaluated by blockHelperMissing,
-// and then proceed as if the resulting value was provided to blockHelperMissing.
-
-Compiler.prototype = {
- compiler: Compiler,
-
- disassemble: function() {
- var opcodes = this.opcodes, opcode, out = [], params, param;
-
- for (var i=0, l=opcodes.length; i<l; i++) {
- opcode = opcodes[i];
-
- if (opcode.opcode === 'DECLARE') {
- out.push("DECLARE " + opcode.name + "=" + opcode.value);
- } else {
- params = [];
- for (var j=0; j<opcode.args.length; j++) {
- param = opcode.args[j];
- if (typeof param === "string") {
- param = "\"" + param.replace("\n", "\\n") + "\"";
- }
- params.push(param);
- }
- out.push(opcode.opcode + " " + params.join(" "));
- }
- }
-
- return out.join("\n");
- },
- equals: function(other) {
- var len = this.opcodes.length;
- if (other.opcodes.length !== len) {
- return false;
- }
-
- for (var i = 0; i < len; i++) {
- var opcode = this.opcodes[i],
- otherOpcode = other.opcodes[i];
- if (opcode.opcode !== otherOpcode.opcode || opcode.args.length !== otherOpcode.args.length) {
- return false;
- }
- for (var j = 0; j < opcode.args.length; j++) {
- if (opcode.args[j] !== otherOpcode.args[j]) {
- return false;
- }
- }
- }
-
- len = this.children.length;
- if (other.children.length !== len) {
- return false;
- }
- for (i = 0; i < len; i++) {
- if (!this.children[i].equals(other.children[i])) {
- return false;
- }
- }
-
- return true;
- },
-
- guid: 0,
-
- compile: function(program, options) {
- this.children = [];
- this.depths = {list: []};
- this.options = options;
-
- // These changes will propagate to the other compiler components
- var knownHelpers = this.options.knownHelpers;
- this.options.knownHelpers = {
- 'helperMissing': true,
- 'blockHelperMissing': true,
- 'each': true,
- 'if': true,
- 'unless': true,
- 'with': true,
- 'log': true
- };
- if (knownHelpers) {
- for (var name in knownHelpers) {
- this.options.knownHelpers[name] = knownHelpers[name];
- }
- }
-
- return this.program(program);
- },
-
- accept: function(node) {
- return this[node.type](node);
- },
-
- program: function(program) {
- var statements = program.statements, statement;
- this.opcodes = [];
-
- for(var i=0, l=statements.length; i<l; i++) {
- statement = statements[i];
- this[statement.type](statement);
- }
- this.isSimple = l === 1;
-
- this.depths.list = this.depths.list.sort(function(a, b) {
- return a - b;
- });
-
- return this;
- },
-
- compileProgram: function(program) {
- var result = new this.compiler().compile(program, this.options);
- var guid = this.guid++, depth;
-
- this.usePartial = this.usePartial || result.usePartial;
-
- this.children[guid] = result;
-
- for(var i=0, l=result.depths.list.length; i<l; i++) {
- depth = result.depths.list[i];
-
- if(depth < 2) { continue; }
- else { this.addDepth(depth - 1); }
- }
-
- return guid;
- },
-
- block: function(block) {
- var mustache = block.mustache,
- program = block.program,
- inverse = block.inverse;
-
- if (program) {
- program = this.compileProgram(program);
- }
-
- if (inverse) {
- inverse = this.compileProgram(inverse);
- }
-
- var type = this.classifyMustache(mustache);
-
- if (type === "helper") {
- this.helperMustache(mustache, program, inverse);
- } else if (type === "simple") {
- this.simpleMustache(mustache);
-
- // now that the simple mustache is resolved, we need to
- // evaluate it by executing `blockHelperMissing`
- this.opcode('pushProgram', program);
- this.opcode('pushProgram', inverse);
- this.opcode('emptyHash');
- this.opcode('blockValue');
- } else {
- this.ambiguousMustache(mustache, program, inverse);
-
- // now that the simple mustache is resolved, we need to
- // evaluate it by executing `blockHelperMissing`
- this.opcode('pushProgram', program);
- this.opcode('pushProgram', inverse);
- this.opcode('emptyHash');
- this.opcode('ambiguousBlockValue');
- }
-
- this.opcode('append');
- },
-
- hash: function(hash) {
- var pairs = hash.pairs, pair, val;
-
- this.opcode('pushHash');
-
- for(var i=0, l=pairs.length; i<l; i++) {
- pair = pairs[i];
- val = pair[1];
-
- if (this.options.stringParams) {
- if(val.depth) {
- this.addDepth(val.depth);
- }
- this.opcode('getContext', val.depth || 0);
- this.opcode('pushStringParam', val.stringModeValue, val.type);
- } else {
- this.accept(val);
- }
-
- this.opcode('assignToHash', pair[0]);
- }
- this.opcode('popHash');
- },
-
- partial: function(partial) {
- var partialName = partial.partialName;
- this.usePartial = true;
-
- if(partial.context) {
- this.ID(partial.context);
- } else {
- this.opcode('push', 'depth0');
- }
-
- this.opcode('invokePartial', partialName.name);
- this.opcode('append');
- },
-
- content: function(content) {
- this.opcode('appendContent', content.string);
- },
-
- mustache: function(mustache) {
- var options = this.options;
- var type = this.classifyMustache(mustache);
-
- if (type === "simple") {
- this.simpleMustache(mustache);
- } else if (type === "helper") {
- this.helperMustache(mustache);
- } else {
- this.ambiguousMustache(mustache);
- }
-
- if(mustache.escaped && !options.noEscape) {
- this.opcode('appendEscaped');
- } else {
- this.opcode('append');
- }
- },
-
- ambiguousMustache: function(mustache, program, inverse) {
- var id = mustache.id,
- name = id.parts[0],
- isBlock = program != null || inverse != null;
-
- this.opcode('getContext', id.depth);
-
- this.opcode('pushProgram', program);
- this.opcode('pushProgram', inverse);
-
- this.opcode('invokeAmbiguous', name, isBlock);
- },
-
- simpleMustache: function(mustache) {
- var id = mustache.id;
-
- if (id.type === 'DATA') {
- this.DATA(id);
- } else if (id.parts.length) {
- this.ID(id);
- } else {
- // Simplified ID for `this`
- this.addDepth(id.depth);
- this.opcode('getContext', id.depth);
- this.opcode('pushContext');
- }
-
- this.opcode('resolvePossibleLambda');
- },
-
- helperMustache: function(mustache, program, inverse) {
- var params = this.setupFullMustacheParams(mustache, program, inverse),
- name = mustache.id.parts[0];
-
- if (this.options.knownHelpers[name]) {
- this.opcode('invokeKnownHelper', params.length, name);
- } else if (this.options.knownHelpersOnly) {
- throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name);
- } else {
- this.opcode('invokeHelper', params.length, name);
- }
- },
-
- ID: function(id) {
- this.addDepth(id.depth);
- this.opcode('getContext', id.depth);
-
- var name = id.parts[0];
- if (!name) {
- this.opcode('pushContext');
- } else {
- this.opcode('lookupOnContext', id.parts[0]);
- }
-
- for(var i=1, l=id.parts.length; i<l; i++) {
- this.opcode('lookup', id.parts[i]);
- }
- },
-
- DATA: function(data) {
- this.options.data = true;
- if (data.id.isScoped || data.id.depth) {
- throw new Handlebars.Exception('Scoped data references are not supported: ' + data.original);
- }
-
- this.opcode('lookupData');
- var parts = data.id.parts;
- for(var i=0, l=parts.length; i<l; i++) {
- this.opcode('lookup', parts[i]);
- }
- },
-
- STRING: function(string) {
- this.opcode('pushString', string.string);
- },
-
- INTEGER: function(integer) {
- this.opcode('pushLiteral', integer.integer);
- },
-
- BOOLEAN: function(bool) {
- this.opcode('pushLiteral', bool.bool);
- },
-
- comment: function() {},
-
- // HELPERS
- opcode: function(name) {
- this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) });
- },
-
- declare: function(name, value) {
- this.opcodes.push({ opcode: 'DECLARE', name: name, value: value });
- },
-
- addDepth: function(depth) {
- if(isNaN(depth)) { throw new Error("EWOT"); }
- if(depth === 0) { return; }
-
- if(!this.depths[depth]) {
- this.depths[depth] = true;
- this.depths.list.push(depth);
- }
- },
-
- classifyMustache: function(mustache) {
- var isHelper = mustache.isHelper;
- var isEligible = mustache.eligibleHelper;
- var options = this.options;
-
- // if ambiguous, we can possibly resolve the ambiguity now
- if (isEligible && !isHelper) {
- var name = mustache.id.parts[0];
-
- if (options.knownHelpers[name]) {
- isHelper = true;
- } else if (options.knownHelpersOnly) {
- isEligible = false;
- }
- }
-
- if (isHelper) { return "helper"; }
- else if (isEligible) { return "ambiguous"; }
- else { return "simple"; }
- },
-
- pushParams: function(params) {
- var i = params.length, param;
-
- while(i--) {
- param = params[i];
-
- if(this.options.stringParams) {
- if(param.depth) {
- this.addDepth(param.depth);
- }
-
- this.opcode('getContext', param.depth || 0);
- this.opcode('pushStringParam', param.stringModeValue, param.type);
- } else {
- this[param.type](param);
- }
- }
- },
-
- setupMustacheParams: function(mustache) {
- var params = mustache.params;
- this.pushParams(params);
-
- if(mustache.hash) {
- this.hash(mustache.hash);
- } else {
- this.opcode('emptyHash');
- }
-
- return params;
- },
-
- // this will replace setupMustacheParams when we're done
- setupFullMustacheParams: function(mustache, program, inverse) {
- var params = mustache.params;
- this.pushParams(params);
-
- this.opcode('pushProgram', program);
- this.opcode('pushProgram', inverse);
-
- if(mustache.hash) {
- this.hash(mustache.hash);
- } else {
- this.opcode('emptyHash');
- }
-
- return params;
- }
-};
-
-var Literal = function(value) {
- this.value = value;
-};
-
-JavaScriptCompiler.prototype = {
- // PUBLIC API: You can override these methods in a subclass to provide
- // alternative compiled forms for name lookup and buffering semantics
- nameLookup: function(parent, name /* , type*/) {
- if (/^[0-9]+$/.test(name)) {
- return parent + "[" + name + "]";
- } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
- return parent + "." + name;
- }
- else {
- return parent + "['" + name + "']";
- }
- },
-
- appendToBuffer: function(string) {
- if (this.environment.isSimple) {
- return "return " + string + ";";
- } else {
- return {
- appendToBuffer: true,
- content: string,
- toString: function() { return "buffer += " + string + ";"; }
- };
- }
- },
-
- initializeBuffer: function() {
- return this.quotedString("");
- },
-
- namespace: "Handlebars",
- // END PUBLIC API
-
- compile: function(environment, options, context, asObject) {
- this.environment = environment;
- this.options = options || {};
-
- Handlebars.log(Handlebars.logger.DEBUG, this.environment.disassemble() + "\n\n");
-
- this.name = this.environment.name;
- this.isChild = !!context;
- this.context = context || {
- programs: [],
- environments: [],
- aliases: { }
- };
-
- this.preamble();
-
- this.stackSlot = 0;
- this.stackVars = [];
- this.registers = { list: [] };
- this.compileStack = [];
- this.inlineStack = [];
-
- this.compileChildren(environment, options);
-
- var opcodes = environment.opcodes, opcode;
-
- this.i = 0;
-
- for(l=opcodes.length; this.i<l; this.i++) {
- opcode = opcodes[this.i];
-
- if(opcode.opcode === 'DECLARE') {
- this[opcode.name] = opcode.value;
- } else {
- this[opcode.opcode].apply(this, opcode.args);
- }
- }
-
- return this.createFunctionContext(asObject);
- },
-
- nextOpcode: function() {
- var opcodes = this.environment.opcodes;
- return opcodes[this.i + 1];
- },
-
- eat: function() {
- this.i = this.i + 1;
- },
-
- preamble: function() {
- var out = [];
-
- if (!this.isChild) {
- var namespace = this.namespace;
-
- var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);";
- if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; }
- if (this.options.data) { copies = copies + " data = data || {};"; }
- out.push(copies);
- } else {
- out.push('');
- }
-
- if (!this.environment.isSimple) {
- out.push(", buffer = " + this.initializeBuffer());
- } else {
- out.push("");
- }
-
- // track the last context pushed into place to allow skipping the
- // getContext opcode when it would be a noop
- this.lastContext = 0;
- this.source = out;
- },
-
- createFunctionContext: function(asObject) {
- var locals = this.stackVars.concat(this.registers.list);
-
- if(locals.length > 0) {
- this.source[1] = this.source[1] + ", " + locals.join(", ");
- }
-
- // Generate minimizer alias mappings
- if (!this.isChild) {
- for (var alias in this.context.aliases) {
- if (this.context.aliases.hasOwnProperty(alias)) {
- this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
- }
- }
- }
-
- if (this.source[1]) {
- this.source[1] = "var " + this.source[1].substring(2) + ";";
- }
-
- // Merge children
- if (!this.isChild) {
- this.source[1] += '\n' + this.context.programs.join('\n') + '\n';
- }
-
- if (!this.environment.isSimple) {
- this.source.push("return buffer;");
- }
-
- var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"];
-
- for(var i=0, l=this.environment.depths.list.length; i<l; i++) {
- params.push("depth" + this.environment.depths.list[i]);
- }
-
- // Perform a second pass over the output to merge content when possible
- var source = this.mergeSource();
-
- if (!this.isChild) {
- var revision = Handlebars.COMPILER_REVISION,
- versions = Handlebars.REVISION_CHANGES[revision];
- source = "this.compilerInfo = ["+revision+",'"+versions+"'];\n"+source;
- }
-
- if (asObject) {
- params.push(source);
-
- return Function.apply(this, params);
- } else {
- var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n ' + source + '}';
- Handlebars.log(Handlebars.logger.DEBUG, functionSource + "\n\n");
- return functionSource;
- }
- },
- mergeSource: function() {
- // WARN: We are not handling the case where buffer is still populated as the source should
- // not have buffer append operations as their final action.
- var source = '',
- buffer;
- for (var i = 0, len = this.source.length; i < len; i++) {
- var line = this.source[i];
- if (line.appendToBuffer) {
- if (buffer) {
- buffer = buffer + '\n + ' + line.content;
- } else {
- buffer = line.content;
- }
- } else {
- if (buffer) {
- source += 'buffer += ' + buffer + ';\n ';
- buffer = undefined;
- }
- source += line + '\n ';
- }
- }
- return source;
- },
-
- // [blockValue]
- //
- // On stack, before: hash, inverse, program, value
- // On stack, after: return value of blockHelperMissing
- //
- // The purpose of this opcode is to take a block of the form
- // `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and
- // replace it on the stack with the result of properly
- // invoking blockHelperMissing.
- blockValue: function() {
- this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
- var params = ["depth0"];
- this.setupParams(0, params);
-
- this.replaceStack(function(current) {
- params.splice(1, 0, current);
- return "blockHelperMissing.call(" + params.join(", ") + ")";
- });
- },
-
- // [ambiguousBlockValue]
- //
- // On stack, before: hash, inverse, program, value
- // Compiler value, before: lastHelper=value of last found helper, if any
- // On stack, after, if no lastHelper: same as [blockValue]
- // On stack, after, if lastHelper: value
- ambiguousBlockValue: function() {
- this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
- var params = ["depth0"];
- this.setupParams(0, params);
-
- var current = this.topStack();
- params.splice(1, 0, current);
-
- // Use the options value generated from the invocation
- params[params.length-1] = 'options';
-
- this.source.push("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }");
- },
-
- // [appendContent]
- //
- // On stack, before: ...
- // On stack, after: ...
- //
- // Appends the string value of `content` to the current buffer
- appendContent: function(content) {
- this.source.push(this.appendToBuffer(this.quotedString(content)));
- },
-
- // [append]
- //
- // On stack, before: value, ...
- // On stack, after: ...
- //
- // Coerces `value` to a String and appends it to the current buffer.
- //
- // If `value` is truthy, or 0, it is coerced into a string and appended
- // Otherwise, the empty string is appended
- append: function() {
- // Force anything that is inlined onto the stack so we don't have duplication
- // when we examine local
- this.flushInline();
- var local = this.popStack();
- this.source.push("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }");
- if (this.environment.isSimple) {
- this.source.push("else { " + this.appendToBuffer("''") + " }");
- }
- },
-
- // [appendEscaped]
- //
- // On stack, before: value, ...
- // On stack, after: ...
- //
- // Escape `value` and append it to the buffer
- appendEscaped: function() {
- this.context.aliases.escapeExpression = 'this.escapeExpression';
-
- this.source.push(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
- },
-
- // [getContext]
- //
- // On stack, before: ...
- // On stack, after: ...
- // Compiler value, after: lastContext=depth
- //
- // Set the value of the `lastContext` compiler value to the depth
- getContext: function(depth) {
- if(this.lastContext !== depth) {
- this.lastContext = depth;
- }
- },
-
- // [lookupOnContext]
- //
- // On stack, before: ...
- // On stack, after: currentContext[name], ...
- //
- // Looks up the value of `name` on the current context and pushes
- // it onto the stack.
- lookupOnContext: function(name) {
- this.push(this.nameLookup('depth' + this.lastContext, name, 'context'));
- },
-
- // [pushContext]
- //
- // On stack, before: ...
- // On stack, after: currentContext, ...
- //
- // Pushes the value of the current context onto the stack.
- pushContext: function() {
- this.pushStackLiteral('depth' + this.lastContext);
- },
-
- // [resolvePossibleLambda]
- //
- // On stack, before: value, ...
- // On stack, after: resolved value, ...
- //
- // If the `value` is a lambda, replace it on the stack by
- // the return value of the lambda
- resolvePossibleLambda: function() {
- this.context.aliases.functionType = '"function"';
-
- this.replaceStack(function(current) {
- return "typeof " + current + " === functionType ? " + current + ".apply(depth0) : " + current;
- });
- },
-
- // [lookup]
- //
- // On stack, before: value, ...
- // On stack, after: value[name], ...
- //
- // Replace the value on the stack with the result of looking
- // up `name` on `value`
- lookup: function(name) {
- this.replaceStack(function(current) {
- return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context');
- });
- },
-
- // [lookupData]
- //
- // On stack, before: ...
- // On stack, after: data[id], ...
- //
- // Push the result of looking up `id` on the current data
- lookupData: function(id) {
- this.push('data');
- },
-
- // [pushStringParam]
- //
- // On stack, before: ...
- // On stack, after: string, currentContext, ...
- //
- // This opcode is designed for use in string mode, which
- // provides the string value of a parameter along with its
- // depth rather than resolving it immediately.
- pushStringParam: function(string, type) {
- this.pushStackLiteral('depth' + this.lastContext);
-
- this.pushString(type);
-
- if (typeof string === 'string') {
- this.pushString(string);
- } else {
- this.pushStackLiteral(string);
- }
- },
-
- emptyHash: function() {
- this.pushStackLiteral('{}');
-
- if (this.options.stringParams) {
- this.register('hashTypes', '{}');
- this.register('hashContexts', '{}');
- }
- },
- pushHash: function() {
- this.hash = {values: [], types: [], contexts: []};
- },
- popHash: function() {
- var hash = this.hash;
- this.hash = undefined;
-
- if (this.options.stringParams) {
- this.register('hashContexts', '{' + hash.contexts.join(',') + '}');
- this.register('hashTypes', '{' + hash.types.join(',') + '}');
- }
- this.push('{\n ' + hash.values.join(',\n ') + '\n }');
- },
-
- // [pushString]
- //
- // On stack, before: ...
- // On stack, after: quotedString(string), ...
- //
- // Push a quoted version of `string` onto the stack
- pushString: function(string) {
- this.pushStackLiteral(this.quotedString(string));
- },
-
- // [push]
- //
- // On stack, before: ...
- // On stack, after: expr, ...
- //
- // Push an expression onto the stack
- push: function(expr) {
- this.inlineStack.push(expr);
- return expr;
- },
-
- // [pushLiteral]
- //
- // On stack, before: ...
- // On stack, after: value, ...
- //
- // Pushes a value onto the stack. This operation prevents
- // the compiler from creating a temporary variable to hold
- // it.
- pushLiteral: function(value) {
- this.pushStackLiteral(value);
- },
-
- // [pushProgram]
- //
- // On stack, before: ...
- // On stack, after: program(guid), ...
- //
- // Push a program expression onto the stack. This takes
- // a compile-time guid and converts it into a runtime-accessible
- // expression.
- pushProgram: function(guid) {
- if (guid != null) {
- this.pushStackLiteral(this.programExpression(guid));
- } else {
- this.pushStackLiteral(null);
- }
- },
-
- // [invokeHelper]
- //
- // On stack, before: hash, inverse, program, params..., ...
- // On stack, after: result of helper invocation
- //
- // Pops off the helper's parameters, invokes the helper,
- // and pushes the helper's return value onto the stack.
- //
- // If the helper is not found, `helperMissing` is called.
- invokeHelper: function(paramSize, name) {
- this.context.aliases.helperMissing = 'helpers.helperMissing';
-
- var helper = this.lastHelper = this.setupHelper(paramSize, name, true);
- var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-
- this.push(helper.name + ' || ' + nonHelper);
- this.replaceStack(function(name) {
- return name + ' ? ' + name + '.call(' +
- helper.callParams + ") " + ": helperMissing.call(" +
- helper.helperMissingParams + ")";
- });
- },
-
- // [invokeKnownHelper]
- //
- // On stack, before: hash, inverse, program, params..., ...
- // On stack, after: result of helper invocation
- //
- // This operation is used when the helper is known to exist,
- // so a `helperMissing` fallback is not required.
- invokeKnownHelper: function(paramSize, name) {
- var helper = this.setupHelper(paramSize, name);
- this.push(helper.name + ".call(" + helper.callParams + ")");
- },
-
- // [invokeAmbiguous]
- //
- // On stack, before: hash, inverse, program, params..., ...
- // On stack, after: result of disambiguation
- //
- // This operation is used when an expression like `{{foo}}`
- // is provided, but we don't know at compile-time whether it
- // is a helper or a path.
- //
- // This operation emits more code than the other options,
- // and can be avoided by passing the `knownHelpers` and
- // `knownHelpersOnly` flags at compile-time.
- invokeAmbiguous: function(name, helperCall) {
- this.context.aliases.functionType = '"function"';
-
- this.pushStackLiteral('{}'); // Hash value
- var helper = this.setupHelper(0, name, helperCall);
-
- var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
-
- var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
- var nextStack = this.nextStack();
-
- this.source.push('if (' + nextStack + ' = ' + helperName + ') { ' + nextStack + ' = ' + nextStack + '.call(' + helper.callParams + '); }');
- this.source.push('else { ' + nextStack + ' = ' + nonHelper + '; ' + nextStack + ' = typeof ' + nextStack + ' === functionType ? ' + nextStack + '.apply(depth0) : ' + nextStack + '; }');
- },
-
- // [invokePartial]
- //
- // On stack, before: context, ...
- // On stack after: result of partial invocation
- //
- // This operation pops off a context, invokes a partial with that context,
- // and pushes the result of the invocation back.
- invokePartial: function(name) {
- var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"];
-
- if (this.options.data) {
- params.push("data");
- }
-
- this.context.aliases.self = "this";
- this.push("self.invokePartial(" + params.join(", ") + ")");
- },
-
- // [assignToHash]
- //
- // On stack, before: value, hash, ...
- // On stack, after: hash, ...
- //
- // Pops a value and hash off the stack, assigns `hash[key] = value`
- // and pushes the hash back onto the stack.
- assignToHash: function(key) {
- var value = this.popStack(),
- context,
- type;
-
- if (this.options.stringParams) {
- type = this.popStack();
- context = this.popStack();
- }
-
- var hash = this.hash;
- if (context) {
- hash.contexts.push("'" + key + "': " + context);
- }
- if (type) {
- hash.types.push("'" + key + "': " + type);
- }
- hash.values.push("'" + key + "': (" + value + ")");
- },
-
- // HELPERS
-
- compiler: JavaScriptCompiler,
-
- compileChildren: function(environment, options) {
- var children = environment.children, child, compiler;
-
- for(var i=0, l=children.length; i<l; i++) {
- child = children[i];
- compiler = new this.compiler();
-
- var index = this.matchExistingProgram(child);
-
- if (index == null) {
- this.context.programs.push(''); // Placeholder to prevent name conflicts for nested children
- index = this.context.programs.length;
- child.index = index;
- child.name = 'program' + index;
- this.context.programs[index] = compiler.compile(child, options, this.context);
- this.context.environments[index] = child;
- } else {
- child.index = index;
- child.name = 'program' + index;
- }
- }
- },
- matchExistingProgram: function(child) {
- for (var i = 0, len = this.context.environments.length; i < len; i++) {
- var environment = this.context.environments[i];
- if (environment && environment.equals(child)) {
- return i;
- }
- }
- },
-
- programExpression: function(guid) {
- this.context.aliases.self = "this";
-
- if(guid == null) {
- return "self.noop";
- }
-
- var child = this.environment.children[guid],
- depths = child.depths.list, depth;
-
- var programParams = [child.index, child.name, "data"];
-
- for(var i=0, l = depths.length; i<l; i++) {
- depth = depths[i];
-
- if(depth === 1) { programParams.push("depth0"); }
- else { programParams.push("depth" + (depth - 1)); }
- }
-
- return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")";
- },
-
- register: function(name, val) {
- this.useRegister(name);
- this.source.push(name + " = " + val + ";");
- },
-
- useRegister: function(name) {
- if(!this.registers[name]) {
- this.registers[name] = true;
- this.registers.list.push(name);
- }
- },
-
- pushStackLiteral: function(item) {
- return this.push(new Literal(item));
- },
-
- pushStack: function(item) {
- this.flushInline();
-
- var stack = this.incrStack();
- if (item) {
- this.source.push(stack + " = " + item + ";");
- }
- this.compileStack.push(stack);
- return stack;
- },
-
- replaceStack: function(callback) {
- var prefix = '',
- inline = this.isInline(),
- stack;
-
- // If we are currently inline then we want to merge the inline statement into the
- // replacement statement via ','
- if (inline) {
- var top = this.popStack(true);
-
- if (top instanceof Literal) {
- // Literals do not need to be inlined
- stack = top.value;
- } else {
- // Get or create the current stack name for use by the inline
- var name = this.stackSlot ? this.topStackName() : this.incrStack();
-
- prefix = '(' + this.push(name) + ' = ' + top + '),';
- stack = this.topStack();
- }
- } else {
- stack = this.topStack();
- }
-
- var item = callback.call(this, stack);
-
- if (inline) {
- if (this.inlineStack.length || this.compileStack.length) {
- this.popStack();
- }
- this.push('(' + prefix + item + ')');
- } else {
- // Prevent modification of the context depth variable. Through replaceStack
- if (!/^stack/.test(stack)) {
- stack = this.nextStack();
- }
-
- this.source.push(stack + " = (" + prefix + item + ");");
- }
- return stack;
- },
-
- nextStack: function() {
- return this.pushStack();
- },
-
- incrStack: function() {
- this.stackSlot++;
- if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); }
- return this.topStackName();
- },
- topStackName: function() {
- return "stack" + this.stackSlot;
- },
- flushInline: function() {
- var inlineStack = this.inlineStack;
- if (inlineStack.length) {
- this.inlineStack = [];
- for (var i = 0, len = inlineStack.length; i < len; i++) {
- var entry = inlineStack[i];
- if (entry instanceof Literal) {
- this.compileStack.push(entry);
- } else {
- this.pushStack(entry);
- }
- }
- }
- },
- isInline: function() {
- return this.inlineStack.length;
- },
-
- popStack: function(wrapped) {
- var inline = this.isInline(),
- item = (inline ? this.inlineStack : this.compileStack).pop();
-
- if (!wrapped && (item instanceof Literal)) {
- return item.value;
- } else {
- if (!inline) {
- this.stackSlot--;
- }
- return item;
- }
- },
-
- topStack: function(wrapped) {
- var stack = (this.isInline() ? this.inlineStack : this.compileStack),
- item = stack[stack.length - 1];
-
- if (!wrapped && (item instanceof Literal)) {
- return item.value;
- } else {
- return item;
- }
- },
-
- quotedString: function(str) {
- return '"' + str
- .replace(/\\/g, '\\\\')
- .replace(/"/g, '\\"')
- .replace(/\n/g, '\\n')
- .replace(/\r/g, '\\r')
- .replace(/\u2028/g, '\\u2028') // Per Ecma-262 7.3 + 7.8.4
- .replace(/\u2029/g, '\\u2029') + '"';
- },
-
- setupHelper: function(paramSize, name, missingParams) {
- var params = [];
- this.setupParams(paramSize, params, missingParams);
- var foundHelper = this.nameLookup('helpers', name, 'helper');
-
- return {
- params: params,
- name: foundHelper,
- callParams: ["depth0"].concat(params).join(", "),
- helperMissingParams: missingParams && ["depth0", this.quotedString(name)].concat(params).join(", ")
- };
- },
-
- // the params and contexts arguments are passed in arrays
- // to fill in
- setupParams: function(paramSize, params, useRegister) {
- var options = [], contexts = [], types = [], param, inverse, program;
-
- options.push("hash:" + this.popStack());
-
- inverse = this.popStack();
- program = this.popStack();
-
- // Avoid setting fn and inverse if neither are set. This allows
- // helpers to do a check for `if (options.fn)`
- if (program || inverse) {
- if (!program) {
- this.context.aliases.self = "this";
- program = "self.noop";
- }
-
- if (!inverse) {
- this.context.aliases.self = "this";
- inverse = "self.noop";
- }
-
- options.push("inverse:" + inverse);
- options.push("fn:" + program);
- }
-
- for(var i=0; i<paramSize; i++) {
- param = this.popStack();
- params.push(param);
-
- if(this.options.stringParams) {
- types.push(this.popStack());
- contexts.push(this.popStack());
- }
- }
-
- if (this.options.stringParams) {
- options.push("contexts:[" + contexts.join(",") + "]");
- options.push("types:[" + types.join(",") + "]");
- options.push("hashContexts:hashContexts");
- options.push("hashTypes:hashTypes");
- }
-
- if(this.options.data) {
- options.push("data:data");
- }
-
- options = "{" + options.join(",") + "}";
- if (useRegister) {
- this.register('options', options);
- params.push('options');
- } else {
- params.push(options);
- }
- return params.join(", ");
- }
-};
-
-var reservedWords = (
- "break else new var" +
- " case finally return void" +
- " catch for switch while" +
- " continue function this with" +
- " default if throw" +
- " delete in try" +
- " do instanceof typeof" +
- " abstract enum int short" +
- " boolean export interface static" +
- " byte extends long super" +
- " char final native synchronized" +
- " class float package throws" +
- " const goto private transient" +
- " debugger implements protected volatile" +
- " double import public let yield"
-).split(" ");
-
-var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
-
-for(var i=0, l=reservedWords.length; i<l; i++) {
- compilerWords[reservedWords[i]] = true;
-}
-
-JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
- if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) {
- return true;
- }
- return false;
-};
-
-Handlebars.precompile = function(input, options) {
- if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
- throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
- }
-
- options = options || {};
- if (!('data' in options)) {
- options.data = true;
- }
- var ast = Handlebars.parse(input);
- var environment = new Compiler().compile(ast, options);
- return new JavaScriptCompiler().compile(environment, options);
-};
-
-Handlebars.compile = function(input, options) {
- if (input == null || (typeof input !== 'string' && input.constructor !== Handlebars.AST.ProgramNode)) {
- throw new Handlebars.Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
- }
-
- options = options || {};
- if (!('data' in options)) {
- options.data = true;
- }
- var compiled;
- function compile() {
- var ast = Handlebars.parse(input);
- var environment = new Compiler().compile(ast, options);
- var templateSpec = new JavaScriptCompiler().compile(environment, options, undefined, true);
- return Handlebars.template(templateSpec);
- }
-
- // Template is only compiled on first use and cached after that point.
- return function(context, options) {
- if (!compiled) {
- compiled = compile();
- }
- return compiled.call(this, context, options);
- };
-};
-
-;
-// lib/handlebars/runtime.js
-
-Handlebars.VM = {
- template: function(templateSpec) {
- // Just add water
- var container = {
- escapeExpression: Handlebars.Utils.escapeExpression,
- invokePartial: Handlebars.VM.invokePartial,
- programs: [],
- program: function(i, fn, data) {
- var programWrapper = this.programs[i];
- if(data) {
- programWrapper = Handlebars.VM.program(i, fn, data);
- } else if (!programWrapper) {
- programWrapper = this.programs[i] = Handlebars.VM.program(i, fn);
- }
- return programWrapper;
- },
- merge: function(param, common) {
- var ret = param || common;
-
- if (param && common) {
- ret = {};
- Handlebars.Utils.extend(ret, common);
- Handlebars.Utils.extend(ret, param);
- }
- return ret;
- },
- programWithDepth: Handlebars.VM.programWithDepth,
- noop: Handlebars.VM.noop,
- compilerInfo: null
- };
-
- return function(context, options) {
- options = options || {};
- var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data);
-
- var compilerInfo = container.compilerInfo || [],
- compilerRevision = compilerInfo[0] || 1,
- currentRevision = Handlebars.COMPILER_REVISION;
-
- if (compilerRevision !== currentRevision) {
- if (compilerRevision < currentRevision) {
- var runtimeVersions = Handlebars.REVISION_CHANGES[currentRevision],
- compilerVersions = Handlebars.REVISION_CHANGES[compilerRevision];
- throw "Template was precompiled with an older version of Handlebars than the current runtime. "+
- "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").";
- } else {
- // Use the embedded version info since the runtime doesn't know about this revision yet
- throw "Template was precompiled with a newer version of Handlebars than the current runtime. "+
- "Please update your runtime to a newer version ("+compilerInfo[1]+").";
- }
- }
-
- return result;
- };
- },
-
- programWithDepth: function(i, fn, data /*, $depth */) {
- var args = Array.prototype.slice.call(arguments, 3);
-
- var program = function(context, options) {
- options = options || {};
-
- return fn.apply(this, [context, options.data || data].concat(args));
- };
- program.program = i;
- program.depth = args.length;
- return program;
- },
- program: function(i, fn, data) {
- var program = function(context, options) {
- options = options || {};
-
- return fn(context, options.data || data);
- };
- program.program = i;
- program.depth = 0;
- return program;
- },
- noop: function() { return ""; },
- invokePartial: function(partial, name, context, helpers, partials, data) {
- var options = { helpers: helpers, partials: partials, data: data };
-
- if(partial === undefined) {
- throw new Handlebars.Exception("The partial " + name + " could not be found");
- } else if(partial instanceof Function) {
- return partial(context, options);
- } else if (!Handlebars.compile) {
- throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
- } else {
- partials[name] = Handlebars.compile(partial, {data: data !== undefined});
- return partials[name](context, options);
- }
- }
-};
-
-Handlebars.template = Handlebars.VM.template;
-;
-// lib/handlebars/browser-suffix.js
-})(Handlebars);
-;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/highlight.7.3.pack.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/highlight.7.3.pack.js b/geode-web-api/src/main/webapp/docs/lib/highlight.7.3.pack.js
deleted file mode 100644
index 9a95a75..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/highlight.7.3.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-var hljs=new function(){function l(o){return o.replace(/&/gm,"&").replace(/</gm,"<").replace(/>/gm,">")}function b(p){for(var o=p.firstChild;o;o=o.nextSibling){if(o.nodeName=="CODE"){return o}if(!(o.nodeType==3&&o.nodeValue.match(/\s+/))){break}}}function h(p,o){return Array.prototype.map.call(p.childNodes,function(q){if(q.nodeType==3){return o?q.nodeValue.replace(/\n/g,""):q.nodeValue}if(q.nodeName=="BR"){return"\n"}return h(q,o)}).join("")}function a(q){var p=(q.className+" "+q.parentNode.className).split(/\s+/);p=p.map(function(r){return r.replace(/^language-/,"")});for(var o=0;o<p.length;o++){if(e[p[o]]||p[o]=="no-highlight"){return p[o]}}}function c(q){var o=[];(function p(r,s){for(var t=r.firstChild;t;t=t.nextSibling){if(t.nodeType==3){s+=t.nodeValue.length}else{if(t.nodeName=="BR"){s+=1}else{if(t.nodeType==1){o.push({event:"start",offset:s,node:t});s=p(t,s);o.push({event:"stop",offset:s,node:t})}}}}return s})(q,0);return o}function j(x,v,w){var p=0;var y="";var r=[]
;function t(){if(x.length&&v.length){if(x[0].offset!=v[0].offset){return(x[0].offset<v[0].offset)?x:v}else{return v[0].event=="start"?x:v}}else{return x.length?x:v}}function s(A){function z(B){return" "+B.nodeName+'="'+l(B.value)+'"'}return"<"+A.nodeName+Array.prototype.map.call(A.attributes,z).join("")+">"}while(x.length||v.length){var u=t().splice(0,1)[0];y+=l(w.substr(p,u.offset-p));p=u.offset;if(u.event=="start"){y+=s(u.node);r.push(u.node)}else{if(u.event=="stop"){var o,q=r.length;do{q--;o=r[q];y+=("</"+o.nodeName.toLowerCase()+">")}while(o!=u.node);r.splice(q,1);while(q<r.length){y+=s(r[q]);q++}}}}return y+l(w.substr(p))}function f(q){function o(s,r){return RegExp(s,"m"+(q.cI?"i":"")+(r?"g":""))}function p(y,w){if(y.compiled){return}y.compiled=true;var s=[];if(y.k){var r={};function z(A,t){t.split(" ").forEach(function(B){var C=B.split("|");r[C[0]]=[A,C[1]?Number(C[1]):1];s.push(C[0])})}y.lR=o(y.l||hljs.IR,true);if(typeof y.k=="string"){z("keyword",y.k)}else{for(var x in y.k){
if(!y.k.hasOwnProperty(x)){continue}z(x,y.k[x])}}y.k=r}if(w){if(y.bWK){y.b="\\b("+s.join("|")+")\\s"}y.bR=o(y.b?y.b:"\\B|\\b");if(!y.e&&!y.eW){y.e="\\B|\\b"}if(y.e){y.eR=o(y.e)}y.tE=y.e||"";if(y.eW&&w.tE){y.tE+=(y.e?"|":"")+w.tE}}if(y.i){y.iR=o(y.i)}if(y.r===undefined){y.r=1}if(!y.c){y.c=[]}for(var v=0;v<y.c.length;v++){if(y.c[v]=="self"){y.c[v]=y}p(y.c[v],y)}if(y.starts){p(y.starts,w)}var u=[];for(var v=0;v<y.c.length;v++){u.push(y.c[v].b)}if(y.tE){u.push(y.tE)}if(y.i){u.push(y.i)}y.t=u.length?o(u.join("|"),true):{exec:function(t){return null}}}p(q)}function d(D,E){function o(r,M){for(var L=0;L<M.c.length;L++){var K=M.c[L].bR.exec(r);if(K&&K.index==0){return M.c[L]}}}function s(K,r){if(K.e&&K.eR.test(r)){return K}if(K.eW){return s(K.parent,r)}}function t(r,K){return K.i&&K.iR.test(r)}function y(L,r){var K=F.cI?r[0].toLowerCase():r[0];return L.k.hasOwnProperty(K)&&L.k[K]}function G(){var K=l(w);if(!A.k){return K}var r="";var N=0;A.lR.lastIndex=0;var L=A.lR.exec(K);while(L){r+=K.subs
tr(N,L.index-N);var M=y(A,L);if(M){v+=M[1];r+='<span class="'+M[0]+'">'+L[0]+"</span>"}else{r+=L[0]}N=A.lR.lastIndex;L=A.lR.exec(K)}return r+K.substr(N)}function z(){if(A.sL&&!e[A.sL]){return l(w)}var r=A.sL?d(A.sL,w):g(w);if(A.r>0){v+=r.keyword_count;B+=r.r}return'<span class="'+r.language+'">'+r.value+"</span>"}function J(){return A.sL!==undefined?z():G()}function I(L,r){var K=L.cN?'<span class="'+L.cN+'">':"";if(L.rB){x+=K;w=""}else{if(L.eB){x+=l(r)+K;w=""}else{x+=K;w=r}}A=Object.create(L,{parent:{value:A}});B+=L.r}function C(K,r){w+=K;if(r===undefined){x+=J();return 0}var L=o(r,A);if(L){x+=J();I(L,r);return L.rB?0:r.length}var M=s(A,r);if(M){if(!(M.rE||M.eE)){w+=r}x+=J();do{if(A.cN){x+="</span>"}A=A.parent}while(A!=M.parent);if(M.eE){x+=l(r)}w="";if(M.starts){I(M.starts,"")}return M.rE?0:r.length}if(t(r,A)){throw"Illegal"}w+=r;return r.length||1}var F=e[D];f(F);var A=F;var w="";var B=0;var v=0;var x="";try{var u,q,p=0;while(true){A.t.lastIndex=p;u=A.t.exec(E);if(!u){break}q=C(E.
substr(p,u.index-p),u[0]);p=u.index+q}C(E.substr(p));return{r:B,keyword_count:v,value:x,language:D}}catch(H){if(H=="Illegal"){return{r:0,keyword_count:0,value:l(E)}}else{throw H}}}function g(s){var o={keyword_count:0,r:0,value:l(s)};var q=o;for(var p in e){if(!e.hasOwnProperty(p)){continue}var r=d(p,s);r.language=p;if(r.keyword_count+r.r>q.keyword_count+q.r){q=r}if(r.keyword_count+r.r>o.keyword_count+o.r){q=o;o=r}}if(q.language){o.second_best=q}return o}function i(q,p,o){if(p){q=q.replace(/^((<[^>]+>|\t)+)/gm,function(r,v,u,t){return v.replace(/\t/g,p)})}if(o){q=q.replace(/\n/g,"<br>")}return q}function m(r,u,p){var v=h(r,p);var t=a(r);if(t=="no-highlight"){return}var w=t?d(t,v):g(v);t=w.language;var o=c(r);if(o.length){var q=document.createElement("pre");q.innerHTML=w.value;w.value=j(o,c(q),v)}w.value=i(w.value,u,p);var s=r.className;if(!s.match("(\\s|^)(language-)?"+t+"(\\s|$)")){s=s?(s+" "+t):t}r.innerHTML=w.value;r.className=s;r.result={language:t,kw:w.keyword_count,re:w.r};if(w
.second_best){r.second_best={language:w.second_best.language,kw:w.second_best.keyword_count,re:w.second_best.r}}}function n(){if(n.called){return}n.called=true;Array.prototype.map.call(document.getElementsByTagName("pre"),b).filter(Boolean).forEach(function(o){m(o,hljs.tabReplace)})}function k(){window.addEventListener("DOMContentLoaded",n,false);window.addEventListener("load",n,false)}var e={};this.LANGUAGES=e;this.highlight=d;this.highlightAuto=g;this.fixMarkup=i;this.highlightBlock=m;this.initHighlighting=n;this.initHighlightingOnLoad=k;this.IR="[a-zA-Z][a-zA-Z0-9_]*";this.UIR="[a-zA-Z_][a-zA-Z0-9_]*";this.NR="\\b\\d+(\\.\\d+)?";this.CNR="(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)";this.BNR="\\b(0b[01]+)";this.RSR="!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|\\.|-|-=|/|/=|:|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~";this.BE={b:"\\\\[\\s\\S]",r:0};this.ASM={cN:"string",b:"'",e:"'",i:"\\n",c:[this.BE],r:0};this.QSM=
{cN:"string",b:'"',e:'"',i:"\\n",c:[this.BE],r:0};this.CLCM={cN:"comment",b:"//",e:"$"};this.CBLCLM={cN:"comment",b:"/\\*",e:"\\*/"};this.HCM={cN:"comment",b:"#",e:"$"};this.NM={cN:"number",b:this.NR,r:0};this.CNM={cN:"number",b:this.CNR,r:0};this.BNM={cN:"number",b:this.BNR,r:0};this.inherit=function(q,r){var o={};for(var p in q){o[p]=q[p]}if(r){for(var p in r){o[p]=r[p]}}return o}}();hljs.LANGUAGES.xml=function(a){var c="[A-Za-z0-9\\._:-]+";var b={eW:true,c:[{cN:"attribute",b:c,r:0},{b:'="',rB:true,e:'"',c:[{cN:"value",b:'"',eW:true}]},{b:"='",rB:true,e:"'",c:[{cN:"value",b:"'",eW:true}]},{b:"=",c:[{cN:"value",b:"[^\\s/>]+"}]}]};return{cI:true,c:[{cN:"pi",b:"<\\?",e:"\\?>",r:10},{cN:"doctype",b:"<!DOCTYPE",e:">",r:10,c:[{b:"\\[",e:"\\]"}]},{cN:"comment",b:"<!--",e:"-->",r:10},{cN:"cdata",b:"<\\!\\[CDATA\\[",e:"\\]\\]>",r:10},{cN:"tag",b:"<style(?=\\s|>|$)",e:">",k:{title:"style"},c:[b],starts:{e:"</style>",rE:true,sL:"css"}},{cN:"tag",b:"<script(?=\\s|>|$)",e:">",k:{title:"script"
},c:[b],starts:{e:"<\/script>",rE:true,sL:"javascript"}},{b:"<%",e:"%>",sL:"vbscript"},{cN:"tag",b:"</?",e:"/?>",c:[{cN:"title",b:"[^ />]+"},b]}]}}(hljs);hljs.LANGUAGES.json=function(a){var e={literal:"true false null"};var d=[a.QSM,a.CNM];var c={cN:"value",e:",",eW:true,eE:true,c:d,k:e};var b={b:"{",e:"}",c:[{cN:"attribute",b:'\\s*"',e:'"\\s*:\\s*',eB:true,eE:true,c:[a.BE],i:"\\n",starts:c}],i:"\\S"};var f={b:"\\[",e:"\\]",c:[a.inherit(c,{cN:null})],i:"\\S"};d.splice(d.length,0,b,f);return{c:d,k:e,i:"\\S"}}(hljs);
\ No newline at end of file
[94/98] [abbrv] incubator-geode git commit: GEODE-2030: security
support for SDG
Posted by ds...@apache.org.
GEODE-2030: security support for SDG
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6ec3f884
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6ec3f884
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6ec3f884
Branch: refs/heads/feature/GEM-983
Commit: 6ec3f884c953b48c357bf127a5a37ba88dedee8c
Parents: c4e3b15
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Mon Oct 24 10:54:36 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri Oct 28 08:48:57 2016 -0700
----------------------------------------------------------------------
.../org/apache/geode/cache/CacheFactory.java | 34 ++++++
.../geode/internal/cache/CacheConfig.java | 22 +++-
.../geode/internal/cache/GemFireCacheImpl.java | 121 ++++++++++---------
.../security/IntegratedSecurityService.java | 69 ++++++++---
.../internal/security/SecurityService.java | 17 +--
.../security/IntegratedSecurityServiceTest.java | 51 +++++++-
.../CacheFactoryWithSecurityObjectTest.java | 90 ++++++++++++++
7 files changed, 320 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ec3f884/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index b62feac..15557bb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -28,6 +28,8 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.jndi.JNDIInvoker;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxSerializer;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.SecurityManager;
/**
@@ -326,6 +328,38 @@ public class CacheFactory {
}
/**
+ * sets the securityManager for the cache. If this securityManager is set. It will override the
+ * security-manager property you set in your gemfire system properties.
+ *
+ * This is provided mostly for container to inject an already initialized securityManager. An
+ * object provided this way is expected to be initialized already. We are not calling the init
+ * method on this object
+ *
+ * @param securityManager
+ * @return
+ */
+ public CacheFactory setSecurityManager(SecurityManager securityManager) {
+ this.cacheConfig.setSecurityManager(securityManager);
+ return this;
+ }
+
+ /**
+ * sets the postProcessor for the cache. If this postProcessor is set. It will override thie
+ * security-post-processor setting in the gemfire system properties.
+ *
+ * This is provided mostly for container to inject an already initialized post processor. An
+ * object provided this way is expected to be initialized already. We are not calling the init
+ * method on this object
+ *
+ * @param postProcessor
+ * @return
+ */
+ public CacheFactory setPostProcessor(PostProcessor postProcessor) {
+ this.cacheConfig.setPostProcessor(postProcessor);
+ return this;
+ }
+
+ /**
* Set the PDX serializer for the cache. If this serializer is set, it will be consulted to see if
* it can serialize any domain classes which are added to the cache in portable data exchange
* format.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ec3f884/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
index 91ae333..45b6a6c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
@@ -14,13 +14,14 @@
*/
package org.apache.geode.internal.cache;
-import java.util.List;
-
import org.apache.geode.internal.cache.xmlcache.CacheServerCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.pdx.PdxSerializer;
import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
-import org.apache.geode.pdx.internal.AutoSerializableManager;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.SecurityManager;
+
+import java.util.List;
/**
* This is helper class used by CacheFactory to pass the cache configuration values to cache
@@ -35,6 +36,9 @@ public class CacheConfig {
public static boolean DEFAULT_PDX_PERSISTENT = false;
public static boolean DEFAULT_PDX_IGNORE_UNREAD_FIELDS = false;
+ private static SecurityManager securityManager = null;
+ private static PostProcessor postProcessor = null;
+
public boolean pdxReadSerialized = DEFAULT_PDX_READ_SERIALIZED;
/**
@@ -88,14 +92,26 @@ public class CacheConfig {
return pdxSerializer;
}
+ public SecurityManager getSecurityManager() {
+ return securityManager;
+ }
+ public void setSecurityManager(SecurityManager securityManager) {
+ CacheConfig.securityManager = securityManager;
+ }
public void setPdxSerializer(PdxSerializer pdxSerializer) {
pdxSerializerUserSet = true;
this.pdxSerializer = pdxSerializer;
}
+ public PostProcessor getPostProcessor() {
+ return postProcessor;
+ }
+ public void setPostProcessor(PostProcessor postProcessor) {
+ CacheConfig.postProcessor = postProcessor;
+ }
public String getPdxDiskStore() {
return pdxDiskStore;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ec3f884/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index d9d572c..ba4f1f4 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -15,65 +15,9 @@
package org.apache.geode.internal.cache;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintStream;
-import java.io.Reader;
-import java.io.StringBufferInputStream;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.InetSocketAddress;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-import java.util.ServiceLoader;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.concurrent.ArrayBlockingQueue;
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.naming.Context;
-
import com.sun.jna.Native;
import com.sun.jna.Platform;
import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.Logger;
-
import org.apache.geode.CancelCriterion;
import org.apache.geode.CancelException;
import org.apache.geode.ForcedDisconnectException;
@@ -229,6 +173,60 @@ import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.TypeRegistry;
import org.apache.geode.redis.GeodeRedisServer;
+import org.apache.logging.log4j.Logger;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.Reader;
+import java.io.StringBufferInputStream;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.net.InetSocketAddress;
+import java.net.URL;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.ServiceLoader;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.naming.Context;
// @todo somebody Come up with more reasonable values for {@link #DEFAULT_LOCK_TIMEOUT}, etc.
/**
@@ -1203,7 +1201,18 @@ public class GemFireCacheImpl
// apply the cluster's properties configuration and initialize security using that configuration
ClusterConfigurationLoader.applyClusterPropertiesConfiguration(this, configurationResponse,
system.getConfig());
+
+ // first initialize the security service using the security properties
securityService.initSecurity(system.getConfig().getSecurityProps());
+ // secondly if cacheConfig has a securityManager, use that instead
+ if (cacheConfig.getSecurityManager() != null) {
+ securityService.setSecurityManager(cacheConfig.getSecurityManager());
+ }
+ // if cacheConfig has a postProcessor, use that instead
+ if (cacheConfig.getPostProcessor() != null) {
+ securityService.setPostProcessor(cacheConfig.getPostProcessor());
+ }
+
SystemMemberCacheEventProcessor.send(this, Operation.CACHE_CREATE);
this.resourceAdvisor.initializationGate();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ec3f884/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
index 8fc0f11..7a898d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
@@ -42,6 +42,7 @@ import org.apache.geode.security.SecurityManager;
import org.apache.logging.log4j.Logger;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.ShiroException;
+import org.apache.shiro.UnavailableSecurityManagerException;
import org.apache.shiro.config.Ini.Section;
import org.apache.shiro.config.IniSecurityManagerFactory;
import org.apache.shiro.mgt.DefaultSecurityManager;
@@ -73,7 +74,7 @@ public class IntegratedSecurityService implements SecurityService {
private PostProcessor postProcessor;
private SecurityManager securityManager;
- private boolean isIntegratedSecurity;
+ private Boolean isIntegratedSecurity;
private boolean isClientAuthenticator; // is there a SECURITY_CLIENT_AUTHENTICATOR
private boolean isPeerAuthenticator; // is there a SECURITY_PEER_AUTHENTICATOR
@@ -85,7 +86,7 @@ public class IntegratedSecurityService implements SecurityService {
* @return the shiro subject, null if security is not enabled
*/
public Subject getSubject() {
- if (!isIntegratedSecurity) {
+ if (!isIntegratedSecurity()) {
return null;
}
@@ -133,7 +134,7 @@ public class IntegratedSecurityService implements SecurityService {
* @return null if security is not enabled, otherwise return a shiro subject
*/
public Subject login(Properties credentials) {
- if (!isIntegratedSecurity) {
+ if (!isIntegratedSecurity()) {
return null;
}
@@ -300,7 +301,7 @@ public class IntegratedSecurityService implements SecurityService {
}
String shiroConfig = securityProps.getProperty(SECURITY_SHIRO_INIT);
- String securityConfig = securityProps.getProperty(SECURITY_MANAGER);
+ String securityManagerConfig = securityProps.getProperty(SECURITY_MANAGER);
String clientAuthenticatorConfig = securityProps.getProperty(SECURITY_CLIENT_AUTHENTICATOR);
String peerAuthenticatorConfig = securityProps.getProperty(SECURITY_PEER_AUTHENTICATOR);
@@ -318,18 +319,17 @@ public class IntegratedSecurityService implements SecurityService {
org.apache.shiro.mgt.SecurityManager securityManager = factory.getInstance();
SecurityUtils.setSecurityManager(securityManager);
isIntegratedSecurity = true;
+ isClientAuthenticator = false;
+ isPeerAuthenticator = false;
}
// only set up shiro realm if user has implemented SecurityManager
- else if (!StringUtils.isBlank(securityConfig)) {
- securityManager =
- SecurityService.getObjectOfTypeFromClassName(securityConfig, SecurityManager.class);
+ else if (!StringUtils.isBlank(securityManagerConfig)) {
+ SecurityManager securityManager = SecurityService
+ .getObjectOfTypeFromClassName(securityManagerConfig, SecurityManager.class);
securityManager.init(securityProps);
- Realm realm = new CustomAuthRealm(securityManager);
- org.apache.shiro.mgt.SecurityManager shiroManager = new DefaultSecurityManager(realm);
- SecurityUtils.setSecurityManager(shiroManager);
- isIntegratedSecurity = true;
+ this.setSecurityManager(securityManager);
} else {
- isIntegratedSecurity = false;
+ isIntegratedSecurity = null;
isClientAuthenticator = !StringUtils.isBlank(clientAuthenticatorConfig);
isPeerAuthenticator = !StringUtils.isBlank(peerAuthenticatorConfig);
}
@@ -356,7 +356,8 @@ public class IntegratedSecurityService implements SecurityService {
postProcessor = null;
}
ThreadContext.remove();
- isIntegratedSecurity = false;
+ SecurityUtils.setSecurityManager(null);
+ isIntegratedSecurity = null;
isClientAuthenticator = false;
isPeerAuthenticator = false;
}
@@ -367,7 +368,7 @@ public class IntegratedSecurityService implements SecurityService {
* bypass it entirely, call this first.
*/
public boolean needPostProcess() {
- return (isIntegratedSecurity && postProcessor != null);
+ return (isIntegratedSecurity() && postProcessor != null);
}
public Object postProcess(String regionPath, Object key, Object value,
@@ -412,19 +413,55 @@ public class IntegratedSecurityService implements SecurityService {
return securityManager;
}
+ public void setSecurityManager(SecurityManager securityManager) {
+ if (securityManager == null) {
+ return;
+ }
+
+ this.securityManager = securityManager;
+ Realm realm = new CustomAuthRealm(securityManager);
+ org.apache.shiro.mgt.SecurityManager shiroManager = new DefaultSecurityManager(realm);
+ SecurityUtils.setSecurityManager(shiroManager);
+ isIntegratedSecurity = true;
+ isClientAuthenticator = false;
+ isPeerAuthenticator = false;
+ }
+
public PostProcessor getPostProcessor() {
return postProcessor;
}
+ public void setPostProcessor(PostProcessor postProcessor) {
+ if (postProcessor == null) {
+ return;
+ }
+
+ this.postProcessor = postProcessor;
+ }
+
+ /**
+ * If Shiro's security manager is configured, then return true, otherwise, return false;
+ *
+ * @return
+ */
public boolean isIntegratedSecurity() {
+ if (isIntegratedSecurity != null) {
+ return isIntegratedSecurity;
+ }
+
+ try {
+ isIntegratedSecurity = (SecurityUtils.getSecurityManager() != null);
+ } catch (UnavailableSecurityManagerException e) {
+ isIntegratedSecurity = false;
+ }
return isIntegratedSecurity;
}
public boolean isClientSecurityRequired() {
- return isClientAuthenticator || isIntegratedSecurity;
+ return isClientAuthenticator || isIntegratedSecurity();
}
public boolean isPeerSecurityRequired() {
- return isPeerAuthenticator || isIntegratedSecurity;
+ return isPeerAuthenticator || isIntegratedSecurity();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ec3f884/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java
index 41b08d5..727a1ce 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/SecurityService.java
@@ -14,13 +14,6 @@
*/
package org.apache.geode.internal.security;
-import java.lang.reflect.Method;
-import java.util.Properties;
-import java.util.concurrent.Callable;
-
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.ThreadState;
-
import org.apache.geode.internal.ClassLoadUtil;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.management.internal.security.ResourceOperation;
@@ -28,6 +21,12 @@ import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.security.PostProcessor;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadState;
+
+import java.lang.reflect.Method;
+import java.util.Properties;
+import java.util.concurrent.Callable;
public interface SecurityService {
@@ -96,8 +95,12 @@ public interface SecurityService {
SecurityManager getSecurityManager();
+ void setSecurityManager(SecurityManager securityManager);
+
PostProcessor getPostProcessor();
+ void setPostProcessor(PostProcessor postProcessor);
+
/**
* this method would never return null, it either throws an exception or returns an object
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ec3f884/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
index 8c81026..1a8e601 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
@@ -18,14 +18,19 @@ import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIE
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR;
import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
-import static org.assertj.core.api.Java6Assertions.assertThatThrownBy;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import org.apache.geode.security.GemFireSecurityException;
+import org.apache.geode.security.templates.SamplePostProcessor;
import org.apache.geode.security.templates.SampleSecurityManager;
+import org.apache.geode.security.templates.SimpleSecurityManager;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -133,7 +138,7 @@ public class IntegratedSecurityServiceTest {
}
@Test
- public void testInitWithBothAuthenticator() {
+ public void testInitWithAuthenticators() {
properties.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "org.abc.test");
properties.setProperty(SECURITY_PEER_AUTHENTICATOR, "org.abc.test");
@@ -155,6 +160,48 @@ public class IntegratedSecurityServiceTest {
assertTrue(securityService.isPeerSecurityRequired());
}
+ @Test
+ public void testNoInit() {
+ assertFalse(securityService.isIntegratedSecurity());
+ }
+
+ @Test
+ public void testInitWithOutsideShiroSecurityManager() {
+ SecurityUtils.setSecurityManager(new DefaultSecurityManager());
+ securityService.initSecurity(properties);
+ assertTrue(securityService.isIntegratedSecurity());
+ }
+
+ @Test
+ public void testSetSecurityManager() {
+ // initially
+ assertFalse(securityService.isIntegratedSecurity());
+
+ // init with client authenticator
+ properties.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "org.abc.test");
+ securityService.initSecurity(properties);
+ assertFalse(securityService.isIntegratedSecurity());
+ assertTrue(securityService.isClientSecurityRequired());
+ assertFalse(securityService.isPeerSecurityRequired());
+
+ // set a security manager
+ securityService.setSecurityManager(new SimpleSecurityManager());
+ assertTrue(securityService.isIntegratedSecurity());
+ assertTrue(securityService.isClientSecurityRequired());
+ assertTrue(securityService.isPeerSecurityRequired());
+ assertFalse(securityService.needPostProcess());
+
+ // set a post processor
+ securityService.setPostProcessor(new SamplePostProcessor());
+ assertTrue(securityService.isIntegratedSecurity());
+ assertTrue(securityService.needPostProcess());
+ }
+
+ @After
+ public void after() {
+ securityService.close();
+ }
+
private static class Factories {
public static String getString() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ec3f884/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java b/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java
new file mode 100644
index 0000000..742167c
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/security/CacheFactoryWithSecurityObjectTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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.security;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.internal.security.SecurityService;
+import org.apache.geode.security.templates.DummyAuthenticator;
+import org.apache.geode.security.templates.SamplePostProcessor;
+import org.apache.geode.security.templates.SimpleSecurityManager;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Properties;
+
+@Category({IntegrationTest.class, SecurityTest.class})
+public class CacheFactoryWithSecurityObjectTest {
+
+ private SecurityService securityService;
+ private SecurityManager simpleSecurityManager;
+ private Properties properties = new Properties();
+ Cache cache;
+
+ @Before
+ public void before() throws Exception {
+ securityService = SecurityService.getSecurityService();
+ simpleSecurityManager = new SimpleSecurityManager();
+ properties.setProperty("mcast-port", "0");
+ }
+
+ @Test
+ public void testCreateCacheWithSecurityManager() throws Exception {
+ cache = new CacheFactory(properties).setSecurityManager(simpleSecurityManager)
+ .setPostProcessor(null).create();
+ assertTrue(securityService.isIntegratedSecurity());
+ assertFalse(securityService.needPostProcess());
+ assertNotNull(securityService.getSecurityManager());
+ }
+
+ @Test
+ public void testCreateCacheWithPostProcessor() throws Exception {
+ cache = new CacheFactory(properties).setPostProcessor(new SamplePostProcessor())
+ .setSecurityManager(null).create();
+ assertFalse(securityService.isIntegratedSecurity());
+ assertFalse(securityService.needPostProcess());
+ assertNotNull(securityService.getPostProcessor());
+ }
+
+ @Test
+ public void testOverride() throws Exception {
+ properties.setProperty(ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR,
+ DummyAuthenticator.class.getName());
+
+ cache = new CacheFactory(properties).setSecurityManager(simpleSecurityManager)
+ .setPostProcessor(new SamplePostProcessor()).create();
+
+ assertTrue(securityService.isIntegratedSecurity());
+ assertTrue(securityService.isClientSecurityRequired());
+ assertTrue(securityService.needPostProcess());
+ assertNotNull(securityService.getSecurityManager());
+ }
+
+ @After
+ public void after() {
+ cache.close();
+ }
+
+}
[91/98] [abbrv] incubator-geode git commit: GEODE-2017: Fixed
formatting
Posted by ds...@apache.org.
GEODE-2017: Fixed formatting
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/e9b50958
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/e9b50958
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/e9b50958
Branch: refs/heads/feature/GEM-983
Commit: e9b509580de948145e145b8f54d50aeaa7d0867f
Parents: 7b11d08
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Thu Oct 27 11:13:27 2016 -0700
Committer: Barry Oglesby <bo...@pivotal.io>
Committed: Thu Oct 27 11:14:17 2016 -0700
----------------------------------------------------------------------
.../parallel/ParallelQueueRemovalMessage.java | 6 +-
.../internal/cache/BucketRegionQueueHelper.java | 31 ++++----
.../ParallelQueueRemovalMessageJUnitTest.java | 77 ++++++++++++--------
3 files changed, 67 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b50958/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
index bad3d3c..921af9c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
@@ -137,11 +137,13 @@ public class ParallelQueueRemovalMessage extends PooledDistributionMessage {
isDestroyed = true;
}
- // Even if BucketRegionQueue does not have the key, it could be in the tempQueue
+ // Even if BucketRegionQueue does not have the key, it could be in the
+ // tempQueue
// remove it from there..defect #49196
destroyFromTempQueue(brq.getPartitionedRegion(), (Integer) bId, key);
- // Finally, add the key to the failed batch removal keys so that it is definitely removed from the bucket region queue
+ // Finally, add the key to the failed batch removal keys so that it is
+ // definitely removed from the bucket region queue
brq.addToFailedBatchRemovalMessageKeys(key);
} finally {
brq.getInitializationLock().readLock().unlock();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b50958/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
index 68b29c2..64a49c6 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
@@ -1,18 +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
+ * 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.
*/
/**
*
@@ -32,7 +30,8 @@ public class BucketRegionQueueHelper {
private BucketRegionQueue bucketRegionQueue;
- public BucketRegionQueueHelper(GemFireCacheImpl cache, PartitionedRegion queueRegion, BucketRegionQueue bucketRegionQueue) {
+ public BucketRegionQueueHelper(GemFireCacheImpl cache, PartitionedRegion queueRegion,
+ BucketRegionQueue bucketRegionQueue) {
this.bucketRegionQueue = bucketRegionQueue;
initialize(cache, queueRegion);
}
@@ -47,12 +46,14 @@ public class BucketRegionQueueHelper {
}
public void cleanUpDestroyedTokensAndMarkGIIComplete() {
- this.bucketRegionQueue.cleanUpDestroyedTokensAndMarkGIIComplete(InitialImageOperation.GIIStatus.NO_GII);
+ this.bucketRegionQueue
+ .cleanUpDestroyedTokensAndMarkGIIComplete(InitialImageOperation.GIIStatus.NO_GII);
}
public void initialize(GemFireCacheImpl cache, PartitionedRegion queueRegion) {
InternalDistributedMember member = cache.getMyId();
when(queueRegion.getMyId()).thenReturn(member);
- when(cache.getRegionByPath(this.bucketRegionQueue.getFullPath())).thenReturn(this.bucketRegionQueue);
+ when(cache.getRegionByPath(this.bucketRegionQueue.getFullPath()))
+ .thenReturn(this.bucketRegionQueue);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b50958/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
index cc9caaf..d57ce12 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -1,18 +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
+ * 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.internal.cache.wan.parallel;
@@ -74,7 +72,8 @@ public class ParallelQueueRemovalMessageJUnitTest {
when(this.queueRegion.getPrStats()).thenReturn(mock(PartitionedRegionStats.class));
when(this.queueRegion.getDataStore()).thenReturn(mock(PartitionedRegionDataStore.class));
when(this.queueRegion.getCache()).thenReturn(this.cache);
- EvictionAttributesImpl ea = (EvictionAttributesImpl) EvictionAttributes.createLRUMemoryAttributes(100, null, EvictionAction.OVERFLOW_TO_DISK);
+ EvictionAttributesImpl ea = (EvictionAttributesImpl) EvictionAttributes
+ .createLRUMemoryAttributes(100, null, EvictionAction.OVERFLOW_TO_DISK);
LRUAlgorithm algorithm = ea.createEvictionController(this.queueRegion, false);
algorithm.getLRUHelper().initStats(this.queueRegion, this.cache.getDistributedSystem());
when(this.queueRegion.getEvictionController()).thenReturn(algorithm);
@@ -94,8 +93,10 @@ public class ParallelQueueRemovalMessageJUnitTest {
private void createRootRegion() {
// Mock root region
this.rootRegion = mock(PartitionedRegion.class);
- when(this.rootRegion.getFullPath()).thenReturn(Region.SEPARATOR+PartitionedRegionHelper.PR_ROOT_REGION_NAME);
- when(this.cache.getRegion(PartitionedRegionHelper.PR_ROOT_REGION_NAME, true)).thenReturn(this.rootRegion);
+ when(this.rootRegion.getFullPath())
+ .thenReturn(Region.SEPARATOR + PartitionedRegionHelper.PR_ROOT_REGION_NAME);
+ when(this.cache.getRegion(PartitionedRegionHelper.PR_ROOT_REGION_NAME, true))
+ .thenReturn(this.rootRegion);
when(this.cache.getRegion(getRegionQueueName(), false)).thenReturn(this.queueRegion);
}
@@ -114,19 +115,25 @@ public class ParallelQueueRemovalMessageJUnitTest {
when(this.queueRegion.getPartitionAttributes()).thenReturn(pa);
when(this.queueRegion.getDataPolicy()).thenReturn(DataPolicy.PARTITION);
when(pa.getColocatedWith()).thenReturn(null);
- ProxyBucketRegion pbr = new ProxyBucketRegion(BUCKET_ID, this.queueRegion, pbrIra); // final classes cannot be mocked
+ ProxyBucketRegion pbr = new ProxyBucketRegion(BUCKET_ID, this.queueRegion, pbrIra); // final
+ // classes
+ // cannot be
+ // mocked
when(ba.getProxyBucketRegion()).thenReturn(pbr);
// Create RegionAttributes
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.DISTRIBUTED_ACK);
factory.setDataPolicy(DataPolicy.REPLICATE);
- factory.setEvictionAttributes(EvictionAttributes.createLRUMemoryAttributes(100, null, EvictionAction.OVERFLOW_TO_DISK));
+ factory.setEvictionAttributes(
+ EvictionAttributes.createLRUMemoryAttributes(100, null, EvictionAction.OVERFLOW_TO_DISK));
RegionAttributes attributes = factory.create();
// Create BucketRegionQueue
- this.bucketRegionQueue = new BucketRegionQueue(this.queueRegion.getBucketName(BUCKET_ID), attributes, this.rootRegion, this.cache, ira);
- this.bucketRegionQueueHelper = new BucketRegionQueueHelper(this.cache, this.queueRegion, this.bucketRegionQueue);
+ this.bucketRegionQueue = new BucketRegionQueue(this.queueRegion.getBucketName(BUCKET_ID),
+ attributes, this.rootRegion, this.cache, ira);
+ this.bucketRegionQueueHelper =
+ new BucketRegionQueueHelper(this.cache, this.queueRegion, this.bucketRegionQueue);
}
@After
@@ -135,12 +142,14 @@ public class ParallelQueueRemovalMessageJUnitTest {
}
@Test
- public void validateFailedBatchRemovalMessageKeysInUninitializedBucketRegionQueue() throws Exception {
+ public void validateFailedBatchRemovalMessageKeysInUninitializedBucketRegionQueue()
+ throws Exception {
// Validate initial BucketRegionQueue state
assertFalse(this.bucketRegionQueue.isInitialized());
assertEquals(0, this.bucketRegionQueue.getFailedBatchRemovalMessageKeys().size());
- // Create and process a ParallelQueueRemovalMessage (causes the failedBatchRemovalMessageKeys to add a key)
+ // Create and process a ParallelQueueRemovalMessage (causes the failedBatchRemovalMessageKeys to
+ // add a key)
createAndProcessParallelQueueRemovalMessage();
// Validate BucketRegionQueue after processing ParallelQueueRemovalMessage
@@ -157,7 +166,8 @@ public class ParallelQueueRemovalMessageJUnitTest {
this.bucketRegionQueueHelper.addEvent(KEY);
assertEquals(1, this.bucketRegionQueue.size());
- // Create and process a ParallelQueueRemovalMessage (causes the value of the entry to be set to DESTROYED)
+ // Create and process a ParallelQueueRemovalMessage (causes the value of the entry to be set to
+ // DESTROYED)
when(this.queueRegion.getKeyInfo(KEY, null, null)).thenReturn(new KeyInfo(KEY, null, null));
createAndProcessParallelQueueRemovalMessage();
@@ -175,10 +185,12 @@ public class ParallelQueueRemovalMessageJUnitTest {
ParallelGatewaySenderEventProcessor pgsep = createConcurrentParallelGatewaySenderQueue();
// Add a mock GatewaySenderEventImpl to the temp queue
- BlockingQueue<GatewaySenderEventImpl> tempQueue = createTempQueueAndAddEvent(pgsep, mock(GatewaySenderEventImpl.class));
+ BlockingQueue<GatewaySenderEventImpl> tempQueue =
+ createTempQueueAndAddEvent(pgsep, mock(GatewaySenderEventImpl.class));
assertEquals(1, tempQueue.size());
- // Create and process a ParallelQueueRemovalMessage (causes the failedBatchRemovalMessageKeys to add a key)
+ // Create and process a ParallelQueueRemovalMessage (causes the failedBatchRemovalMessageKeys to
+ // add a key)
createAndProcessParallelQueueRemovalMessage();
// Validate temp queue is empty after processing ParallelQueueRemovalMessage
@@ -202,7 +214,8 @@ public class ParallelQueueRemovalMessageJUnitTest {
BlockingQueue<GatewaySenderEventImpl> tempQueue = createTempQueueAndAddEvent(pgsep, gsei);
assertEquals(1, tempQueue.size());
- // Create and process a ParallelQueueRemovalMessage (causes the value of the entry to be set to DESTROYED)
+ // Create and process a ParallelQueueRemovalMessage (causes the value of the entry to be set to
+ // DESTROYED)
when(this.queueRegion.getKeyInfo(KEY, null, null)).thenReturn(new KeyInfo(KEY, null, null));
createAndProcessParallelQueueRemovalMessage();
@@ -217,7 +230,8 @@ public class ParallelQueueRemovalMessageJUnitTest {
}
private void createAndProcessParallelQueueRemovalMessage() {
- ParallelQueueRemovalMessage pqrm = new ParallelQueueRemovalMessage(createRegionToDispatchedKeysMap());
+ ParallelQueueRemovalMessage pqrm =
+ new ParallelQueueRemovalMessage(createRegionToDispatchedKeysMap());
pqrm.process(null);
}
@@ -233,16 +247,19 @@ public class ParallelQueueRemovalMessageJUnitTest {
private ParallelGatewaySenderEventProcessor createConcurrentParallelGatewaySenderQueue() {
ParallelGatewaySenderEventProcessor pgsep = new ParallelGatewaySenderEventProcessor(sender);
- ConcurrentParallelGatewaySenderQueue cpgsq = new ConcurrentParallelGatewaySenderQueue(sender, new ParallelGatewaySenderEventProcessor[] {pgsep});
+ ConcurrentParallelGatewaySenderQueue cpgsq = new ConcurrentParallelGatewaySenderQueue(sender,
+ new ParallelGatewaySenderEventProcessor[] {pgsep});
Set<RegionQueue> queues = new HashSet<>();
queues.add(cpgsq);
when(this.sender.getQueues()).thenReturn(queues);
return pgsep;
}
- private BlockingQueue<GatewaySenderEventImpl> createTempQueueAndAddEvent(ParallelGatewaySenderEventProcessor pgsep, GatewaySenderEventImpl gsei) {
+ private BlockingQueue<GatewaySenderEventImpl> createTempQueueAndAddEvent(
+ ParallelGatewaySenderEventProcessor pgsep, GatewaySenderEventImpl gsei) {
ParallelGatewaySenderQueue pgsq = (ParallelGatewaySenderQueue) pgsep.getQueue();
- Map<Integer, BlockingQueue<GatewaySenderEventImpl>> tempQueueMap = pgsq.getBucketToTempQueueMap();
+ Map<Integer, BlockingQueue<GatewaySenderEventImpl>> tempQueueMap =
+ pgsq.getBucketToTempQueueMap();
BlockingQueue<GatewaySenderEventImpl> tempQueue = new LinkedBlockingQueue();
when(gsei.getShadowKey()).thenReturn(KEY);
tempQueue.add(gsei);
@@ -251,6 +268,6 @@ public class ParallelQueueRemovalMessageJUnitTest {
}
private String getRegionQueueName() {
- return Region.SEPARATOR+GATEWAY_SENDER_ID+ ParallelGatewaySenderQueue.QSTRING;
+ return Region.SEPARATOR + GATEWAY_SENDER_ID + ParallelGatewaySenderQueue.QSTRING;
}
}
[71/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
GEODE-2014: Upgrade Swagger libraries
* Updated expected jars list after swagger update
* this closes #270
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/15a54656
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/15a54656
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/15a54656
Branch: refs/heads/feature/GEM-983
Commit: 15a54656f7f1b160a24f7d42dc39b6ceb0954821
Parents: a48871e
Author: Kevin Duling <kd...@pivotal.io>
Authored: Mon Oct 24 16:23:26 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Tue Oct 25 08:03:54 2016 -0700
----------------------------------------------------------------------
.../src/test/resources/expected_jars.txt | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/15a54656/geode-assembly/src/test/resources/expected_jars.txt
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/resources/expected_jars.txt b/geode-assembly/src/test/resources/expected_jars.txt
index 76f4b86..a9a5a79 100644
--- a/geode-assembly/src/test/resources/expected_jars.txt
+++ b/geode-assembly/src/test/resources/expected_jars.txt
@@ -37,10 +37,6 @@ jline
jna
jopt-simple
json4s-ast
-json4s-core
-json4s-ext
-json4s-jackson
-json4s-native
log4j-api
log4j-core
log4j-jcl
@@ -79,5 +75,14 @@ spring-tx
spring-web
spring-webmvc
swagger-annotations
-swagger-core
-swagger-springmvc
+mapstruct
+spring-plugin-core
+spring-plugin-metadata
+springfox-core
+springfox-schema
+springfox-spi
+springfox-spring-web
+springfox-swagger
+springfox-swagger-common
+springfox-swagger-ui
+swagger-models
\ No newline at end of file
[88/98] [abbrv] incubator-geode git commit: GEODE-2000 client should
see server-bind-address in event memberId
Posted by ds...@apache.org.
GEODE-2000 client should see server-bind-address in event memberId
The previous fix for this caused confusion as it changed the server
memberId that is used in other places and should remain unchanged.
This change set alters just the listener-invocation code in the client
cache so that client events are based on the ServerLocation information
returned by the Locator or added to the connection pool by applications.
Udo worked with me on this and we found the listener invocation code to
be somewhat convoluted, mixing server-side notification about clients
with client-side notification about servers in the same code. This
lead to a bit of refactoring in InternalClientMembership to separate the two.
A number of changes had to be made in test code. Some tests were
requiring that client-side listeners see the server's exact member
ID which is no longer true since the ID being fabricated out of a
ServerLocation doesn't have as much detail as the true member ID and
so is not equal() to it. Some other test code was creating
ServerLocation objects with non-existent host names. This is
no longer allowed so we changed these tests to use a numeric IP address.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/87f2fb5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/87f2fb5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/87f2fb5f
Branch: refs/heads/feature/GEM-983
Commit: 87f2fb5f32f71b0fda74fa61c1237b41f4c7ef11
Parents: a564a69
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Oct 27 09:00:50 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Oct 27 09:03:51 2016 -0700
----------------------------------------------------------------------
.../internal/DistributionLocatorConfigImpl.java | 23 +-
.../client/internal/EndpointManagerImpl.java | 6 +-
.../membership/InternalDistributedMember.java | 29 ++-
.../cache/tier/InternalClientMembership.java | 139 ++++++-----
.../cache/tier/sockets/CacheClientUpdater.java | 2 +-
.../internal/cache/tier/sockets/HandShake.java | 4 +-
.../cache/tier/sockets/ServerConnection.java | 6 +-
.../AutoConnectionSourceImplJUnitTest.java | 55 +++++
.../pooling/ConnectionManagerJUnitTest.java | 7 +-
.../PartitionRegionHelperDUnitTest.java | 6 -
.../cache30/ClientMembershipDUnitTest.java | 77 +++---
.../internal/DistributionManagerDUnitTest.java | 2 -
...onedRegionQueryEvaluatorIntegrationTest.java | 25 +-
...ersalMembershipListenerAdapterDUnitTest.java | 238 +++++++++----------
.../java/org/apache/geode/test/fake/Fakes.java | 6 +-
15 files changed, 334 insertions(+), 291 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
index c3cab6f..851693a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
@@ -14,6 +14,7 @@
*/
package org.apache.geode.admin.internal;
+import org.apache.geode.GemFireConfigException;
import org.apache.geode.admin.DistributionLocator;
import org.apache.geode.admin.DistributionLocatorConfig;
import org.apache.geode.distributed.internal.tcpserver.*;
@@ -66,14 +67,20 @@ public class DistributionLocatorConfigImpl extends ManagedEntityConfigImpl
*/
static DistributionLocatorConfig createConfigFor(String host, int port, InetAddress bindAddress) {
TcpClient client = new TcpClient();
- String[] info = null;
- if (bindAddress != null) {
- info = client.getInfo(bindAddress, port);
- } else {
- info = client.getInfo(InetAddressUtil.toInetAddress(host), port);
- }
- if (info == null) {
- return null;
+ String[] info = new String[] {"unknown", "unknown"};
+
+ try {
+ client = new TcpClient();
+ if (bindAddress != null) {
+ info = client.getInfo(bindAddress, port);
+ } else {
+ info = client.getInfo(InetAddressUtil.toInetAddress(host), port);
+ }
+ if (info == null) {
+ return null;
+ }
+ } catch (GemFireConfigException e) {
+ // communications are not initialized at this point
}
DistributionLocatorConfigImpl config = new DistributionLocatorConfigImpl();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
index ec8a818..6d5d9d6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
@@ -318,7 +318,7 @@ public class EndpointManagerImpl implements EndpointManager {
return;
}
// logger.warn("EMANFIRE:CRASH:"+endpoint.getLocation());
- InternalClientMembership.notifyCrashed(endpoint.getMemberId(), false);
+ InternalClientMembership.notifyServerCrashed(endpoint.getLocation());
}
public void endpointNoLongerInUse(Endpoint endpoint) {
@@ -326,7 +326,7 @@ public class EndpointManagerImpl implements EndpointManager {
return;
}
// logger.warn("EMANFIRE:LEFT:"+endpoint.getLocation());
- InternalClientMembership.notifyLeft(endpoint.getMemberId(), false);
+ InternalClientMembership.notifyServerLeft(endpoint.getLocation());
}
public void endpointNowInUse(Endpoint endpoint) {
@@ -335,7 +335,7 @@ public class EndpointManagerImpl implements EndpointManager {
}
// logger.warn("EMANFIRE:JOIN:"+endpoint.getLocation()+" mid:"+endpoint.getMemberId(),new
// Exception());
- InternalClientMembership.notifyJoined(endpoint.getMemberId(), false);
+ InternalClientMembership.notifyServerJoined(endpoint.getLocation());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 82dd055..0d4fd9e 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -15,6 +15,7 @@
package org.apache.geode.distributed.internal.membership;
import org.apache.geode.DataSerializer;
+import org.apache.geode.GemFireConfigException;
import org.apache.geode.InternalGemFireError;
import org.apache.geode.cache.UnsupportedVersionException;
import org.apache.geode.distributed.DistributedMember;
@@ -23,6 +24,7 @@ import org.apache.geode.distributed.Role;
import org.apache.geode.distributed.internal.DistributionAdvisor.ProfileId;
import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionManager;
+import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.*;
import org.apache.geode.internal.cache.versions.VersionSource;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -242,11 +244,31 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* @param p the membership listening port
* @throws UnknownHostException if the given hostname cannot be resolved
*/
- public InternalDistributedMember(String i, int p) throws UnknownHostException {
+ public InternalDistributedMember(String i, int p) {
this(i, p, Version.CURRENT);
}
/**
+ * Creates a new InternalDistributedMember for use in notifying membership listeners. The version
+ * information in the ID is set to Version.CURRENT.
+ *
+ * @param location the coordinates of the server
+ */
+
+ public InternalDistributedMember(ServerLocation location) {
+ this.hostName = location.getHostName();
+ InetAddress addr = null;
+ try {
+ addr = InetAddress.getByName(this.hostName);
+ } catch (UnknownHostException e) {
+ throw new GemFireConfigException("Unable to resolve server location " + location, e);
+ }
+ this.netMbr = MemberFactory.newNetMember(addr, location.getPort());
+ this.vmKind = DistributionManager.NORMAL_DM_TYPE;
+ this.versionObj = Version.CURRENT;
+ }
+
+ /**
* Create a InternalDistributedMember referring to the current host (as defined by the given
* string).
* <p>
@@ -260,7 +282,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* @param version the version of this member
* @throws UnknownHostException if the given hostname cannot be resolved
*/
- public InternalDistributedMember(String i, int p, Version version) throws UnknownHostException {
+ public InternalDistributedMember(String i, int p, Version version) {
this(i, p, version, MemberFactory.newNetMember(i, p));
}
@@ -272,8 +294,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
* <b> THIS METHOD IS FOR TESTING ONLY. DO NOT USE IT TO CREATE IDs FOR USE IN THE PRODUCT. IT
* DOES NOT PROPERLY INITIALIZE ATTRIBUTES NEEDED FOR P2P FUNCTIONALITY. </b>
**/
- public InternalDistributedMember(String i, int p, Version version, NetMember netMember)
- throws UnknownHostException {
+ public InternalDistributedMember(String i, int p, Version version, NetMember netMember) {
netMbr = netMember;
defaultToCurrentHost();
this.vmKind = DistributionManager.NORMAL_DM_TYPE;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
index 656f7de..aeabc86 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/InternalClientMembership.java
@@ -27,6 +27,8 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelException;
@@ -349,77 +351,77 @@ public final class InternalClientMembership {
/**
- * Notifies registered listeners that a Client member has joined. The new member may be a client
- * connecting to this process or a server that this process has just connected to.
+ * Notifies registered listeners that a Client member has connected
*
- * @param member the <code>DistributedMember</code>
- * @param client true if the member is a client; false if server
+ * @param clientId the representing the client
*/
- public static void notifyJoined(final DistributedMember member, final boolean client) {
- startMonitoring();
- ThreadPoolExecutor queuedExecutor = executor;
- if (queuedExecutor == null) {
- return;
- }
+ public static void notifyClientJoined(final DistributedMember clientId) {
+ notifyListeners(clientId, true, EventType.JOINED);
+ }
- final ClientMembershipEvent event = new InternalClientMembershipEvent(member, client);
- if (forceSynchronous) {
- doNotifyClientMembershipListener(member, client, event, EventType.CLIENT_JOINED);
- } else {
- try {
- queuedExecutor.execute(new Runnable() {
- public void run() {
- doNotifyClientMembershipListener(member, client, event, EventType.CLIENT_JOINED);
- }
- });
- } catch (RejectedExecutionException e) {
- // executor must have been shutdown
- }
- }
+ /**
+ * Notifies registered listeners that a Client member has left
+ *
+ * @param clientId the representing the client
+ */
+ public static void notifyClientLeft(final DistributedMember clientId) {
+ notifyListeners(clientId, true, EventType.LEFT);
+ }
+
+ /**
+ * Notifies registered listeners that a Client member has crashed
+ *
+ * @param clientId the representing the client
+ */
+ public static void notifyClientCrashed(final DistributedMember clientId) {
+ notifyListeners(clientId, true, EventType.CRASHED);
}
/**
- * Notifies registered listeners that a member has left. The departed member may be a client
- * previously connected to this process or a server that this process was connected to.
+ * Notifies registered listeners that a Client member has connected
*
- * @param member the <code>DistributedMember</code>
- * @param client true if the member is a client; false if server
+ * @param location the address of the server
*/
- public static void notifyLeft(final DistributedMember member, final boolean client) {
- startMonitoring();
- ThreadPoolExecutor queuedExecutor = executor;
- if (queuedExecutor == null) {
- return;
- }
+ public static void notifyServerJoined(final ServerLocation location) {
+ DistributedMember id = new InternalDistributedMember(location);
+ notifyListeners(id, false, EventType.JOINED);
+ }
+ /**
+ * Notifies registered listeners that a Client member has left
+ *
+ * @param location the address of the server
+ */
+ public static void notifyServerLeft(final ServerLocation location) {
+ DistributedMember id = new InternalDistributedMember(location);
+ notifyListeners(id, false, EventType.LEFT);
+ }
- final ClientMembershipEvent event = new InternalClientMembershipEvent(member, client);
- if (forceSynchronous) {
- doNotifyClientMembershipListener(member, client, event, EventType.CLIENT_LEFT);
- } else {
- try {
- queuedExecutor.execute(new Runnable() {
- public void run() {
- doNotifyClientMembershipListener(member, client, event, EventType.CLIENT_LEFT);
- }
- });
- } catch (RejectedExecutionException e) {
- // executor must have been shutdown
- }
- }
+ /**
+ * Notifies registered listeners that a Client member has crashed
+ *
+ * @param location the address of the server
+ */
+ public static void notifyServerCrashed(final ServerLocation location) {
+ DistributedMember id = new InternalDistributedMember(location);
+ notifyListeners(id, false, EventType.CRASHED);
}
+
/**
- * Notifies registered listeners that a member has crashed. The departed member may be a client
- * previously connected to this process or a server that this process was connected to.
- *
+ * Notifies registered listeners that a Client member has joined. The new member may be a client
+ * connecting to this process or a server that this process has just connected to.
+ *
* @param member the <code>DistributedMember</code>
* @param client true if the member is a client; false if server
+ * @param typeOfEvent joined/left/crashed
*/
- public static void notifyCrashed(final DistributedMember member, final boolean client) {
+ private static void notifyListeners(final DistributedMember member, final boolean client,
+ final EventType typeOfEvent) {
+ startMonitoring();
ThreadPoolExecutor queuedExecutor = executor;
if (queuedExecutor == null) {
return;
@@ -427,14 +429,11 @@ public final class InternalClientMembership {
final ClientMembershipEvent event = new InternalClientMembershipEvent(member, client);
if (forceSynchronous) {
- doNotifyClientMembershipListener(member, client, event, EventType.CLIENT_CRASHED);
+ doNotifyClientMembershipListener(member, client, event, typeOfEvent);
} else {
-
try {
- queuedExecutor.execute(new Runnable() {
- public void run() {
- doNotifyClientMembershipListener(member, client, event, EventType.CLIENT_CRASHED);
- }
+ queuedExecutor.execute(() -> {
+ doNotifyClientMembershipListener(member, client, event, typeOfEvent);
});
} catch (RejectedExecutionException e) {
// executor must have been shutdown
@@ -442,6 +441,7 @@ public final class InternalClientMembership {
}
}
+
private static void doNotifyClientMembershipListener(DistributedMember member, boolean client,
ClientMembershipEvent clientMembershipEvent, EventType eventType) {
@@ -450,9 +450,9 @@ public final class InternalClientMembership {
ClientMembershipListener listener = iter.next();
try {
- if (eventType.equals(EventType.CLIENT_JOINED)) {
+ if (eventType.equals(EventType.JOINED)) {
listener.memberJoined(clientMembershipEvent);
- } else if (eventType.equals(EventType.CLIENT_LEFT)) {
+ } else if (eventType.equals(EventType.LEFT)) {
listener.memberLeft(clientMembershipEvent);
} else {
listener.memberCrashed(clientMembershipEvent);
@@ -549,17 +549,26 @@ public final class InternalClientMembership {
}
/**
- * Internal implementation of ClientMembershipEvent.
+ * Internal implementation of ClientMembershipEvent. This class is used in both clients and
+ * servers to notify listeners about events concerning client/server communications. In servers
+ * listeners are notified about clients connecting/disconnecting. In clients listeners notified
+ * about new connections being formed to servers. The instance variable "client" is used to
+ * distinguish between the two.
*/
protected static class InternalClientMembershipEvent implements ClientMembershipEvent {
private final DistributedMember member;
+
+ /**
+ * If true this means that a client has joined/left/crashed.
+ * <p>
+ * If false this means that a server has joined/left/crashed
+ */
private final boolean client;
- /** Constructs new instance of event */
- protected InternalClientMembershipEvent(DistributedMember member, boolean client) {
+ protected InternalClientMembershipEvent(DistributedMember member, boolean isClient) {
this.member = member;
- this.client = client;
+ this.client = isClient;
}
public DistributedMember getMember() {
@@ -593,7 +602,7 @@ public final class InternalClientMembership {
}
private static enum EventType {
- CLIENT_JOINED, CLIENT_LEFT, CLIENT_CRASHED
+ JOINED, LEFT, CRASHED
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
index 90cdeda..b4a6bed 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java
@@ -300,7 +300,7 @@ public class CacheClientUpdater extends Thread implements ClientUpdater, Disconn
mySock.getInetAddress().getHostAddress(), mySock.getLocalPort(), mySock.getPort());
}
- ServerQueueStatus sqs = handshake.greetNotifier(mySock, this.isPrimary, location);
+ ServerQueueStatus sqs = handshake.greetNotifier(mySock, this.isPrimary);
if (sqs.isPrimary() || sqs.isNonRedundant()) {
PoolImpl pool = (PoolImpl) this.qManager.getPool();
if (!pool.getReadyForEventsCalled()) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index 95e531d..c0db945 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -1297,7 +1297,7 @@ public class HandShake implements ClientHandShake {
}
}
- public ServerQueueStatus greetNotifier(Socket sock, boolean isPrimary, ServerLocation location)
+ public ServerQueueStatus greetNotifier(Socket sock, boolean isPrimary)
throws IOException, AuthenticationRequiredException, AuthenticationFailedException,
ServerRefusedConnectionException, ClassNotFoundException {
ServerQueueStatus sqs = null;
@@ -1378,7 +1378,7 @@ public class HandShake implements ClientHandShake {
dis = new VersionedDataInputStream(dis, v);
}
try {
- return (DistributedMember) DataSerializer.readObject(dis);
+ return DataSerializer.readObject(dis);
} catch (EOFException e) {
throw e;
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 47932d0..7e915f2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -552,7 +552,7 @@ public class ServerConnection implements Runnable {
this.crHelper.checkCancelInProgress(null);
if (clientJoined && isFiringMembershipEvents()) {
// This is a new client. Notify bridge membership and heartbeat monitor.
- InternalClientMembership.notifyJoined(this.proxyId.getDistributedMember(), true);
+ InternalClientMembership.notifyClientJoined(this.proxyId.getDistributedMember());
}
ClientHealthMonitor chm = this.acceptor.getClientHealthMonitor();
@@ -862,9 +862,9 @@ public class ServerConnection implements Runnable {
// the heartbeat monitor; other wise just remove the connection.
if (clientDeparted && isFiringMembershipEvents()) {
if (this.clientDisconnectedCleanly && !forceClientCrashEvent) {
- InternalClientMembership.notifyLeft(proxyId.getDistributedMember(), true);
+ InternalClientMembership.notifyClientLeft(proxyId.getDistributedMember());
} else {
- InternalClientMembership.notifyCrashed(this.proxyId.getDistributedMember(), true);
+ InternalClientMembership.notifyClientCrashed(this.proxyId.getDistributedMember());
}
// The client has departed. Remove this last connection and unregister it.
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index 913edf2..fdde35c 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -32,6 +32,11 @@ import org.apache.geode.distributed.internal.tcpserver.TcpHandler;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.cache.PoolStats;
+import org.apache.geode.internal.cache.tier.InternalClientMembership;
+import org.apache.geode.internal.cache.tier.sockets.HandShake;
+import org.apache.geode.internal.net.SocketCreator;
+import org.apache.geode.management.membership.ClientMembershipEvent;
+import org.apache.geode.management.membership.ClientMembershipListener;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
@@ -49,12 +54,16 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
+import com.jayway.awaitility.Awaitility;
+
/**
*
*/
@@ -138,6 +147,52 @@ public class AutoConnectionSourceImplJUnitTest {
}
@Test
+ public void testServerLocationUsedInListenerNotification() throws Exception {
+ final ClientMembershipEvent[] listenerEvents = new ClientMembershipEvent[1];
+
+ ClientMembershipListener listener = new ClientMembershipListener() {
+
+ @Override
+ public void memberJoined(final ClientMembershipEvent event) {
+ synchronized (listenerEvents) {
+ listenerEvents[0] = event;
+ }
+ }
+
+ @Override
+ public void memberLeft(final ClientMembershipEvent event) {}
+
+ @Override
+ public void memberCrashed(final ClientMembershipEvent event) {}
+ };
+ InternalClientMembership.registerClientMembershipListener(listener);
+
+ ServerLocation location = new ServerLocation("1.1.1.1", 0);
+
+ InternalClientMembership.notifyServerJoined(location);
+ Awaitility.await("wait for listener notification").atMost(10, TimeUnit.SECONDS).until(() -> {
+ synchronized (listenerEvents) {
+ return listenerEvents[0] != null;
+ }
+ });
+
+ assertEquals("1.1.1.1", listenerEvents[0].getMember().getHost());
+
+ InetAddress addr = InetAddress.getLocalHost();
+ location = new ServerLocation(addr.getHostAddress(), 0);
+
+ listenerEvents[0] = null;
+ InternalClientMembership.notifyServerJoined(location);
+ Awaitility.await("wait for listener notification").atMost(10, TimeUnit.SECONDS).until(() -> {
+ synchronized (listenerEvents) {
+ return listenerEvents[0] != null;
+ }
+ });
+
+ assertEquals(addr.getCanonicalHostName(), listenerEvents[0].getMember().getHost());
+ }
+
+ @Test
public void testNoServers() throws Exception {
startFakeLocator();
handler.nextConnectionResponse = new ClientConnectionResponse(null);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
index 1017db2..0f632b8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/pooling/ConnectionManagerJUnitTest.java
@@ -799,12 +799,7 @@ public class ConnectionManagerJUnitTest {
this.notifyAll();
}
DistributedMember fakeMember = null;
- try {
- fakeMember = new InternalDistributedMember("localhost", 555);
- } catch (UnknownHostException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ fakeMember = new InternalDistributedMember("localhost", 555);
final DistributedMember member = fakeMember;
return new Connection() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
index a4494ca..4236799 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/partition/PartitionRegionHelperDUnitTest.java
@@ -612,8 +612,6 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
fail("Should have received an exception");
} catch (IllegalStateException expected) {
System.err.println(expected);
- } catch (UnknownHostException e) {
- Assert.fail("Unknown host", e);
}
assertHasMembers(PartitionRegionHelper.getAllMembersForKey(region, 1), member0, member1);
@@ -693,8 +691,6 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
fail("Should have received an exception");
} catch (IllegalStateException expected) {
System.err.println(expected);
- } catch (UnknownHostException e) {
- Assert.fail("Unknown host", e);
}
assertHasMembers(PartitionRegionHelper.getAllMembersForKey(region, 1), member0, member1);
@@ -705,8 +701,6 @@ public class PartitionRegionHelperDUnitTest extends JUnit4CacheTestCase {
fail("Should have received an exception");
} catch (IllegalStateException expected) {
System.err.println(expected);
- } catch (UnknownHostException e) {
- Assert.fail("Unknown host", e);
}
assertHasMembers(PartitionRegionHelper.getAllMembersForKey(region, 1), member0, member1);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
index 83b75d5..67b1e9e 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/ClientMembershipDUnitTest.java
@@ -33,6 +33,8 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import com.jayway.awaitility.Awaitility;
+import org.apache.geode.distributed.internal.ServerLocation;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -82,6 +84,8 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
private static Properties properties;
+ ServerLocation serverLocation = new ServerLocation("127.0.0.1", 0);
+
@Override
public final void postTearDownCacheTestCase() throws Exception {
Invoke.invokeInEveryVM((() -> cleanup()));
@@ -270,8 +274,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
ClientMembership.registerClientMembershipListener(listener);
// test JOIN for server
- DistributedMember serverJoined = new TestDistributedMember("serverJoined");
- InternalClientMembership.notifyJoined(serverJoined, SERVER);
+ InternalClientMembership.notifyServerJoined(serverLocation);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
@@ -279,8 +282,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
});
assertTrue(fired[JOINED]);
- assertEquals(serverJoined, member[JOINED]);
- assertEquals(serverJoined.getId(), memberId[JOINED]);
+ assertNotNull(member[JOINED]);
assertFalse(isClient[JOINED]);
assertFalse(fired[LEFT]);
assertNull(memberId[LEFT]);
@@ -292,7 +294,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
// test JOIN for client
DistributedMember clientJoined = new TestDistributedMember("clientJoined");
- InternalClientMembership.notifyJoined(clientJoined, CLIENT);
+ InternalClientMembership.notifyClientJoined(clientJoined);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
return fired[JOINED];
@@ -311,8 +313,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
resetArraysForTesting(fired, member, memberId, isClient);
// test LEFT for server
- DistributedMember serverLeft = new TestDistributedMember("serverLeft");
- InternalClientMembership.notifyLeft(serverLeft, SERVER);
+ InternalClientMembership.notifyServerLeft(serverLocation);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
return fired[LEFT];
@@ -322,8 +323,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertNull(memberId[JOINED]);
assertFalse(isClient[JOINED]);
assertTrue(fired[LEFT]);
- assertEquals(serverLeft, member[LEFT]);
- assertEquals(serverLeft.getId(), memberId[LEFT]);
+ assertNotNull(member[LEFT]);
assertFalse(isClient[LEFT]);
assertFalse(fired[CRASHED]);
assertNull(memberId[CRASHED]);
@@ -332,7 +332,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
// test LEFT for client
DistributedMember clientLeft = new TestDistributedMember("clientLeft");
- InternalClientMembership.notifyLeft(clientLeft, CLIENT);
+ InternalClientMembership.notifyClientLeft(clientLeft);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
return fired[LEFT];
@@ -351,8 +351,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
resetArraysForTesting(fired, member, memberId, isClient);
// test CRASHED for server
- DistributedMember serverCrashed = new TestDistributedMember("serverCrashed");
- InternalClientMembership.notifyCrashed(serverCrashed, SERVER);
+ InternalClientMembership.notifyServerCrashed(serverLocation);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
return fired[CRASHED];
@@ -365,14 +364,13 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertNull(memberId[LEFT]);
assertFalse(isClient[LEFT]);
assertTrue(fired[CRASHED]);
- assertEquals(serverCrashed, member[CRASHED]);
- assertEquals(serverCrashed.getId(), memberId[CRASHED]);
+ assertNotNull(member[CRASHED]);
assertFalse(isClient[CRASHED]);
resetArraysForTesting(fired, member, memberId, isClient);
// test CRASHED for client
DistributedMember clientCrashed = new TestDistributedMember("clientCrashed");
- InternalClientMembership.notifyCrashed(clientCrashed, CLIENT);
+ InternalClientMembership.notifyClientCrashed(clientCrashed);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
return fired[CRASHED];
@@ -434,7 +432,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
// fire event to make sure listener is registered
DistributedMember clientJoined = new TestDistributedMember("clientJoined");
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
return fired[JOINED];
@@ -452,7 +450,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
// unregister and verify listener is not notified
ClientMembership.unregisterClientMembershipListener(listener);
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).until(() -> {
return true;
@@ -496,7 +494,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
}
final DistributedMember clientJoined = new TestDistributedMember("clientJoined");
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
for (int i = 0; i < NUM_LISTENERS; i++) {
synchronized (listeners[i]) {
listeners[i].wait(20);
@@ -523,7 +521,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(listeners[0], registeredListeners[0]);
assertEquals(listeners[1], registeredListeners[1]);
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
synchronized (listeners[1]) {
if (!fired[1]) {
listeners[1].wait(2000);
@@ -549,7 +547,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(1, registeredListeners.length);
assertEquals(listeners[1], registeredListeners[0]);
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
synchronized (listeners[1]) {
if (!fired[1]) {
listeners[1].wait(2000);
@@ -578,7 +576,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(listeners[2], registeredListeners[1]);
assertEquals(listeners[3], registeredListeners[2]);
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
synchronized (listeners[3]) {
if (!fired[3]) {
listeners[3].wait(2000);
@@ -607,7 +605,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(listeners[3], registeredListeners[2]);
assertEquals(listeners[0], registeredListeners[3]);
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
synchronized (listeners[0]) {
if (!fired[0]) {
listeners[0].wait(2000);
@@ -628,7 +626,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(listeners[2], registeredListeners[1]);
assertEquals(listeners[0], registeredListeners[2]);
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
synchronized (listeners[0]) {
if (!fired[0]) {
listeners[0].wait(2000);
@@ -655,7 +653,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(listeners[1], registeredListeners[0]);
assertEquals(listeners[0], registeredListeners[1]);
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
synchronized (listeners[0]) {
if (!fired[0]) {
listeners[0].wait(2000);
@@ -681,7 +679,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
registeredListeners = ClientMembership.getClientMembershipListeners();
assertEquals(0, registeredListeners.length);
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
for (int i = 0; i < NUM_LISTENERS; i++) {
synchronized (listeners[i]) {
listeners[i].wait(20);
@@ -698,7 +696,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertEquals(1, registeredListeners.length);
assertEquals(listeners[1], registeredListeners[0]);
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
synchronized (listeners[1]) {
if (!fired[1]) {
listeners[1].wait(2000);
@@ -814,15 +812,13 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
// sanity check...
System.out.println("[testClientMembershipEventsInClient] sanity check");
- DistributedMember test = new TestDistributedMember("test");
- InternalClientMembership.notifyJoined(test, SERVER);
+ InternalClientMembership.notifyServerJoined(serverLocation);
Awaitility.await().pollInterval(50, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS)
.pollDelay(50, TimeUnit.MILLISECONDS).until(() -> fired[JOINED] || fired[CRASHED]);
assertTrue(fired[JOINED]);
- assertEquals(test, member[JOINED]);
- assertEquals(test.getId(), memberId[JOINED]);
+ assertNotNull(member[JOINED]);
assertFalse(isClient[JOINED]);
assertFalse(fired[LEFT]);
assertNull(member[LEFT]);
@@ -871,8 +867,6 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertTrue(fired[JOINED]);
assertNotNull(member[JOINED]);
assertNotNull(memberId[JOINED]);
- assertEquals(serverMember, member[JOINED]);
- assertEquals(serverMemberId, memberId[JOINED]);
assertFalse(isClient[JOINED]);
assertFalse(fired[LEFT]);
assertNull(member[LEFT]);
@@ -902,8 +896,6 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertTrue(fired[CRASHED]);
assertNotNull(member[CRASHED]);
assertNotNull(memberId[CRASHED]);
- assertEquals(serverMember, member[CRASHED]);
- assertEquals(serverMemberId, memberId[CRASHED]);
assertFalse(isClient[CRASHED]);
resetArraysForTesting(fired, member, memberId, isClient);
@@ -927,8 +919,6 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
assertNotNull(member[JOINED]);
assertNotNull(memberId[JOINED]);
assertFalse(isClient[JOINED]);
- assertEquals(serverMember, member[JOINED]);
- assertEquals(serverMemberId, memberId[JOINED]);
assertFalse(fired[LEFT]);
assertNull(member[LEFT]);
assertNull(memberId[LEFT]);
@@ -1018,7 +1008,7 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
// sanity check...
System.out.println("[testClientMembershipEventsInServer] sanity check");
DistributedMember test = new TestDistributedMember("test");
- InternalClientMembership.notifyJoined(test, CLIENT);
+ InternalClientMembership.notifyClientJoined(test);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
return fired[JOINED] || fired[LEFT] || fired[CRASHED];
@@ -1232,22 +1222,20 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
getSystem(config);
// assert that event is fired while connected
- DistributedMember serverJoined = new TestDistributedMember("serverJoined");
- InternalClientMembership.notifyJoined(serverJoined, SERVER);
+ InternalClientMembership.notifyServerJoined(serverLocation);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
return fired[JOINED];
});
assertTrue(fired[JOINED]);
- assertEquals(serverJoined, member[JOINED]);
- assertEquals(serverJoined.getId(), memberId[JOINED]);
+ assertNotNull(member[JOINED]);
assertFalse(isClient[JOINED]);
resetArraysForTesting(fired, member, memberId, isClient);
// assert that event is NOT fired while disconnected
disconnectFromDS();
- InternalClientMembership.notifyJoined(serverJoined, SERVER);
+ InternalClientMembership.notifyServerJoined(serverLocation);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).until(() -> {
return true;
@@ -1264,15 +1252,14 @@ public class ClientMembershipDUnitTest extends ClientServerTestCase {
InternalDistributedSystem sys = getSystem(config);
assertTrue(sys.isConnected());
- InternalClientMembership.notifyJoined(serverJoined, SERVER);
+ InternalClientMembership.notifyServerJoined(serverLocation);
Awaitility.await().pollInterval(100, TimeUnit.MILLISECONDS)
.pollDelay(100, TimeUnit.MILLISECONDS).timeout(300, TimeUnit.SECONDS).until(() -> {
return fired[JOINED];
});
assertTrue(fired[JOINED]);
- assertEquals(serverJoined, member[JOINED]);
- assertEquals(serverJoined.getId(), memberId[JOINED]);
+ assertNotNull(member[JOINED]);
assertFalse(isClient[JOINED]);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
index 1329c24..b1478e2 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
@@ -234,8 +234,6 @@ public class DistributionManagerDUnitTest extends JUnit4DistributedTestCase {
vm0.invoke(connectDisconnect);
assertTrue("Member was not removed from surprise member set", !mgr.isSurpriseMember(mbr));
- } catch (UnknownHostException e) {
- fail("unable to resolve localhost - test needs some attention", e);
} finally {
if (sys != null && sys.isConnected()) {
sys.disconnect();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
index 4e8408c..f19ba1c 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/PartitionedRegionQueryEvaluatorIntegrationTest.java
@@ -235,20 +235,7 @@ public class PartitionedRegionQueryEvaluatorIntegrationTest {
}
private InternalDistributedMember createDataStoreMember(int i) {
- String hostname = null;
- InternalDistributedMember mem = null;
- try {
- mem = new InternalDistributedMember("host" + i, 3033);
- } catch (java.net.UnknownHostException uhe) {
- logger.severe(
- "PartitionedRegion: initalizeNode() Unknown host = " + hostname + " servicePort = " + 0,
- uhe);
- throw new PartitionedRegionException(
- "PartitionedRegionDataStore: initalizeNode() Unknown host = " + hostname
- + " servicePort = " + 0,
- uhe);
- }
- return mem;
+ return new InternalDistributedMember("host" + i, 3033);
}
/**
@@ -257,14 +244,8 @@ public class PartitionedRegionQueryEvaluatorIntegrationTest {
* @return
*/
public Node createNode(int i) {
- Node node = null;
- try {
- node = new Node(new InternalDistributedMember("host" + i, 3033), i);
- node.setPRType(Node.DATASTORE);
- } catch (java.net.UnknownHostException uhe) {
- logger.severe("PartitionedRegion: initalizeNode() threw exception", uhe);
- throw new PartitionedRegionException("", uhe);
- }
+ Node node = new Node(new InternalDistributedMember("host" + i, 3033), i);
+ node.setPRType(Node.DATASTORE);
return node;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
index 019bd0f..eb2e662 100644
--- a/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -18,13 +18,17 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
import static org.apache.geode.test.dunit.Assert.*;
import static org.apache.geode.test.dunit.LogWriterUtils.*;
+import com.jayway.awaitility.Awaitility;
+
import java.io.IOException;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import org.apache.geode.distributed.internal.ServerLocation;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -78,7 +82,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
/** Brief pause for basic testing of asynchronous event notification */
private static final int BRIEF_PAUSE_MILLIS = 2000;
/** Maximum millis allowed for bridge client to fully connect before test fails */
- private static final int JOIN_FAIL_MILLIS = 120000;
+ private static final int JOIN_FAIL_MILLIS = 30000;
// the following wait millis are max wait time until notify occurs
@@ -87,7 +91,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
/** Millis to wait for basic synchronous listener to be notified */
private static final int SYNC_ASYNC_EVENT_WAIT_MILLIS = 2000;
/** Millis to wait for all three event listeners to be notified */
- private static final int ASYNC_EVENT_WAIT_MILLIS = 120000; // use Integer.MAX_VALUE for debugging
+ private static final int ASYNC_EVENT_WAIT_MILLIS = 30000; // use Integer.MAX_VALUE for debugging
@Override
public final void postTearDownCacheTestCase() throws Exception {
@@ -132,7 +136,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
};
DistributedMember clientJoined = new TestDistributedMember("clientJoined");
- InternalClientMembership.notifyJoined(clientJoined, true);
+ InternalClientMembership.notifyClientJoined(clientJoined);
synchronized (listener) {
if (!fired[0]) {
listener.wait(SYNC_ASYNC_EVENT_WAIT_MILLIS);
@@ -190,9 +194,10 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
};
DistributedMember memberA = new TestDistributedMember("memberA");
+ ServerLocation serverA = new ServerLocation("serverA", 0);
// first join
- InternalClientMembership.notifyJoined(memberA, true);
+ InternalClientMembership.notifyClientJoined(memberA);
synchronized (listener) {
if (!fired[JOINED]) {
listener.wait(SYNC_ASYNC_EVENT_WAIT_MILLIS);
@@ -206,14 +211,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
memberId[JOINED] = null;
// duplicate join
- InternalClientMembership.notifyJoined(memberA, true);
+ InternalClientMembership.notifyClientJoined(memberA);
Wait.pause(BRIEF_PAUSE_MILLIS);
assertFalse(fired[JOINED]);
assertNull(member[JOINED]);
assertNull(memberId[JOINED]);
// first left
- InternalClientMembership.notifyLeft(memberA, true);
+ InternalClientMembership.notifyClientLeft(memberA);
synchronized (listener) {
if (!fired[LEFT]) {
listener.wait(SYNC_ASYNC_EVENT_WAIT_MILLIS);
@@ -227,14 +232,14 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
memberId[LEFT] = null;
// duplicate left
- InternalClientMembership.notifyLeft(memberA, true);
+ InternalClientMembership.notifyClientLeft(memberA);
Wait.pause(BRIEF_PAUSE_MILLIS);
assertFalse(fired[LEFT]);
assertNull(member[LEFT]);
assertNull(memberId[LEFT]);
// rejoin
- InternalClientMembership.notifyJoined(memberA, true);
+ InternalClientMembership.notifyClientJoined(memberA);
synchronized (listener) {
if (!fired[JOINED]) {
listener.wait(SYNC_ASYNC_EVENT_WAIT_MILLIS);
@@ -399,7 +404,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final int[] ports = new int[1];
// create BridgeServer in controller vm...
- getLogWriter().info("[testLonerClientEventsInServer] Create BridgeServer");
+ System.out.println("[testLonerClientEventsInServer] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -413,9 +418,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final String serverMemberId = serverMember.toString();
final Properties serverProperties = getSystem().getProperties();
- getLogWriter().info("[testLonerClientEventsInServer] ports[0]=" + ports[0]);
- getLogWriter().info("[testLonerClientEventsInServer] serverMemberId=" + serverMemberId);
- getLogWriter().info("[testLonerClientEventsInServer] serverMember=" + serverMember);
+ System.out.println("[testLonerClientEventsInServer] ports[0]=" + ports[0]);
+ System.out.println("[testLonerClientEventsInServer] serverMemberId=" + serverMemberId);
+ System.out.println("[testLonerClientEventsInServer] serverMember=" + serverMember);
// register the bridge listener
ClientMembership.registerClientMembershipListener(bridgeListener);
@@ -433,7 +438,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
SerializableCallable createBridgeClient = new SerializableCallable("Create bridge client") {
@Override
public Object call() {
- getLogWriter().info("[testLonerClientEventsInServer] create bridge client");
+ System.out.println("[testLonerClientEventsInServer] create bridge client");
Properties config = new Properties();
config.setProperty(MCAST_PORT, "0");
config.setProperty(LOCATORS, "");
@@ -466,7 +471,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testLonerClientEventsInServer] assert server detected client join");
+ System.out.println("[testLonerClientEventsInServer] assert server detected client join");
assertTrue(firedBridge[JOINED]);
assertEquals(clientMember, memberBridge[JOINED]);
// as of 6.1 the id can change when a bridge is created or a connection pool is created
@@ -512,7 +517,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
+ System.out.println("[testLonerClientEventsInServer] wait for client to fully connect");
final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl) PoolManager.find(pl);
waitForClientToFullyConnect(pi);
@@ -521,7 +526,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Close bridge client region") {
public void run() {
- getLogWriter().info("[testLonerClientEventsInServer] close bridge client region");
+ System.out.println("[testLonerClientEventsInServer] close bridge client region");
getRootRegion().getSubregion(name).close();
PoolManager.close();
}
@@ -538,7 +543,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testLonerClientEventsInServer] assert server detected client left");
+ System.out.println("[testLonerClientEventsInServer] assert server detected client left");
assertFalse(firedBridge[JOINED]);
assertNull(memberIdBridge[JOINED]);
@@ -597,7 +602,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testLonerClientEventsInServer] assert server detected client re-join");
+ System.out.println("[testLonerClientEventsInServer] assert server detected client re-join");
assertTrue(firedBridge[JOINED]);
assertEquals(clientMember, memberBridge[JOINED]);
assertEquals(clientMemberId, memberIdBridge[JOINED]);
@@ -642,7 +647,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[testLonerClientEventsInServer] wait for client to fully connect");
+ System.out.println("[testLonerClientEventsInServer] wait for client to fully connect");
final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl) PoolManager.find(pl);
waitForClientToFullyConnect(pi);
@@ -653,7 +658,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
try {
vm0.invoke(new SerializableRunnable("Stop bridge client") {
public void run() {
- getLogWriter().info("[testLonerClientEventsInServer] Stop bridge client");
+ System.out.println("[testLonerClientEventsInServer] Stop bridge client");
getRootRegion().getSubregion(name).close();
PoolManager.close();
}
@@ -670,7 +675,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testLonerClientEventsInServer] assert server detected client crashed");
+ System.out.println("[testLonerClientEventsInServer] assert server detected client crashed");
assertFalse(firedBridge[JOINED]);
assertNull(memberIdBridge[JOINED]);
assertNull(memberBridge[JOINED]);
@@ -857,7 +862,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final int[] ports = new int[1];
// create BridgeServer in controller vm...
- getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
+ System.out.println("[doTestSystemClientEventsInServer] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -877,9 +882,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
serverProperties.remove(CLUSTER_SSL_PROTOCOLS);
serverProperties.remove(CLUSTER_SSL_REQUIRE_AUTHENTICATION);
- getLogWriter().info("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]);
- getLogWriter().info("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId);
- getLogWriter().info("[doTestSystemClientEventsInServer] serverMember=" + serverMember);
+ System.out.println("[doTestSystemClientEventsInServer] ports[0]=" + ports[0]);
+ System.out.println("[doTestSystemClientEventsInServer] serverMemberId=" + serverMemberId);
+ System.out.println("[doTestSystemClientEventsInServer] serverMember=" + serverMember);
// register the bridge listener
ClientMembership.registerClientMembershipListener(bridgeListener);
@@ -897,7 +902,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
SerializableCallable createBridgeClient = new SerializableCallable("Create bridge client") {
@Override
public Object call() {
- getLogWriter().info("[doTestSystemClientEventsInServer] create system bridge client");
+ System.out.println("[doTestSystemClientEventsInServer] create system bridge client");
assertTrue(getSystem(serverProperties).isConnected());
assertFalse(getCache().isClosed());
AttributesFactory factory = new AttributesFactory();
@@ -931,7 +936,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client join");
+ System.out.println("[doTestSystemClientEventsInServer] assert server detected client join");
assertArrayFalse(firedSystemDuplicate);
assertArrayFalse(firedAdapterDuplicate);
assertArrayFalse(firedBridgeDuplicate);
@@ -980,7 +985,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
+ System.out.println("[doTestSystemClientEventsInServer] wait for client to fully connect");
final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl) PoolManager.find(pl);
waitForClientToFullyConnect(pi);
@@ -990,7 +995,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
// close bridge client region
vm0.invoke(new SerializableRunnable("Close bridge client region") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
+ System.out.println("[doTestSystemClientEventsInServer] close bridge client region");
getRootRegion().getSubregion(name).close();
PoolManager.close();
}
@@ -1007,7 +1012,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
+ System.out.println("[doTestSystemClientEventsInServer] assert server detected client left");
assertArrayFalse(firedSystemDuplicate);
assertArrayFalse(firedAdapterDuplicate);
assertArrayFalse(firedBridgeDuplicate);
@@ -1069,7 +1074,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
+ System.out.println("[doTestSystemClientEventsInServer] assert server detected client re-join");
assertArrayFalse(firedSystemDuplicate);
assertArrayFalse(firedAdapterDuplicate);
assertArrayFalse(firedBridgeDuplicate);
@@ -1118,7 +1123,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
+ System.out.println("[doTestSystemClientEventsInServer] wait for client to fully connect");
final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl) PoolManager.find(pl);
waitForClientToFullyConnect(pi);
@@ -1128,7 +1133,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
// have bridge client disconnect from system
vm0.invoke(new SerializableRunnable("Disconnect bridge client") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] disconnect bridge client");
+ System.out.println("[doTestSystemClientEventsInServer] disconnect bridge client");
closeCache();
disconnectFromDS();
}
@@ -1150,7 +1155,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client left");
+ System.out.println("[doTestSystemClientEventsInServer] assert server detected client left");
assertArrayFalse(firedSystemDuplicate);
assertArrayFalse(firedAdapterDuplicate);
assertArrayFalse(firedBridgeDuplicate);
@@ -1217,7 +1222,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[doTestSystemClientEventsInServer] assert server detected client re-join");
+ System.out.println("[doTestSystemClientEventsInServer] assert server detected client re-join");
assertArrayFalse(firedSystemDuplicate);
assertArrayFalse(firedAdapterDuplicate);
assertArrayFalse(firedBridgeDuplicate);
@@ -1266,7 +1271,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
vm0.invoke(new SerializableRunnable("Wait for client to fully connect") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] wait for client to fully connect");
+ System.out.println("[doTestSystemClientEventsInServer] wait for client to fully connect");
final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl) PoolManager.find(pl);
waitForClientToFullyConnect(pi);
@@ -1278,7 +1283,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
try {
vm0.invoke(new SerializableRunnable("Close bridge client region") {
public void run() {
- getLogWriter().info("[doTestSystemClientEventsInServer] close bridge client region");
+ System.out.println("[doTestSystemClientEventsInServer] close bridge client region");
getRootRegion().getSubregion(name).close();
PoolManager.close();
}
@@ -1349,7 +1354,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
* the pool has more than one Endpoint.
*/
protected void waitForClientToFullyConnect(final PoolImpl pool) {
- getLogWriter().info("[waitForClientToFullyConnect]");
+ System.out.println("[waitForClientToFullyConnect]");
final long failMillis = System.currentTimeMillis() + JOIN_FAIL_MILLIS;
boolean fullyConnected = false;
while (!fullyConnected) {
@@ -1359,7 +1364,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
+ JOIN_FAIL_MILLIS + " milliseconds. Only " + pool.getConnectionCount()
+ " connections were created.", System.currentTimeMillis() < failMillis);
}
- getLogWriter().info("[waitForClientToFullyConnect] fullyConnected=" + fullyConnected);
+ System.out.println("[waitForClientToFullyConnect] fullyConnected=" + fullyConnected);
}
/**
@@ -1556,7 +1561,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
assertTrue(ports[0] != 0);
// create BridgeServer in controller vm...
- getLogWriter().info("[doTestSystemClientEventsInServer] Create BridgeServer");
+ System.out.println("[doTestSystemClientEventsInServer] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -1575,9 +1580,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
serverProperties.remove(CLUSTER_SSL_PROTOCOLS);
serverProperties.remove(CLUSTER_SSL_REQUIRE_AUTHENTICATION);
- getLogWriter().info("[testServerEventsInPeerSystem] ports[0]=" + ports[0]);
- getLogWriter().info("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId);
- getLogWriter().info("[testServerEventsInPeerSystem] serverMember=" + serverMember);
+ System.out.println("[testServerEventsInPeerSystem] ports[0]=" + ports[0]);
+ System.out.println("[testServerEventsInPeerSystem] serverMemberId=" + serverMemberId);
+ System.out.println("[testServerEventsInPeerSystem] serverMember=" + serverMember);
GemFireCacheImpl cache = GemFireCacheImpl.getExisting();
assertNotNull(cache);
@@ -1592,7 +1597,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
SerializableCallable createPeerCache = new SerializableCallable("Create Peer Cache") {
@Override
public Object call() {
- getLogWriter().info("[testServerEventsInPeerSystem] Create Peer cache");
+ System.out.println("[testServerEventsInPeerSystem] Create Peer cache");
getSystem(serverProperties);
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -1606,8 +1611,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
DistributedMember peerMember = (DistributedMember) vm0.invoke(createPeerCache);
String peerMemberId = peerMember.toString();
- getLogWriter().info("[testServerEventsInPeerSystem] peerMemberId=" + peerMemberId);
- getLogWriter().info("[testServerEventsInPeerSystem] peerMember=" + peerMember);
+ System.out.println("[testServerEventsInPeerSystem] peerMemberId=" + peerMemberId);
+ System.out.println("[testServerEventsInPeerSystem] peerMember=" + peerMember);
@@ -1622,7 +1627,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
}
}
- getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer join");
+ System.out.println("[testServerEventsInPeerSystem] assert server detected peer join");
assertArrayFalse(firedSystemDuplicate);
// TODO: sometimes get adapter duplicate since memberId isn't endpoint
// initial impl uses Endpoint.toString() for memberId of server; final
@@ -1669,7 +1674,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
try {
vm0.invoke(new SerializableRunnable("Disconnect Peer server") {
public void run() {
- getLogWriter().info("[testServerEventsInPeerSystem] disconnect peer server");
+ System.out.println("[testServerEventsInPeerSystem] disconnect peer server");
closeCache();
disconnectFromDS();
}
@@ -1692,7 +1697,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
ex.remove();
}
- getLogWriter().info("[testServerEventsInPeerSystem] assert server detected peer crashed");
+ System.out.println("[testServerEventsInPeerSystem] assert server detected peer crashed");
assertArrayFalse(firedSystemDuplicate);
// TODO: sometimes get adapter duplicate since memberId isn't endpoint
// initial impl uses Endpoint.toString() for memberId of server; final
@@ -1775,8 +1780,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
UniversalMembershipListenerAdapter adapter = new UniversalMembershipListenerAdapter() {
@Override
public synchronized void memberJoined(MembershipEvent event) {
- getLogWriter()
- .info("[testServerEventsInLonerClient] memberJoined >" + event.getMemberId() + "<");
+ System.out
+ .println("[testServerEventsInLonerClient] memberJoined >" + event.getMemberId() + "<");
firedAdapterDuplicate[JOINED] = firedAdapter[JOINED];
firedAdapter[JOINED] = true;
memberAdapter[JOINED] = event.getDistributedMember();
@@ -1790,8 +1795,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
@Override
public synchronized void memberLeft(MembershipEvent event) {
- getLogWriter()
- .info("[testServerEventsInLonerClient] memberLeft >" + event.getMemberId() + "<");
+ System.out
+ .println("[testServerEventsInLonerClient] memberLeft >" + event.getMemberId() + "<");
firedAdapterDuplicate[LEFT] = firedAdapter[LEFT];
firedAdapter[LEFT] = true;
memberAdapter[LEFT] = event.getDistributedMember();
@@ -1805,8 +1810,8 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
@Override
public synchronized void memberCrashed(MembershipEvent event) {
- getLogWriter()
- .info("[testServerEventsInLonerClient] memberCrashed >" + event.getMemberId() + "<");
+ System.out
+ .println("[testServerEventsInLonerClient] memberCrashed >" + event.getMemberId() + "<");
firedAdapterDuplicate[CRASHED] = firedAdapter[CRASHED];
firedAdapter[CRASHED] = true;
memberAdapter[CRASHED] = event.getDistributedMember();
@@ -1854,14 +1859,15 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
final int[] ports = new int[] {AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET)};
assertTrue(ports[0] != 0);
- getLogWriter().info("[testServerEventsInLonerClient] create loner bridge client");
+ System.out.println("[testServerEventsInLonerClient] create loner bridge client");
Properties config = new Properties();
- config.setProperty(MCAST_PORT, "0");
- config.setProperty(LOCATORS, "");
+ config.put(MCAST_PORT, "0");
+ config.put(LOCATORS, "");
+ // config.put(LOG_LEVEL, "fine");
// config.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "false");
getSystem(config);
- getLogWriter().info("[testServerEventsInLonerClient] create system bridge client");
+ System.out.println("[testServerEventsInLonerClient] create system bridge client");
getSystem();
// register the bridge listener
@@ -1876,7 +1882,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
SerializableCallable createBridgeServer = new SerializableCallable("Create BridgeServer") {
@Override
public Object call() {
- getLogWriter().info("[testServerEventsInLonerClient] Create BridgeServer");
+ System.out.println("[testServerEventsInLonerClient] Create BridgeServer");
getSystem();
AttributesFactory factory = new AttributesFactory();
factory.setScope(Scope.LOCAL);
@@ -1900,9 +1906,9 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
assertEquals(ports[0], (int) vm0.invoke("getServerPort",
() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port()));
- getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
- getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
- getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
+ System.out.println("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
+ System.out.println("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
+ System.out.println("[testServerEventsInLonerClient] serverMember=" + serverMember);
// create region which connects to bridge server
AttributesFactory factory = new AttributesFactory();
@@ -1912,18 +1918,20 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
createRegion(name, factory.create());
assertNotNull(getRootRegion().getSubregion(name));
- synchronized (adapter) {
- if (!firedAdapter[JOINED]) {
- adapter.wait(ASYNC_EVENT_WAIT_MILLIS);
- }
- }
- synchronized (bridgeListener) {
- if (!firedBridge[JOINED]) {
- bridgeListener.wait(ASYNC_EVENT_WAIT_MILLIS);
- }
- }
-
- getLogWriter().info("[testServerEventsInLonerClient] assert client detected server join");
+ Awaitility.await("wait for join").atMost(ASYNC_EVENT_WAIT_MILLIS, TimeUnit.MILLISECONDS)
+ .until(() -> {
+ synchronized (adapter) {
+ return firedAdapter[JOINED];
+ }
+ });
+ Awaitility.await("wait for join").atMost(ASYNC_EVENT_WAIT_MILLIS, TimeUnit.MILLISECONDS)
+ .until(() -> {
+ synchronized (bridgeListener) {
+ return firedBridge[JOINED];
+ }
+ });
+
+ System.out.println("[testServerEventsInLonerClient] assert client detected server join");
// TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK
// initial impl uses Endpoint.toString() for memberId of server; final
// impl should have server send its real memberId to client via HandShake
@@ -1933,8 +1941,6 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
assertArrayFalse(firedBridgeDuplicate);
assertTrue(firedBridge[JOINED]);
- assertEquals(serverMember, memberBridge[JOINED]);
- assertEquals(serverMemberId, memberIdBridge[JOINED]);
assertNotNull(memberBridge[JOINED]);
assertNotNull(memberIdBridge[JOINED]);
assertFalse(isClientBridge[JOINED]);
@@ -1949,8 +1955,6 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
resetArraysForTesting(firedBridge, memberBridge, memberIdBridge, isClientBridge);
assertTrue(firedAdapter[JOINED]);
- assertEquals(serverMember, memberAdapter[JOINED]);
- assertEquals(serverMemberId, memberIdAdapter[JOINED]);
assertNotNull(memberIdAdapter[JOINED]);
assertFalse(isClientAdapter[JOINED]);
assertFalse(firedAdapter[LEFT]);
@@ -1963,7 +1967,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
assertFalse(isClientAdapter[CRASHED]);
resetArraysForTesting(firedAdapter, memberAdapter, memberIdAdapter, isClientAdapter);
- getLogWriter().info("[testServerEventsInLonerClient] wait for client to fully connect");
+ System.out.println("[testServerEventsInLonerClient] wait for client to fully connect");
final String pl = getRootRegion().getSubregion(name).getAttributes().getPoolName();
PoolImpl pi = (PoolImpl) PoolManager.find(pl);
waitForClientToFullyConnect(pi);
@@ -1988,22 +1992,24 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
try {
vm0.invoke(new SerializableRunnable("Disconnect bridge server") {
public void run() {
- getLogWriter().info("[testServerEventsInLonerClient] disconnect bridge server");
+ System.out.println("[testServerEventsInLonerClient] disconnect bridge server");
closeCache();
}
});
- synchronized (adapter) {
- if (!firedAdapter[LEFT]) {
- adapter.wait(ASYNC_EVENT_WAIT_MILLIS);
- }
- }
+ Awaitility.await("wait for server to leave")
+ .atMost(ASYNC_EVENT_WAIT_MILLIS, TimeUnit.MILLISECONDS).until(() -> {
+ synchronized (adapter) {
+ return firedAdapter[LEFT] || firedAdapter[CRASHED];
+ }
+ });
+ Awaitility.await("wait for server to leave")
+ .atMost(ASYNC_EVENT_WAIT_MILLIS, TimeUnit.MILLISECONDS).until(() -> {
+ synchronized (bridgeListener) {
+ return firedBridge[LEFT] || firedBridge[CRASHED];
+ }
+ });
- synchronized (bridgeListener) {
- if (!firedBridge[LEFT] && !firedBridge[CRASHED]) {
- bridgeListener.wait(ASYNC_EVENT_WAIT_MILLIS);
- }
- }
} finally {
// bgexecLogger.info(removeExpected);
// bgexecLogger.info(removeExpected2);
@@ -2011,7 +2017,7 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
lw.info(removeExpected2);
}
- getLogWriter().info("[testServerEventsInLonerClient] assert client detected server crashed");
+ System.out.println("[testServerEventsInLonerClient] assert client detected server crashed");
// TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK
// initial impl uses Endpoint.toString() for memberId of server; final
// impl should have server send its real memberId to client via HandShake
@@ -2033,8 +2039,6 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
assertTrue(firedBridge[CRASHED]);
assertNotNull(memberBridge[CRASHED]);
assertNotNull(memberIdBridge[CRASHED]);
- assertEquals(serverMember, memberAdapter[CRASHED]);
- assertEquals(serverMemberId, memberIdAdapter[CRASHED]);
assertFalse(isClientBridge[CRASHED]);
resetArraysForTesting(firedBridge, memberBridge, memberIdBridge, isClientBridge);
@@ -2051,8 +2055,6 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
assertTrue(firedAdapter[CRASHED]);
assertNotNull(memberAdapter[CRASHED]);
assertNotNull(memberIdAdapter[CRASHED]);
- assertEquals(serverMember, memberAdapter[CRASHED]);
- assertEquals(serverMemberId, memberIdAdapter[CRASHED]);
assertFalse(isClientAdapter[CRASHED]);
resetArraysForTesting(firedAdapter, memberAdapter, memberIdAdapter, isClientAdapter);
@@ -2063,25 +2065,27 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
// gather details for later creation of pool...
assertEquals(ports[0], (int) vm0.invoke(
() -> UniversalMembershipListenerAdapterDUnitTest.getTestServerEventsInLonerClient_port()));
- serverMember = (DistributedMember) vm0
- .invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember());
-
- getLogWriter().info("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
- getLogWriter().info("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
- getLogWriter().info("[testServerEventsInLonerClient] serverMember=" + serverMember);
-
- synchronized (adapter) {
- if (!firedAdapter[JOINED]) {
- adapter.wait(ASYNC_EVENT_WAIT_MILLIS);
- }
- }
- synchronized (bridgeListener) {
- if (!firedBridge[JOINED]) {
- bridgeListener.wait(ASYNC_EVENT_WAIT_MILLIS);
- }
- }
-
- getLogWriter().info("[testServerEventsInLonerClient] assert client detected server re-join");
+ serverMember =
+ vm0.invoke(() -> UniversalMembershipListenerAdapterDUnitTest.getDistributedMember());
+
+ System.out.println("[testServerEventsInLonerClient] ports[0]=" + ports[0]);
+ System.out.println("[testServerEventsInLonerClient] serverMemberId=" + serverMemberId);
+ System.out.println("[testServerEventsInLonerClient] serverMember=" + serverMember);
+
+ Awaitility.await("wait for join").atMost(ASYNC_EVENT_WAIT_MILLIS, TimeUnit.MILLISECONDS)
+ .until(() -> {
+ synchronized (adapter) {
+ return firedAdapter[JOINED];
+ }
+ });
+ Awaitility.await("wait for join").atMost(ASYNC_EVENT_WAIT_MILLIS, TimeUnit.MILLISECONDS)
+ .until(() -> {
+ synchronized (bridgeListener) {
+ return firedBridge[JOINED];
+ }
+ });
+
+ System.out.println("[testServerEventsInLonerClient] assert client detected server re-join");
// TODO: sometimes get adapter duplicate since memberId isn't endpoint KIRK
// initial impl uses Endpoint.toString() for memberId of server; final
// impl should have server send its real memberId to client via HandShake
@@ -2093,8 +2097,6 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
assertTrue(firedBridge[JOINED]);
assertNotNull(memberBridge[JOINED]);
assertNotNull(memberIdBridge[JOINED]);
- assertEquals(serverMember, memberBridge[JOINED]);
- assertEquals(serverMemberId, memberIdBridge[JOINED]);
assertFalse(isClientBridge[JOINED]);
assertFalse(firedBridge[LEFT]);
assertNull(memberBridge[LEFT]);
@@ -2107,8 +2109,6 @@ public class UniversalMembershipListenerAdapterDUnitTest extends ClientServerTes
resetArraysForTesting(firedBridge, memberBridge, memberIdBridge, isClientBridge);
assertTrue(firedAdapter[JOINED]);
- assertEquals(serverMember, memberAdapter[JOINED]);
- assertEquals(serverMemberId, memberIdAdapter[JOINED]);
assertNotNull(memberAdapter[JOINED]);
assertNotNull(memberIdAdapter[JOINED]);
assertFalse(isClientAdapter[JOINED]);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
index aaf3e28..93195c1 100644
--- a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
+++ b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
@@ -68,11 +68,7 @@ public class Fakes {
Statistics stats = mock(Statistics.class);
InternalDistributedMember member;
- try {
- member = new InternalDistributedMember("localhost", 5555);
- } catch (UnknownHostException e) {
- throw new RuntimeException(e);
- }
+ member = new InternalDistributedMember("localhost", 5555);
when(config.getCacheXmlFile()).thenReturn(new File(""));
when(config.getDeployWorkingDir()).thenReturn(new File("."));
[22/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
index 6b313e2..a89d390 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -35,19 +33,15 @@ import java.util.*;
import static org.apache.geode.distributed.ConfigurationProperties.*;
/**
- * An implementation of the configuration object for an
- * <code>AdminDistributedSystem</code>. After a config has been used
- * to create an <code>AdminDistributedSystem</code> most of the
- * configuration attributes cannot be changed. However, some
- * operations (such as getting information about GemFire managers and
- * distribution locators) are "passed through" to the
- * <code>AdminDistributedSystem</code> associated with this
- * configuration object.
+ * An implementation of the configuration object for an <code>AdminDistributedSystem</code>. After a
+ * config has been used to create an <code>AdminDistributedSystem</code> most of the configuration
+ * attributes cannot be changed. However, some operations (such as getting information about GemFire
+ * managers and distribution locators) are "passed through" to the
+ * <code>AdminDistributedSystem</code> associated with this configuration object.
*
* @since GemFire 3.5
*/
-public class DistributedSystemConfigImpl
- implements DistributedSystemConfig {
+public class DistributedSystemConfigImpl implements DistributedSystemConfig {
private static final Logger logger = LogService.getLogger();
@@ -86,8 +80,7 @@ public class DistributedSystemConfigImpl
private Set cacheServerConfigs = new HashSet();
/**
- * Configs for the managed distribution locators in the distributed
- * system
+ * Configs for the managed distribution locators in the distributed system
*/
private Set locatorConfigs = new HashSet();
@@ -97,10 +90,10 @@ public class DistributedSystemConfigImpl
private String systemName = DEFAULT_NAME;
/**
- * The admin distributed system object that is configured by this
- * config object.
+ * The admin distributed system object that is configured by this config object.
*
- * @since GemFire 4.0 */
+ * @since GemFire 4.0
+ */
private AdminDistributedSystemImpl system;
/**
@@ -108,27 +101,21 @@ public class DistributedSystemConfigImpl
*/
private InternalLogWriter logWriter;
- /////////////////////// Static Methods ///////////////////////
+ /////////////////////// Static Methods ///////////////////////
/**
- * Filters out all properties that are unique to the admin
- * <code>DistributedSystemConfig</code> that are not present in the
- * internal <code>DistributionConfig</code>.
+ * Filters out all properties that are unique to the admin <code>DistributedSystemConfig</code>
+ * that are not present in the internal <code>DistributionConfig</code>.
*
* @since GemFire 4.0
*/
- private static Properties
- filterOutAdminProperties(Properties props) {
+ private static Properties filterOutAdminProperties(Properties props) {
Properties props2 = new Properties();
- for (Enumeration names = props.propertyNames();
- names.hasMoreElements(); ) {
+ for (Enumeration names = props.propertyNames(); names.hasMoreElements();) {
String name = (String) names.nextElement();
- if (!(ENTITY_CONFIG_XML_FILE_NAME.equals(name) ||
- REFRESH_INTERVAL_NAME.equals(name) ||
- REMOTE_COMMAND_NAME.equals(name)
- )
- ) {
+ if (!(ENTITY_CONFIG_XML_FILE_NAME.equals(name) || REFRESH_INTERVAL_NAME.equals(name)
+ || REMOTE_COMMAND_NAME.equals(name))) {
String value = props.getProperty(name);
if ((name != null) && (value != null)) {
props2.setProperty(name, value);
@@ -139,24 +126,23 @@ public class DistributedSystemConfigImpl
return props2;
}
- //////////////////////// Constructors ////////////////////////
+ //////////////////////// Constructors ////////////////////////
/**
- * Creates a new <code>DistributedSystemConfigImpl</code> based on
- * the configuration stored in a <code>DistributedSystem</code>'s
- * <code>DistributionConfig</code>.
+ * Creates a new <code>DistributedSystemConfigImpl</code> based on the configuration stored in a
+ * <code>DistributedSystem</code>'s <code>DistributionConfig</code>.
*/
- public DistributedSystemConfigImpl(DistributionConfig distConfig,
- String remoteCommand) {
+ public DistributedSystemConfigImpl(DistributionConfig distConfig, String remoteCommand) {
if (distConfig == null) {
- throw new IllegalArgumentException(LocalizedStrings.DistributedSystemConfigImpl_DISTRIBUTIONCONFIG_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.DistributedSystemConfigImpl_DISTRIBUTIONCONFIG_MUST_NOT_BE_NULL
+ .toLocalizedString());
}
this.mcastAddress = InetAddressUtil.toString(distConfig.getMcastAddress());
this.mcastPort = distConfig.getMcastPort();
this.locators = distConfig.getLocators();
- this.membershipPortRange =
- getMembershipPortRangeString(distConfig.getMembershipPortRange());
+ this.membershipPortRange = getMembershipPortRangeString(distConfig.getMembershipPortRange());
this.systemName = distConfig.getName();
@@ -166,8 +152,7 @@ public class DistributedSystemConfigImpl
this.sslAuthenticationRequired = distConfig.getClusterSSLRequireAuthentication();
this.logFile = distConfig.getLogFile().getPath();
- this.logLevel =
- LogWriterImpl.levelToString(distConfig.getLogLevel());
+ this.logLevel = LogWriterImpl.levelToString(distConfig.getLogLevel());
this.logDiskSpaceLimit = distConfig.getLogDiskSpaceLimit();
this.logFileSizeLimit = distConfig.getLogFileSizeLimit();
@@ -194,76 +179,70 @@ public class DistributedSystemConfigImpl
}
/**
- * Creates a new <code>DistributedSystemConifgImpl</code> whose
- * configuration is specified by the given <code>Properties</code>
- * object.
+ * Creates a new <code>DistributedSystemConifgImpl</code> whose configuration is specified by the
+ * given <code>Properties</code> object.
*/
protected DistributedSystemConfigImpl(Properties props) {
this(props, false);
}
/**
- * Creates a new <code>DistributedSystemConifgImpl</code> whose configuration
- * is specified by the given <code>Properties</code> object.
+ * Creates a new <code>DistributedSystemConifgImpl</code> whose configuration is specified by the
+ * given <code>Properties</code> object.
+ *
+ * @param props The configuration properties specified by the caller
+ * @param ignoreGemFirePropsFile whether to skip loading distributed system properties from
+ * gemfire.properties file
*
- * @param props
- * The configuration properties specified by the caller
- * @param ignoreGemFirePropsFile
- * whether to skip loading distributed system properties from
- * gemfire.properties file
- *
* @since GemFire 6.5
*/
- protected DistributedSystemConfigImpl(Properties props,
- boolean ignoreGemFirePropsFile) {
- this(new DistributionConfigImpl(
- filterOutAdminProperties(props), ignoreGemFirePropsFile),
+ protected DistributedSystemConfigImpl(Properties props, boolean ignoreGemFirePropsFile) {
+ this(new DistributionConfigImpl(filterOutAdminProperties(props), ignoreGemFirePropsFile),
DEFAULT_REMOTE_COMMAND);
String remoteCommand = props.getProperty(REMOTE_COMMAND_NAME);
if (remoteCommand != null) {
this.remoteCommand = remoteCommand;
}
- String entityConfigXMLFile =
- props.getProperty(ENTITY_CONFIG_XML_FILE_NAME);
+ String entityConfigXMLFile = props.getProperty(ENTITY_CONFIG_XML_FILE_NAME);
if (entityConfigXMLFile != null) {
this.entityConfigXMLFile = entityConfigXMLFile;
}
- String refreshInterval =
- props.getProperty(REFRESH_INTERVAL_NAME);
+ String refreshInterval = props.getProperty(REFRESH_INTERVAL_NAME);
if (refreshInterval != null) {
try {
this.refreshInterval = Integer.parseInt(refreshInterval);
} catch (NumberFormatException nfEx) {
throw new IllegalArgumentException(
- LocalizedStrings.DistributedSystemConfigImpl_0_IS_NOT_A_VALID_INTEGER_1.toLocalizedString(new Object[] { refreshInterval, REFRESH_INTERVAL_NAME }));
+ LocalizedStrings.DistributedSystemConfigImpl_0_IS_NOT_A_VALID_INTEGER_1
+ .toLocalizedString(new Object[] {refreshInterval, REFRESH_INTERVAL_NAME}));
}
}
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Returns the <code>LogWriterI18n</code> to be used when administering
- * the distributed system. Returns null if nothing has been provided via
- * <code>setInternalLogWriter</code>.
+ * Returns the <code>LogWriterI18n</code> to be used when administering the distributed system.
+ * Returns null if nothing has been provided via <code>setInternalLogWriter</code>.
*
* @since GemFire 4.0
*/
public InternalLogWriter getInternalLogWriter() {
- // LOG: used only for sharing between IDS, AdminDSImpl and AgentImpl -- to prevent multiple banners, etc.
+ // LOG: used only for sharing between IDS, AdminDSImpl and AgentImpl -- to prevent multiple
+ // banners, etc.
synchronized (this) {
return this.logWriter;
}
}
/**
- * Sets the <code>LogWriterI18n</code> to be used when administering the
- * distributed system.
+ * Sets the <code>LogWriterI18n</code> to be used when administering the distributed system.
*/
public void setInternalLogWriter(InternalLogWriter logWriter) {
- // LOG: used only for sharing between IDS, AdminDSImpl and AgentImpl -- to prevent multiple banners, etc.
+ // LOG: used only for sharing between IDS, AdminDSImpl and AgentImpl -- to prevent multiple
+ // banners, etc.
synchronized (this) {
this.logWriter = logWriter;
}
@@ -304,9 +283,8 @@ public class DistributedSystemConfigImpl
}
/**
- * Marks this config object as "read only". Attempts to modify a
- * config object will result in a {@link IllegalStateException}
- * being thrown.
+ * Marks this config object as "read only". Attempts to modify a config object will result in a
+ * {@link IllegalStateException} being thrown.
*
* @since GemFire 4.0
*/
@@ -315,8 +293,8 @@ public class DistributedSystemConfigImpl
}
/**
- * Checks to see if this config object is "read only". If it is,
- * then an {@link IllegalStateException} is thrown.
+ * Checks to see if this config object is "read only". If it is, then an
+ * {@link IllegalStateException} is thrown.
*
* @since GemFire 4.0
*/
@@ -339,8 +317,7 @@ public class DistributedSystemConfigImpl
}
/**
- * Parses the XML configuration file that describes managed
- * entities.
+ * Parses the XML configuration file that describes managed entities.
*
* @throws AdminXmlException If a problem is encountered while parsing the XML file.
*/
@@ -352,7 +329,9 @@ public class DistributedSystemConfigImpl
// Default doesn't exist, no big deal
return;
} else {
- throw new AdminXmlException(LocalizedStrings.DistributedSystemConfigImpl_ENTITY_CONFIGURATION_XML_FILE_0_DOES_NOT_EXIST.toLocalizedString(fileName));
+ throw new AdminXmlException(
+ LocalizedStrings.DistributedSystemConfigImpl_ENTITY_CONFIGURATION_XML_FILE_0_DOES_NOT_EXIST
+ .toLocalizedString(fileName));
}
}
@@ -364,7 +343,9 @@ public class DistributedSystemConfigImpl
is.close();
}
} catch (IOException ex) {
- throw new AdminXmlException(LocalizedStrings.DistributedSystemConfigImpl_WHILE_PARSING_0.toLocalizedString(fileName), ex);
+ throw new AdminXmlException(
+ LocalizedStrings.DistributedSystemConfigImpl_WHILE_PARSING_0.toLocalizedString(fileName),
+ ex);
}
}
@@ -453,16 +434,15 @@ public class DistributedSystemConfigImpl
/**
* Sets the Distributed System property membership-port-range
*
- * @param membershipPortRangeStr the value for membership-port-range given as two numbers separated
- * by a minus sign.
+ * @param membershipPortRangeStr the value for membership-port-range given as two numbers
+ * separated by a minus sign.
*/
public void setMembershipPortRange(String membershipPortRangeStr) {
/*
- * FIXME: Setting attributes in DistributedSystemConfig has no effect on
- * DistributionConfig which is actually used for connection with DS. This is
- * true for all such attributes. Should be addressed in the Admin Revamp if
- * we want these 'set' calls to affect anything. Then we can use the
- * validation code in DistributionConfigImpl code.
+ * FIXME: Setting attributes in DistributedSystemConfig has no effect on DistributionConfig
+ * which is actually used for connection with DS. This is true for all such attributes. Should
+ * be addressed in the Admin Revamp if we want these 'set' calls to affect anything. Then we can
+ * use the validation code in DistributionConfigImpl code.
*/
checkReadOnly();
if (membershipPortRangeStr == null) {
@@ -474,8 +454,8 @@ public class DistributedSystemConfigImpl
} else {
throw new IllegalArgumentException(
LocalizedStrings.DistributedSystemConfigImpl_INVALID_VALUE_FOR_MEMBERSHIP_PORT_RANGE
- .toLocalizedString(new Object[] { membershipPortRangeStr,
- MEMBERSHIP_PORT_RANGE_NAME }));
+ .toLocalizedString(
+ new Object[] {membershipPortRangeStr, MEMBERSHIP_PORT_RANGE_NAME}));
}
} catch (Exception e) {
if (logger.isDebugEnabled()) {
@@ -496,12 +476,12 @@ public class DistributedSystemConfigImpl
}
/**
- * Validates the given string - which is expected in the format as two numbers
- * separated by a minus sign - in to an integer array of length 2 with first
- * element as lower end & second element as upper end of the range.
+ * Validates the given string - which is expected in the format as two numbers separated by a
+ * minus sign - in to an integer array of length 2 with first element as lower end & second
+ * element as upper end of the range.
*
* @param membershipPortRange membership-port-range given as two numbers separated by a minus
- * sign.
+ * sign.
* @return true if the membership-port-range string is valid, false otherwise
*/
private boolean validateMembershipRange(String membershipPortRange) {
@@ -511,10 +491,9 @@ public class DistributedSystemConfigImpl
range = new int[2];
range[0] = Integer.parseInt(splitted[0].trim());
range[1] = Integer.parseInt(splitted[1].trim());
- //NumberFormatException if any could be thrown
+ // NumberFormatException if any could be thrown
- if (range[0] < 0 || range[0] >= range[1] ||
- range[1] < 0 || range[1] > 65535) {
+ if (range[0] < 0 || range[0] >= range[1] || range[1] < 0 || range[1] > 65535) {
range = null;
}
}
@@ -522,15 +501,13 @@ public class DistributedSystemConfigImpl
}
/**
- * @return the String representation of membershipPortRange with lower & upper
- * limits of the port range separated by '-' e.g. 1-65535
+ * @return the String representation of membershipPortRange with lower & upper limits of the port
+ * range separated by '-' e.g. 1-65535
*/
private static String getMembershipPortRangeString(int[] membershipPortRange) {
String membershipPortRangeString = "";
- if (membershipPortRange != null &&
- membershipPortRange.length == 2) {
- membershipPortRangeString = membershipPortRange[0] + "-" +
- membershipPortRange[1];
+ if (membershipPortRange != null && membershipPortRange.length == 2) {
+ membershipPortRangeString = membershipPortRange[0] + "-" + membershipPortRange[1];
}
return membershipPortRangeString;
@@ -598,14 +575,18 @@ public class DistributedSystemConfigImpl
private void basicSetBindAddress(String bindAddress) {
if (!validateBindAddress(bindAddress)) {
- throw new IllegalArgumentException(LocalizedStrings.DistributedSystemConfigImpl_INVALID_BIND_ADDRESS_0.toLocalizedString(bindAddress));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DistributedSystemConfigImpl_INVALID_BIND_ADDRESS_0
+ .toLocalizedString(bindAddress));
}
this.bindAddress = bindAddress;
}
private void basicSetServerBindAddress(String bindAddress) {
if (!validateBindAddress(bindAddress)) {
- throw new IllegalArgumentException(LocalizedStrings.DistributedSystemConfigImpl_INVALID_BIND_ADDRESS_0.toLocalizedString(bindAddress));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DistributedSystemConfigImpl_INVALID_BIND_ADDRESS_0
+ .toLocalizedString(bindAddress));
}
this.serverBindAddress = bindAddress;
}
@@ -618,9 +599,8 @@ public class DistributedSystemConfigImpl
}
/**
- * Sets the remote command for this config object. This attribute
- * may be modified after this config object has been used to create
- * an admin distributed system.
+ * Sets the remote command for this config object. This attribute may be modified after this
+ * config object has been used to create an admin distributed system.
*/
public void setRemoteCommand(String remoteCommand) {
if (!ALLOW_ALL_REMOTE_COMMANDS) {
@@ -630,9 +610,11 @@ public class DistributedSystemConfigImpl
configChanged();
}
- private static final boolean ALLOW_ALL_REMOTE_COMMANDS = Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "admin.ALLOW_ALL_REMOTE_COMMANDS");
- private static final String[] LEGAL_REMOTE_COMMANDS = { "rsh", "ssh" };
- private static final String ILLEGAL_REMOTE_COMMAND_RSH_OR_SSH = "Allowed remote commands include \"rsh {HOST} {CMD}\" or \"ssh {HOST} {CMD}\" with valid rsh or ssh switches. Invalid: ";
+ private static final boolean ALLOW_ALL_REMOTE_COMMANDS =
+ Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "admin.ALLOW_ALL_REMOTE_COMMANDS");
+ private static final String[] LEGAL_REMOTE_COMMANDS = {"rsh", "ssh"};
+ private static final String ILLEGAL_REMOTE_COMMAND_RSH_OR_SSH =
+ "Allowed remote commands include \"rsh {HOST} {CMD}\" or \"ssh {HOST} {CMD}\" with valid rsh or ssh switches. Invalid: ";
private final void checkRemoteCommand(final String remoteCommand) {
if (remoteCommand == null || remoteCommand.isEmpty()) {
@@ -653,7 +635,8 @@ public class DistributedSystemConfigImpl
for (int j = 0; j < LEGAL_REMOTE_COMMANDS.length; j++) {
if (string.contains(LEGAL_REMOTE_COMMANDS[j])) {
// verify command is at end of string
- if (!(string.endsWith(LEGAL_REMOTE_COMMANDS[j]) || string.endsWith(LEGAL_REMOTE_COMMANDS[j] + ".exe"))) {
+ if (!(string.endsWith(LEGAL_REMOTE_COMMANDS[j])
+ || string.endsWith(LEGAL_REMOTE_COMMANDS[j] + ".exe"))) {
throw new IllegalArgumentException(ILLEGAL_REMOTE_COMMAND_RSH_OR_SSH + remoteCommand);
}
found = true;
@@ -666,9 +649,11 @@ public class DistributedSystemConfigImpl
final boolean isSwitch = string.startsWith("-");
final boolean isHostOrCmd = string.equals("{host}") || string.equals("{cmd}");
- // additional elements must be switches or values-for-switches or {host} or user@{host} or {cmd}
+ // additional elements must be switches or values-for-switches or {host} or user@{host} or
+ // {cmd}
if (!isSwitch && !isHostOrCmd) {
- final String previous = (array == null || array.isEmpty()) ? null : array.get(array.size() - 1);
+ final String previous =
+ (array == null || array.isEmpty()) ? null : array.get(array.size() - 1);
final boolean isValueForSwitch = previous != null && previous.startsWith("-");
final boolean isHostWithUser = string.contains("@") && string.endsWith("{host}");
@@ -692,18 +677,18 @@ public class DistributedSystemConfigImpl
}
/**
- * Returns an array of configurations for statically known
- * CacheServers
+ * Returns an array of configurations for statically known CacheServers
*
* @since GemFire 4.0
- */
+ */
public CacheServerConfig[] getCacheServerConfigs() {
- return (CacheServerConfig[]) this.cacheServerConfigs.toArray(
- new CacheServerConfig[this.cacheServerConfigs.size()]);
+ return (CacheServerConfig[]) this.cacheServerConfigs
+ .toArray(new CacheServerConfig[this.cacheServerConfigs.size()]);
}
public CacheVmConfig[] getCacheVmConfigs() {
- return (CacheVmConfig[]) this.cacheServerConfigs.toArray(new CacheVmConfig[this.cacheServerConfigs.size()]);
+ return (CacheVmConfig[]) this.cacheServerConfigs
+ .toArray(new CacheVmConfig[this.cacheServerConfigs.size()]);
}
/**
@@ -731,7 +716,7 @@ public class DistributedSystemConfigImpl
if (managerConfig == null)
return;
- for (Iterator iter = this.cacheServerConfigs.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = this.cacheServerConfigs.iterator(); iter.hasNext();) {
CacheServerConfigImpl impl = (CacheServerConfigImpl) iter.next();
if (impl.equals(managerConfig)) {
return;
@@ -761,18 +746,15 @@ public class DistributedSystemConfigImpl
*/
public DistributionLocatorConfig[] getDistributionLocatorConfigs() {
if (this.system != null) {
- DistributionLocator[] locators =
- this.system.getDistributionLocators();
- DistributionLocatorConfig[] configs =
- new DistributionLocatorConfig[locators.length];
+ DistributionLocator[] locators = this.system.getDistributionLocators();
+ DistributionLocatorConfig[] configs = new DistributionLocatorConfig[locators.length];
for (int i = 0; i < locators.length; i++) {
configs[i] = locators[i].getConfig();
}
return configs;
} else {
- Object[] array =
- new DistributionLocatorConfig[this.locatorConfigs.size()];
+ Object[] array = new DistributionLocatorConfig[this.locatorConfigs.size()];
return (DistributionLocatorConfig[]) this.locatorConfigs.toArray(array);
}
}
@@ -806,9 +788,9 @@ public class DistributedSystemConfigImpl
}
/**
- * Validates the bind address. The address may be a host name or IP address,
- * but it must not be empty and must be usable for creating an InetAddress.
- * Cannot have a leading '/' (which InetAddress.toString() produces).
+ * Validates the bind address. The address may be a host name or IP address, but it must not be
+ * empty and must be usable for creating an InetAddress. Cannot have a leading '/' (which
+ * InetAddress.toString() produces).
*
* @param bindAddress host name or IP address to validate
*/
@@ -823,8 +805,7 @@ public class DistributedSystemConfigImpl
public synchronized void configChanged() {
ConfigListener[] clients = null;
synchronized (this.listeners) {
- clients = (ConfigListener[])
- listeners.toArray(new ConfigListener[this.listeners.size()]);
+ clients = (ConfigListener[]) listeners.toArray(new ConfigListener[this.listeners.size()]);
}
for (int i = 0; i < clients.length; i++) {
try {
@@ -854,16 +835,12 @@ public class DistributedSystemConfigImpl
}
// -------------------------------------------------------------------------
- // SSL support...
+ // SSL support...
// -------------------------------------------------------------------------
- private boolean sslEnabled =
- DistributionConfig.DEFAULT_SSL_ENABLED;
- private String sslProtocols =
- DistributionConfig.DEFAULT_SSL_PROTOCOLS;
- private String sslCiphers =
- DistributionConfig.DEFAULT_SSL_CIPHERS;
- private boolean sslAuthenticationRequired =
- DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION;
+ private boolean sslEnabled = DistributionConfig.DEFAULT_SSL_ENABLED;
+ private String sslProtocols = DistributionConfig.DEFAULT_SSL_PROTOCOLS;
+ private String sslCiphers = DistributionConfig.DEFAULT_SSL_CIPHERS;
+ private boolean sslAuthenticationRequired = DistributionConfig.DEFAULT_SSL_REQUIRE_AUTHENTICATION;
private Properties sslProperties = new Properties();
public boolean isSSLEnabled() {
@@ -996,37 +973,41 @@ public class DistributedSystemConfigImpl
}
/**
- * Makes sure that the mcast port and locators are correct and
- * consistent.
+ * Makes sure that the mcast port and locators are correct and consistent.
*
* @throws IllegalArgumentException If configuration is not valid
*/
public void validate() {
- if (this.getMcastPort() < MIN_MCAST_PORT ||
- this.getMcastPort() > MAX_MCAST_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.DistributedSystemConfigImpl_MCASTPORT_MUST_BE_AN_INTEGER_INCLUSIVELY_BETWEEN_0_AND_1
- .toLocalizedString(new Object[] { Integer.valueOf(MIN_MCAST_PORT), Integer.valueOf(MAX_MCAST_PORT) }));
+ if (this.getMcastPort() < MIN_MCAST_PORT || this.getMcastPort() > MAX_MCAST_PORT) {
+ throw new IllegalArgumentException(
+ LocalizedStrings.DistributedSystemConfigImpl_MCASTPORT_MUST_BE_AN_INTEGER_INCLUSIVELY_BETWEEN_0_AND_1
+ .toLocalizedString(
+ new Object[] {Integer.valueOf(MIN_MCAST_PORT), Integer.valueOf(MAX_MCAST_PORT)}));
}
// disabled in 5.1 - multicast and locators can be used together
- //if (!DEFAULT_LOCATORS.equals(this.getLocators()) &&
- // this.mcastPort > 0) {
- // throw new IllegalArgumentException(
- // "mcastPort must be zero when locators are specified");
- //}
+ // if (!DEFAULT_LOCATORS.equals(this.getLocators()) &&
+ // this.mcastPort > 0) {
+ // throw new IllegalArgumentException(
+ // "mcastPort must be zero when locators are specified");
+ // }
LogWriterImpl.levelNameToCode(this.logLevel);
- if (this.logFileSizeLimit < MIN_LOG_FILE_SIZE_LIMIT ||
- this.logFileSizeLimit > MAX_LOG_FILE_SIZE_LIMIT) {
- throw new IllegalArgumentException(LocalizedStrings.DistributedSystemConfigImpl_LOGFILESIZELIMIT_MUST_BE_AN_INTEGER_BETWEEN_0_AND_1
- .toLocalizedString(new Object[] { Integer.valueOf(MIN_LOG_FILE_SIZE_LIMIT), Integer.valueOf(MAX_LOG_FILE_SIZE_LIMIT) }));
+ if (this.logFileSizeLimit < MIN_LOG_FILE_SIZE_LIMIT
+ || this.logFileSizeLimit > MAX_LOG_FILE_SIZE_LIMIT) {
+ throw new IllegalArgumentException(
+ LocalizedStrings.DistributedSystemConfigImpl_LOGFILESIZELIMIT_MUST_BE_AN_INTEGER_BETWEEN_0_AND_1
+ .toLocalizedString(new Object[] {Integer.valueOf(MIN_LOG_FILE_SIZE_LIMIT),
+ Integer.valueOf(MAX_LOG_FILE_SIZE_LIMIT)}));
}
- if (this.logDiskSpaceLimit < MIN_LOG_DISK_SPACE_LIMIT ||
- this.logDiskSpaceLimit > MAX_LOG_DISK_SPACE_LIMIT) {
- throw new IllegalArgumentException(LocalizedStrings.DistributedSystemConfigImpl_LOGDISKSPACELIMIT_MUST_BE_AN_INTEGER_BETWEEN_0_AND_1
- .toLocalizedString(new Object[] { Integer.valueOf(MIN_LOG_DISK_SPACE_LIMIT), Integer.valueOf(MAX_LOG_DISK_SPACE_LIMIT) }));
+ if (this.logDiskSpaceLimit < MIN_LOG_DISK_SPACE_LIMIT
+ || this.logDiskSpaceLimit > MAX_LOG_DISK_SPACE_LIMIT) {
+ throw new IllegalArgumentException(
+ LocalizedStrings.DistributedSystemConfigImpl_LOGDISKSPACELIMIT_MUST_BE_AN_INTEGER_BETWEEN_0_AND_1
+ .toLocalizedString(new Object[] {Integer.valueOf(MIN_LOG_DISK_SPACE_LIMIT),
+ Integer.valueOf(MAX_LOG_DISK_SPACE_LIMIT)}));
}
parseEntityConfigXMLFile();
@@ -1037,14 +1018,12 @@ public class DistributedSystemConfigImpl
*/
@Override
public Object clone() throws CloneNotSupportedException {
- DistributedSystemConfigImpl other =
- (DistributedSystemConfigImpl) super.clone();
+ DistributedSystemConfigImpl other = (DistributedSystemConfigImpl) super.clone();
other.system = null;
other.cacheServerConfigs = new HashSet();
other.locatorConfigs = new HashSet();
- DistributionLocatorConfig[] myLocators =
- this.getDistributionLocatorConfigs();
+ DistributionLocatorConfig[] myLocators = this.getDistributionLocatorConfigs();
for (int i = 0; i < myLocators.length; i++) {
DistributionLocatorConfig locator = myLocators[i];
other.addDistributionLocatorConfig((DistributionLocatorConfig) locator.clone());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthConfigImpl.java
index b7a2057..41b7f12 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthConfigImpl.java
@@ -1,58 +1,53 @@
/*
- * 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
+ * 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.admin.internal;
import org.apache.geode.admin.*;
/**
- * The implementation of <code>DistributedSystemHealthConfig</code>.
- * Note that because it never leaves the management VM, it is not
- * <code>Serializable</code> and is not part of the {@link
- * GemFireHealthConfigImpl} class hierarchy.
+ * The implementation of <code>DistributedSystemHealthConfig</code>. Note that because it never
+ * leaves the management VM, it is not <code>Serializable</code> and is not part of the
+ * {@link GemFireHealthConfigImpl} class hierarchy.
*
*
* @since GemFire 3.5
*/
-public class DistributedSystemHealthConfigImpl
- implements DistributedSystemHealthConfig {
+public class DistributedSystemHealthConfigImpl implements DistributedSystemHealthConfig {
- /** The maximum number of application members that can
- * unexceptedly leave a healthy the distributed system. */
- private long maxDepartedApplications =
- DEFAULT_MAX_DEPARTED_APPLICATIONS;
+ /**
+ * The maximum number of application members that can unexceptedly leave a healthy the distributed
+ * system.
+ */
+ private long maxDepartedApplications = DEFAULT_MAX_DEPARTED_APPLICATIONS;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
- * Creates a new <code>DistributedSystemHealthConfigImpl</code> with
- * the default configuration.
+ * Creates a new <code>DistributedSystemHealthConfigImpl</code> with the default configuration.
*/
protected DistributedSystemHealthConfigImpl() {
}
- ///////////////////// Instance Methods /////////////////////
+ ///////////////////// Instance Methods /////////////////////
public long getMaxDepartedApplications() {
return this.maxDepartedApplications;
}
- public void setMaxDepartedApplications(long maxDepartedApplications)
- {
+ public void setMaxDepartedApplications(long maxDepartedApplications) {
this.maxDepartedApplications = maxDepartedApplications;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
index 287de7f..a352616 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthEvaluator.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -28,46 +26,43 @@ import java.util.List;
import java.util.Set;
/**
- * Contains the logic for evaluating the health of an entire GemFire
- * distributed system according to the thresholds provided in a {@link
- * DistributedSystemHealthConfig}.
+ * Contains the logic for evaluating the health of an entire GemFire distributed system according to
+ * the thresholds provided in a {@link DistributedSystemHealthConfig}.
*
* <P>
*
- * Note that unlike other evaluators, the
- * <code>DistributedSystemHealthEvaluator</code> resides in the
- * "administrator" VM and not in the member VMs. This is because
- * there only needs to be one
- * <code>DistributedSystemHealthEvaluator</code> per distributed
- * system.
+ * Note that unlike other evaluators, the <code>DistributedSystemHealthEvaluator</code> resides in
+ * the "administrator" VM and not in the member VMs. This is because there only needs to be one
+ * <code>DistributedSystemHealthEvaluator</code> per distributed system.
*
*
* @since GemFire 3.5
- * */
-class DistributedSystemHealthEvaluator
- extends AbstractHealthEvaluator implements MembershipListener {
+ */
+class DistributedSystemHealthEvaluator extends AbstractHealthEvaluator
+ implements MembershipListener {
/** The config from which we get the evaluation criteria */
private DistributedSystemHealthConfig config;
- /** The distribution manager with which this MembershipListener is
- * registered */
+ /**
+ * The distribution manager with which this MembershipListener is registered
+ */
private DM dm;
/** The description of the distributed system being evaluated */
private String description;
- /** The number of application members that have unexpectedly left
- * since the previous evaluation */
+ /**
+ * The number of application members that have unexpectedly left since the previous evaluation
+ */
private int crashedApplications;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
* Creates a new <code>DistributedSystemHealthEvaluator</code>
*/
- DistributedSystemHealthEvaluator(DistributedSystemHealthConfig config,
- DM dm) {
+ DistributedSystemHealthEvaluator(DistributedSystemHealthConfig config, DM dm) {
super(null, dm);
this.config = config;
@@ -79,9 +74,8 @@ class DistributedSystemHealthEvaluator
String desc = null;
if (dm instanceof DistributionManager) {
- desc =
- ((DistributionManager) dm).getDistributionConfigDescription();
- }
+ desc = ((DistributionManager) dm).getDistributionConfigDescription();
+ }
if (desc != null) {
sb.append(desc);
@@ -104,25 +98,27 @@ class DistributedSystemHealthEvaluator
this.description = sb.toString();
}
- //////////////////// Instance Methods ////////////////////
+ //////////////////// Instance Methods ////////////////////
@Override
protected String getDescription() {
return this.description;
}
- /**
- * Checks to make sure that the number of application members of
- * the distributed system that have left unexpected since the last
- * evaluation is less than the {@linkplain
- * DistributedSystemHealthConfig#getMaxDepartedApplications
- * threshold}. If not, the status is "poor" health.
+ /**
+ * Checks to make sure that the number of application members of the distributed system that have
+ * left unexpected since the last evaluation is less than the
+ * {@linkplain DistributedSystemHealthConfig#getMaxDepartedApplications threshold}. If not, the
+ * status is "poor" health.
*/
void checkDepartedApplications(List status) {
synchronized (this) {
long threshold = this.config.getMaxDepartedApplications();
if (this.crashedApplications > threshold) {
- String s = LocalizedStrings.DistributedSystemHealth_THE_NUMBER_OF_APPLICATIONS_THAT_HAVE_LEFT_THE_DISTRIBUTED_SYSTEM_0_EXCEEDS_THE_THRESHOLD_1.toLocalizedString(new Object[] { Long.valueOf(this.crashedApplications), Long.valueOf(threshold)});
+ String s =
+ LocalizedStrings.DistributedSystemHealth_THE_NUMBER_OF_APPLICATIONS_THAT_HAVE_LEFT_THE_DISTRIBUTED_SYSTEM_0_EXCEEDS_THE_THRESHOLD_1
+ .toLocalizedString(
+ new Object[] {Long.valueOf(this.crashedApplications), Long.valueOf(threshold)});
status.add(poorHealth(s));
}
this.crashedApplications = 0;
@@ -150,23 +146,22 @@ class DistributedSystemHealthEvaluator
if (!crashed)
return;
synchronized (this) {
- int kind = id.getVmKind();
- switch (kind) {
+ int kind = id.getVmKind();
+ switch (kind) {
case DistributionManager.LOCATOR_DM_TYPE:
case DistributionManager.NORMAL_DM_TYPE:
this.crashedApplications++;
break;
default:
break;
- }
+ }
} // synchronized
}
- public void quorumLost(Set<InternalDistributedMember> failures, List<InternalDistributedMember> remaining) {
- }
+ public void quorumLost(Set<InternalDistributedMember> failures,
+ List<InternalDistributedMember> remaining) {}
+
+ public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected,
+ String reason) {}
- public void memberSuspect(InternalDistributedMember id,
- InternalDistributedMember whoSuspected, String reason) {
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
index 652a57c..246f518 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemHealthMonitor.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -51,21 +49,18 @@ import org.apache.geode.internal.logging.LoggingThreadGroup;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- * A thread that monitors the health of the distributed system. It is
- * kind of like a {@link
- * org.apache.geode.distributed.internal.HealthMonitorImpl}. In
- * order to get it to place nice with the rest of the health
- * monitoring APIs, this class pretends that it is a
- * <code>GemFireVM</code>. Kind of hokey, but it beats a bunch of
- * special-case code.
+ * A thread that monitors the health of the distributed system. It is kind of like a
+ * {@link org.apache.geode.distributed.internal.HealthMonitorImpl}. In order to get it to place nice
+ * with the rest of the health monitoring APIs, this class pretends that it is a
+ * <code>GemFireVM</code>. Kind of hokey, but it beats a bunch of special-case code.
*
*
* @since GemFire 3.5
- * */
+ */
class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
private static final Logger logger = LogService.getLogger();
-
+
/** Evaluates the health of the distributed system */
private DistributedSystemHealthEvaluator eval;
@@ -84,52 +79,50 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
/** The health of the distributed system the last time we checked. */
private GemFireHealth.Health prevHealth = GemFireHealth.GOOD_HEALTH;
- /** The most recent <code>OKAY_HEALTH</code> diagnoses of the
- * GemFire system */
+ /**
+ * The most recent <code>OKAY_HEALTH</code> diagnoses of the GemFire system
+ */
private List okayDiagnoses;
- /** The most recent <code>POOR_HEALTH</code> diagnoses of the
- * GemFire system */
+ /**
+ * The most recent <code>POOR_HEALTH</code> diagnoses of the GemFire system
+ */
private List poorDiagnoses;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
- * Creates a new <code>DistributedSystemHealthMonitor</code> that
- * evaluates the health of the distributed system against the given
- * thresholds once every <code>interval</code> seconds.
+ * Creates a new <code>DistributedSystemHealthMonitor</code> that evaluates the health of the
+ * distributed system against the given thresholds once every <code>interval</code> seconds.
*
- * @param eval
- * Used to evaluate the health of the distributed system
- * @param healthImpl
- * Receives callbacks when the health of the distributed
- * system changes
- * @param interval
- * How often the health is checked
+ * @param eval Used to evaluate the health of the distributed system
+ * @param healthImpl Receives callbacks when the health of the distributed system changes
+ * @param interval How often the health is checked
*/
DistributedSystemHealthMonitor(DistributedSystemHealthEvaluator eval,
- GemFireHealthImpl healthImpl,
- int interval) {
+ GemFireHealthImpl healthImpl, int interval) {
this.eval = eval;
this.healthImpl = healthImpl;
this.interval = interval;
this.okayDiagnoses = new ArrayList();
this.poorDiagnoses = new ArrayList();
- ThreadGroup group =
- LoggingThreadGroup.createThreadGroup(LocalizedStrings.DistributedSystemHealthMonitor_HEALTH_MONITORS.toLocalizedString(), logger);
- String name = LocalizedStrings.DistributedSystemHealthMonitor_HEALTH_MONITOR_FOR_0.toLocalizedString(eval.getDescription());
+ ThreadGroup group = LoggingThreadGroup.createThreadGroup(
+ LocalizedStrings.DistributedSystemHealthMonitor_HEALTH_MONITORS.toLocalizedString(),
+ logger);
+ String name = LocalizedStrings.DistributedSystemHealthMonitor_HEALTH_MONITOR_FOR_0
+ .toLocalizedString(eval.getDescription());
this.thread = new Thread(group, this, name);
this.thread.setDaemon(true);
}
/**
- * Does the work of monitoring the health of the distributed
- * system.
+ * Does the work of monitoring the health of the distributed system.
*/
public void run() {
if (logger.isDebugEnabled()) {
- logger.debug("Monitoring health of {} every {} seconds", this.eval.getDescription(), interval);
+ logger.debug("Monitoring health of {} every {} seconds", this.eval.getDescription(),
+ interval);
}
while (!this.stopRequested) {
@@ -143,9 +136,9 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
this.okayDiagnoses.clear();
this.poorDiagnoses.clear();
- for (Iterator iter = status.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = status.iterator(); iter.hasNext();) {
AbstractHealthEvaluator.HealthStatus health =
- (AbstractHealthEvaluator.HealthStatus) iter.next();
+ (AbstractHealthEvaluator.HealthStatus) iter.next();
if (overallHealth == GemFireHealth.GOOD_HEALTH) {
if ((health.getHealthCode() != GemFireHealth.GOOD_HEALTH)) {
overallHealth = health.getHealthCode();
@@ -166,12 +159,12 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
break;
}
}
-
+
if (overallHealth != prevHealth) {
healthImpl.healthChanged(this, overallHealth);
this.prevHealth = overallHealth;
}
-
+
} catch (InterruptedException ex) {
// We're all done
// No need to reset the interrupted flag, since we're going to exit.
@@ -188,7 +181,7 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
/**
* Starts this <code>DistributedSystemHealthMonitor</code>
*/
- void start(){
+ void start() {
this.thread.start();
}
@@ -203,90 +196,103 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
try {
this.thread.join();
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
Thread.currentThread().interrupt();
- logger.warn(LocalizedMessage.create(LocalizedStrings.DistributedSystemHealthMonitor_INTERRUPTED_WHILE_STOPPING_HEALTH_MONITOR_THREAD), ex);
+ logger.warn(
+ LocalizedMessage.create(
+ LocalizedStrings.DistributedSystemHealthMonitor_INTERRUPTED_WHILE_STOPPING_HEALTH_MONITOR_THREAD),
+ ex);
}
}
}
- ////////////////////// GemFireVM Methods //////////////////////
+ ////////////////////// GemFireVM Methods //////////////////////
public java.net.InetAddress getHost() {
try {
return SocketCreator.getLocalHost();
} catch (Exception ex) {
- throw new org.apache.geode.InternalGemFireException(LocalizedStrings.DistributedSystemHealthMonitor_COULD_NOT_GET_LOCALHOST.toLocalizedString());
+ throw new org.apache.geode.InternalGemFireException(
+ LocalizedStrings.DistributedSystemHealthMonitor_COULD_NOT_GET_LOCALHOST
+ .toLocalizedString());
}
}
-
+
public String getName() {
-// return getId().toString();
+ // return getId().toString();
throw new UnsupportedOperationException("Not a real GemFireVM");
}
public java.io.File getWorkingDirectory() {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public java.io.File getGemFireDir() {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
-
+
public java.util.Date getBirthDate() {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public Properties getLicenseInfo(){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public Properties getLicenseInfo() {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public GemFireMemberStatus getSnapshot() {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public RegionSubRegionSnapshot getRegionSnapshot() {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public StatResource[] getStats(String statisticsTypeName){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public StatResource[] getStats(String statisticsTypeName) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public StatResource[] getAllStats(){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public StatResource[] getAllStats() {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
-
- public DLockInfo[] getDistributedLockInfo(){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+
+ public DLockInfo[] getDistributedLockInfo() {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ }
+
+ public void addStatListener(StatListener observer, StatResource observedResource,
+ Stat observedStat) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public void addStatListener(StatListener observer,
- StatResource observedResource,
- Stat observedStat){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public void removeStatListener(StatListener observer) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
-
- public void removeStatListener(StatListener observer){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
- }
- public void addHealthListener(HealthListener observer,
- GemFireHealthConfig cfg){
+ public void addHealthListener(HealthListener observer, GemFireHealthConfig cfg) {
}
-
- public void removeHealthListener(){
+
+ public void removeHealthListener() {
}
- public void resetHealthStatus(){
+ public void resetHealthStatus() {
this.prevHealth = GemFireHealth.GOOD_HEALTH;
}
- public String[] getHealthDiagnosis(GemFireHealth.Health healthCode){
+ public String[] getHealthDiagnosis(GemFireHealth.Health healthCode) {
if (healthCode == GemFireHealth.GOOD_HEALTH) {
return new String[0];
@@ -303,134 +309,153 @@ class DistributedSystemHealthMonitor implements Runnable, GemFireVM {
}
}
- public Config getConfig(){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public Config getConfig() {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public void setConfig(Config cfg){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public void setConfig(Config cfg) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public GfManagerAgent getManagerAgent(){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public GfManagerAgent getManagerAgent() {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
-
- public String[] getSystemLogs(){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+
+ public String[] getSystemLogs() {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public void setInspectionClasspath(String classpath){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public void setInspectionClasspath(String classpath) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
-
- public String getInspectionClasspath(){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+
+ public String getInspectionClasspath() {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
-
- public Region[] getRootRegions(){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+
+ public Region[] getRootRegions() {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public Region getRegion(CacheInfo c, String path) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public Region createVMRootRegion(CacheInfo c, String name,
- RegionAttributes attrs) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public Region createVMRootRegion(CacheInfo c, String name, RegionAttributes attrs) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public Region createSubregion(CacheInfo c, String parentPath,
- String name, RegionAttributes attrs) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public Region createSubregion(CacheInfo c, String parentPath, String name,
+ RegionAttributes attrs) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public void setCacheInspectionMode(int mode) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public int getCacheInspectionMode(){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public int getCacheInspectionMode() {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public void takeRegionSnapshot(String regionName, int snapshotId){
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public void takeRegionSnapshot(String regionName, int snapshotId) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public InternalDistributedMember getId() {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public CacheInfo getCacheInfo() {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public String getVersionInfo() {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public CacheInfo setCacheLockTimeout(CacheInfo c, int v) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public CacheInfo setCacheLockLease(CacheInfo c, int v) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
public CacheInfo setCacheSearchTimeout(CacheInfo c, int v) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public AdminBridgeServer addCacheServer(CacheInfo cache)
- throws AdminException {
+ public AdminBridgeServer addCacheServer(CacheInfo cache) throws AdminException {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public AdminBridgeServer getBridgeInfo(CacheInfo cache,
- int id)
- throws AdminException {
+ public AdminBridgeServer getBridgeInfo(CacheInfo cache, int id) throws AdminException {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public AdminBridgeServer startBridgeServer(CacheInfo cache,
- AdminBridgeServer bridge)
- throws AdminException {
+ public AdminBridgeServer startBridgeServer(CacheInfo cache, AdminBridgeServer bridge)
+ throws AdminException {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
- public AdminBridgeServer stopBridgeServer(CacheInfo cache,
- AdminBridgeServer bridge)
- throws AdminException {
+ public AdminBridgeServer stopBridgeServer(CacheInfo cache, AdminBridgeServer bridge)
+ throws AdminException {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
/**
- * This operation is not supported for this object. Will throw
- * UnsupportedOperationException if invoked.
+ * This operation is not supported for this object. Will throw UnsupportedOperationException if
+ * invoked.
*/
- public void setAlertsManager(StatAlertDefinition[] alertDefs,
- long refreshInterval, boolean setRemotely) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public void setAlertsManager(StatAlertDefinition[] alertDefs, long refreshInterval,
+ boolean setRemotely) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
/**
- * This operation is not supported for this object. Will throw
- * UnsupportedOperationException if invoked.
+ * This operation is not supported for this object. Will throw UnsupportedOperationException if
+ * invoked.
*/
public void setRefreshInterval(long refreshInterval) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
/**
- * This operation is not supported for this object. Will throw
- * UnsupportedOperationException if invoked.
+ * This operation is not supported for this object. Will throw UnsupportedOperationException if
+ * invoked.
*/
- public void updateAlertDefinitions(StatAlertDefinition[] alertDefs,
- int actionCode) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
+ public void updateAlertDefinitions(StatAlertDefinition[] alertDefs, int actionCode) {
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributedSystemHealthMonitor_NOT_A_REAL_GEMFIREVM.toLocalizedString());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
index 1e23a3e..c3cab6f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -27,62 +25,58 @@ import java.util.Properties;
import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
/**
- * Provides an implementation of
- * <code>DistributionLocatorConfig</code>.
+ * Provides an implementation of <code>DistributionLocatorConfig</code>.
*
* @since GemFire 4.0
*/
-public class DistributionLocatorConfigImpl
- extends ManagedEntityConfigImpl
- implements DistributionLocatorConfig {
+public class DistributionLocatorConfigImpl extends ManagedEntityConfigImpl
+ implements DistributionLocatorConfig {
/** The minimum networking port (0) */
public static final int MIN_PORT = 0;
/** The maximum networking port (65535) */
public static final int MAX_PORT = 65535;
-
- ////////////////////// Instance Fields //////////////////////
+
+ ////////////////////// Instance Fields //////////////////////
/** The port on which this locator listens */
private int port;
/** The address to bind to on a multi-homed host */
private String bindAddress;
-
- /** The properties used to configure the DistributionLocator's
- DistributedSystem */
+
+ /**
+ * The properties used to configure the DistributionLocator's DistributedSystem
+ */
private Properties dsProperties;
/** The DistributionLocator that was created with this config */
private DistributionLocator locator;
- ////////////////////// Static Methods //////////////////////
+ ////////////////////// Static Methods //////////////////////
/**
- * Contacts a distribution locator on the given host and port and
- * creates a <code>DistributionLocatorConfig</code> for it.
+ * Contacts a distribution locator on the given host and port and creates a
+ * <code>DistributionLocatorConfig</code> for it.
*
* @see TcpClient#getLocatorInfo
*
* @return <code>null</code> if the locator cannot be contacted
*/
- static DistributionLocatorConfig
- createConfigFor(String host, int port, InetAddress bindAddress) {
+ static DistributionLocatorConfig createConfigFor(String host, int port, InetAddress bindAddress) {
TcpClient client = new TcpClient();
String[] info = null;
if (bindAddress != null) {
info = client.getInfo(bindAddress, port);
- }
- else {
+ } else {
info = client.getInfo(InetAddressUtil.toInetAddress(host), port);
}
if (info == null) {
return null;
}
- DistributionLocatorConfigImpl config =
- new DistributionLocatorConfigImpl();
+ DistributionLocatorConfigImpl config = new DistributionLocatorConfigImpl();
config.setHost(host);
config.setPort(port);
if (bindAddress != null) {
@@ -94,11 +88,10 @@ public class DistributionLocatorConfigImpl
return config;
}
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>DistributionLocatorConfigImpl</code> with the
- * default settings.
+ * Creates a new <code>DistributionLocatorConfigImpl</code> with the default settings.
*/
public DistributionLocatorConfigImpl() {
this.port = 0;
@@ -108,11 +101,10 @@ public class DistributionLocatorConfigImpl
this.dsProperties.setProperty(MCAST_PORT, "0");
}
- ///////////////////// Instance Methods /////////////////////
+ ///////////////////// Instance Methods /////////////////////
/**
- * Sets the locator that was configured with this
- * <Code>DistributionLocatorConfigImpl</code>.
+ * Sets the locator that was configured with this <Code>DistributionLocatorConfigImpl</code>.
*/
void setLocator(DistributionLocator locator) {
this.locator = locator;
@@ -142,11 +134,11 @@ public class DistributionLocatorConfigImpl
this.bindAddress = bindAddress;
configChanged();
}
-
+
public void setDistributedSystemProperties(Properties props) {
this.dsProperties = props;
}
-
+
public Properties getDistributedSystemProperties() {
return this.dsProperties;
}
@@ -156,12 +148,16 @@ public class DistributionLocatorConfigImpl
super.validate();
if (port < MIN_PORT || port > MAX_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.DistributionLocatorConfigImpl_PORT_0_MUST_BE_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {Integer.valueOf(port), Integer.valueOf(MIN_PORT), Integer.valueOf(MAX_PORT)}));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DistributionLocatorConfigImpl_PORT_0_MUST_BE_AN_INTEGER_BETWEEN_1_AND_2
+ .toLocalizedString(new Object[] {Integer.valueOf(port), Integer.valueOf(MIN_PORT),
+ Integer.valueOf(MAX_PORT)}));
}
- if (this.bindAddress != null &&
- InetAddressUtil.validateHost(this.bindAddress) == null) {
- throw new IllegalArgumentException(LocalizedStrings.DistributionLocatorConfigImpl_INVALID_HOST_0.toLocalizedString(this.bindAddress));
+ if (this.bindAddress != null && InetAddressUtil.validateHost(this.bindAddress) == null) {
+ throw new IllegalArgumentException(
+ LocalizedStrings.DistributionLocatorConfigImpl_INVALID_HOST_0
+ .toLocalizedString(this.bindAddress));
}
}
@@ -175,8 +171,7 @@ public class DistributionLocatorConfigImpl
@Override
public Object clone() throws CloneNotSupportedException {
- DistributionLocatorConfigImpl clone =
- (DistributionLocatorConfigImpl) super.clone();
+ DistributionLocatorConfigImpl clone = (DistributionLocatorConfigImpl) super.clone();
clone.locator = null;
return clone;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
index d8ad205..c1bfc93 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -37,10 +35,9 @@ import java.util.*;
/**
* Default administrative implementation of a DistributionLocator.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
-public class DistributionLocatorImpl
- implements DistributionLocator, InternalManagedEntity {
+public class DistributionLocatorImpl implements DistributionLocator, InternalManagedEntity {
private static final Logger logger = LogService.getLogger();
@@ -49,7 +46,7 @@ public class DistributionLocatorImpl
*/
private static int newLocators = 0;
- //////////////////// Instance Fields ////////////////////
+ //////////////////// Instance Fields ////////////////////
/**
* The configuration object for this locator
@@ -72,12 +69,12 @@ public class DistributionLocatorImpl
private AdminDistributedSystemImpl system;
// -------------------------------------------------------------------------
- // constructor(s)...
+ // constructor(s)...
// -------------------------------------------------------------------------
/**
- * Constructs new instance of <code>DistributionLocatorImpl</code>
- * that is a member of the given distributed system.
+ * Constructs new instance of <code>DistributionLocatorImpl</code> that is a member of the given
+ * distributed system.
*/
public DistributionLocatorImpl(DistributionLocatorConfig config,
AdminDistributedSystemImpl system) {
@@ -90,7 +87,7 @@ public class DistributionLocatorImpl
}
// -------------------------------------------------------------------------
- // Attribute accessors/mutators...
+ // Attribute accessors/mutators...
// -------------------------------------------------------------------------
public String getId() {
@@ -117,26 +114,24 @@ public class DistributionLocatorImpl
}
/**
- * Unfortunately, it doesn't make much sense to maintain the state
- * of a locator. The admin API does not receive notification when
- * the locator actually starts and stops. If we try to guess, we'll
- * just end up with race conditions galore. So, we can't fix bug
- * 32455 for locators.
+ * Unfortunately, it doesn't make much sense to maintain the state of a locator. The admin API
+ * does not receive notification when the locator actually starts and stops. If we try to guess,
+ * we'll just end up with race conditions galore. So, we can't fix bug 32455 for locators.
*/
public int setState(int state) {
- throw new UnsupportedOperationException(LocalizedStrings.DistributionLocatorImpl_CAN_NOT_SET_THE_STATE_OF_A_LOCATOR.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.DistributionLocatorImpl_CAN_NOT_SET_THE_STATE_OF_A_LOCATOR
+ .toLocalizedString());
}
// -------------------------------------------------------------------------
- // Operations...
+ // Operations...
// -------------------------------------------------------------------------
/**
- * Polls to determine whether or not this managed entity has
- * started.
+ * Polls to determine whether or not this managed entity has started.
*/
- public boolean waitToStart(long timeout)
- throws InterruptedException {
+ public boolean waitToStart(long timeout) throws InterruptedException {
if (Thread.interrupted())
throw new InterruptedException();
@@ -151,17 +146,15 @@ public class DistributionLocatorImpl
}
}
- logger.info(LocalizedMessage.create(
- LocalizedStrings.DistributionLocatorImpl_DONE_WAITING_FOR_LOCATOR));
+ logger.info(
+ LocalizedMessage.create(LocalizedStrings.DistributionLocatorImpl_DONE_WAITING_FOR_LOCATOR));
return this.isRunning();
}
/**
- * Polls to determine whether or not this managed entity has
- * stopped.
+ * Polls to determine whether or not this managed entity has stopped.
*/
- public boolean waitToStop(long timeout)
- throws InterruptedException {
+ public boolean waitToStop(long timeout) throws InterruptedException {
if (Thread.interrupted())
throw new InterruptedException();
@@ -195,8 +188,10 @@ public class DistributionLocatorImpl
boolean found = false;
Map<InternalDistributedMember, Collection<String>> hostedLocators = dm.getAllHostedLocators();
- for (Iterator<InternalDistributedMember> memberIter = hostedLocators.keySet().iterator(); memberIter.hasNext(); ) {
- for (Iterator<String> locatorIter = hostedLocators.get(memberIter.next()).iterator(); locatorIter.hasNext(); ) {
+ for (Iterator<InternalDistributedMember> memberIter =
+ hostedLocators.keySet().iterator(); memberIter.hasNext();) {
+ for (Iterator<String> locatorIter =
+ hostedLocators.get(memberIter.next()).iterator(); locatorIter.hasNext();) {
DistributionLocatorId locator = new DistributionLocatorId(locatorIter.next());
found = found || locator.getHost().getHostAddress().equals(host);
found = found || locator.getHost().getHostName().equals(host);
@@ -250,7 +245,7 @@ public class DistributionLocatorImpl
return "DistributionLocator " + getId();
}
- //////////////////////// Command execution ////////////////////////
+ //////////////////////// Command execution ////////////////////////
public ManagedEntityConfig getEntityConfig() {
return this.getConfig();
@@ -281,8 +276,7 @@ public class DistributionLocatorImpl
}
sb.append(" ");
- String sslArgs =
- this.controller.buildSSLArguments(this.system.getConfig());
+ String sslArgs = this.controller.buildSSLArguments(this.system.getConfig());
if (sslArgs != null) {
sb.append(sslArgs);
}
@@ -305,8 +299,7 @@ public class DistributionLocatorImpl
}
sb.append(" ");
- String sslArgs =
- this.controller.buildSSLArguments(this.system.getConfig());
+ String sslArgs = this.controller.buildSSLArguments(this.system.getConfig());
if (sslArgs != null) {
sb.append(sslArgs);
}
[93/98] [abbrv] incubator-geode git commit: GEODE-1983: Swagger is
broken with integrated security
Posted by ds...@apache.org.
GEODE-1983: Swagger is broken with integrated security
* this closes #273
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c4e3b155
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c4e3b155
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c4e3b155
Branch: refs/heads/feature/GEM-983
Commit: c4e3b155351e37f9d9354d837f5b588a5f236bce
Parents: 3ff33be
Author: Kevin Duling <kd...@pivotal.io>
Authored: Wed Oct 26 12:36:46 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri Oct 28 08:36:42 2016 -0700
----------------------------------------------------------------------
.../geode/rest/internal/web/SwaggerVerificationTest.java | 3 +++
.../internal/web/security/RestSecurityConfiguration.java | 11 ++++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4e3b155/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
index 55cc26e..b550e11 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
@@ -17,12 +17,14 @@ package org.apache.geode.rest.internal.web;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.security.templates.SimpleSecurityManager;
import org.apache.geode.test.dunit.rules.ServerStarter;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.http.HttpResponse;
@@ -42,6 +44,7 @@ public class SwaggerVerificationTest {
static Properties properties = new Properties() {
{
setProperty(START_DEV_REST_API, "true");
+ setProperty(SECURITY_MANAGER, SimpleSecurityManager.class.getName());
setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
setProperty(HTTP_SERVICE_PORT, restPort + "");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4e3b155/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
index b9b9477..3aa5622 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
@@ -15,6 +15,8 @@
*/
package org.apache.geode.rest.internal.web.security;
+import org.apache.geode.internal.security.IntegratedSecurityService;
+import org.apache.geode.internal.security.SecurityService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.ComponentScan;
@@ -27,9 +29,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.http.SessionCreationPolicy;
-import org.apache.geode.internal.security.IntegratedSecurityService;
-import org.apache.geode.internal.security.SecurityService;
-
@Configuration
@EnableWebSecurity
@EnableGlobalMethodSecurity(prePostEnabled = true)
@@ -54,8 +53,10 @@ public class RestSecurityConfiguration extends WebSecurityConfigurerAdapter {
protected void configure(HttpSecurity http) throws Exception {
http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
- .authorizeRequests().antMatchers("/ping", "/api-docs/**", "/docs/**").permitAll()
- .anyRequest().authenticated().and().formLogin().and().csrf().disable();
+ .authorizeRequests()
+ .antMatchers("/ping", "/docs/**", "/swagger-ui.html", "/v2/api-docs/**",
+ "/webjars/springfox-swagger-ui/**", "/swagger-resources/**")
+ .permitAll().anyRequest().authenticated().and().formLogin().and().csrf().disable();
if (securityService.isIntegratedSecurity()) {
http.httpBasic();
[51/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
Added Spotless plugin to enforce formatting standards.
Added Google Java Style guide formatter templates, removed existing formatter templates.
Ran './gradlew clean build' for verification
This closes #268
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8bf39571
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8bf39571
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8bf39571
Branch: refs/heads/feature/GEM-983
Commit: 8bf39571471642beaaa36c9626a61a90bd3803c2
Parents: 56917a2
Author: Jared Stewart <js...@pivotal.io>
Authored: Wed Oct 12 15:37:48 2016 -0700
Committer: Mark Bretl <mb...@apache.org>
Committed: Fri Oct 21 13:25:15 2016 -0700
----------------------------------------------------------------------
build.gradle | 12 +-
etc/eclipse-java-google-style.xml | 337 +
etc/eclipseFormatterProfile.xml | 295 -
etc/intellij-java-google-style.xml | 365 +
etc/intellijIdeaCodeStyle.xml | 477 -
.../internal/common/AbstractSessionCache.java | 61 +-
.../session/internal/common/CacheProperty.java | 37 +-
.../common/ClientServerSessionCache.java | 64 +-
.../internal/common/PeerToPeerSessionCache.java | 79 +-
.../session/internal/common/SessionCache.java | 32 +-
.../common/SessionExpirationCacheListener.java | 40 +-
.../session/internal/filter/Constants.java | 22 +-
.../internal/filter/DummySessionManager.java | 37 +-
.../internal/filter/GemfireHttpSession.java | 92 +-
.../filter/GemfireSessionException.java | 28 +-
.../internal/filter/GemfireSessionManager.java | 162 +-
.../internal/filter/ListenerEventType.java | 55 +-
.../session/internal/filter/SessionManager.java | 56 +-
.../AbstractDeltaSessionAttributes.java | 41 +-
.../attributes/AbstractSessionAttributes.java | 57 +-
.../internal/filter/attributes/DeltaEvent.java | 44 +-
.../DeltaQueuedSessionAttributes.java | 60 +-
.../attributes/DeltaSessionAttributes.java | 46 +-
.../attributes/ImmediateSessionAttributes.java | 50 +-
.../attributes/QueuedSessionAttributes.java | 36 +-
.../filter/attributes/SessionAttributes.java | 43 +-
.../filter/util/NamedThreadFactory.java | 41 +-
.../filter/util/ThreadLocalSession.java | 31 +-
.../internal/filter/util/TypeAwareMap.java | 31 +-
.../session/internal/jmx/SessionStatistics.java | 28 +-
.../internal/jmx/SessionStatisticsMXBean.java | 22 +-
.../session/filter/SessionCachingFilter.java | 197 +-
.../modules/session/filter/SessionListener.java | 45 +-
.../modules/session/installer/Installer.java | 86 +-
.../session/installer/JarClassLoader.java | 43 +-
.../session/installer/args/Argument.java | 54 +-
.../session/installer/args/ArgumentHandler.java | 41 +-
.../installer/args/ArgumentProcessor.java | 96 +-
.../session/installer/args/ArgumentValues.java | 72 +-
.../installer/args/URLArgumentHandler.java | 52 +-
.../installer/args/UnknownArgumentHandler.java | 31 +-
.../session/installer/args/UsageException.java | 34 +-
.../session/installer/InstallerJUnitTest.java | 37 +-
.../internal/filter/AbstractListener.java | 34 +-
.../session/internal/filter/BasicServlet.java | 29 +-
.../session/internal/filter/Callback.java | 25 +-
.../internal/filter/CallbackServlet.java | 49 +-
.../session/internal/filter/CommonTests.java | 84 +-
.../HttpSessionAttributeListenerImpl.java | 28 +-
.../filter/HttpSessionBindingListenerImpl.java | 32 +-
.../filter/HttpSessionListenerImpl.java | 34 +-
.../filter/HttpSessionListenerImpl2.java | 34 +-
.../internal/filter/MyServletTester.java | 37 +-
.../internal/filter/RendezvousManager.java | 28 +-
.../ServletRequestAttributeListenerImpl.java | 31 +-
.../filter/ServletRequestListenerImpl.java | 31 +-
.../SessionReplicationIntegrationJUnitTest.java | 450 +-
.../filter/SessionReplicationJUnitTest.java | 28 +-
.../SessionReplicationLocalCacheJUnitTest.java | 28 +-
.../session/junit/ChildFirstClassLoader.java | 36 +-
.../modules/session/junit/NamedRunner.java | 42 +-
.../session/junit/PerTestClassLoaderRunner.java | 80 +-
.../modules/session/catalina/DeltaSession7.java | 102 +-
.../catalina/Tomcat7DeltaSessionManager.java | 44 +-
.../session/Tomcat7SessionsJUnitTest.java | 28 +-
.../modules/session/catalina/DeltaSession8.java | 109 +-
.../catalina/Tomcat8DeltaSessionManager.java | 40 +-
.../geode/modules/session/EmbeddedTomcat8.java | 43 +-
.../session/TestSessionsTomcat8Base.java | 74 +-
.../Tomcat8SessionsClientServerDUnitTest.java | 32 +-
.../session/Tomcat8SessionsDUnitTest.java | 32 +-
.../gatewaydelta/AbstractGatewayDeltaEvent.java | 31 +-
.../modules/gatewaydelta/GatewayDelta.java | 28 +-
.../gatewaydelta/GatewayDeltaCreateEvent.java | 43 +-
.../gatewaydelta/GatewayDeltaDestroyEvent.java | 40 +-
.../modules/gatewaydelta/GatewayDeltaEvent.java | 28 +-
...tewayDeltaEventApplicationCacheListener.java | 41 +-
.../GatewayDeltaForwarderCacheListener.java | 77 +-
.../session/bootstrap/AbstractCache.java | 114 +-
.../session/bootstrap/ClientServerCache.java | 31 +-
.../session/bootstrap/LifecycleTypeAdapter.java | 31 +-
.../session/bootstrap/PeerToPeerCache.java | 31 +-
.../AbstractCacheLifecycleListener.java | 31 +-
.../session/catalina/AbstractSessionCache.java | 42 +-
.../ClientServerCacheLifecycleListener.java | 28 +-
.../catalina/ClientServerSessionCache.java | 47 +-
.../session/catalina/CommitSessionValve.java | 31 +-
.../modules/session/catalina/DeltaSession.java | 110 +-
.../session/catalina/DeltaSessionFacade.java | 28 +-
.../session/catalina/DeltaSessionInterface.java | 40 +-
.../session/catalina/DeltaSessionManager.java | 239 +-
.../session/catalina/JvmRouteBinderValve.java | 54 +-
.../PeerToPeerCacheLifecycleListener.java | 28 +-
.../catalina/PeerToPeerSessionCache.java | 44 +-
.../modules/session/catalina/SessionCache.java | 28 +-
.../session/catalina/SessionManager.java | 28 +-
.../catalina/Tomcat6DeltaSessionManager.java | 44 +-
.../callback/LocalSessionCacheLoader.java | 34 +-
.../callback/LocalSessionCacheWriter.java | 37 +-
.../SessionExpirationCacheListener.java | 43 +-
.../internal/DeltaSessionAttributeEvent.java | 28 +-
.../DeltaSessionAttributeEventBatch.java | 46 +-
.../DeltaSessionDestroyAttributeEvent.java | 38 +-
.../internal/DeltaSessionStatistics.java | 38 +-
.../DeltaSessionUpdateAttributeEvent.java | 41 +-
.../org/apache/geode/modules/util/Banner.java | 28 +-
.../modules/util/BootstrappingFunction.java | 43 +-
.../util/ClassLoaderObjectInputStream.java | 28 +-
.../geode/modules/util/ContextMapper.java | 40 +-
.../modules/util/CreateRegionFunction.java | 58 +-
.../geode/modules/util/DebugCacheListener.java | 35 +-
.../geode/modules/util/ModuleStatistics.java | 40 +-
.../geode/modules/util/RegionConfiguration.java | 73 +-
.../util/RegionConfigurationCacheListener.java | 49 +-
.../apache/geode/modules/util/RegionHelper.java | 130 +-
.../geode/modules/util/RegionSizeFunction.java | 31 +-
.../apache/geode/modules/util/RegionStatus.java | 22 +-
.../modules/util/ResourceManagerValidator.java | 95 +-
.../geode/modules/util/SessionCustomExpiry.java | 43 +-
.../TouchPartitionedRegionEntriesFunction.java | 39 +-
.../TouchReplicatedRegionEntriesFunction.java | 43 +-
.../apache/geode/modules/session/Callback.java | 31 +-
.../geode/modules/session/CommandServlet.java | 31 +-
.../geode/modules/session/EmbeddedTomcat.java | 36 +-
.../geode/modules/session/QueryCommand.java | 22 +-
.../geode/modules/session/TestSessionsBase.java | 74 +-
.../session/Tomcat6SessionsJUnitTest.java | 28 +-
.../org/apache/geode/BundledJarsJUnitTest.java | 72 +-
.../LocatorLauncherAssemblyIntegrationTest.java | 55 +-
.../management/internal/AgentUtilJUnitTest.java | 22 +-
.../LauncherLifecycleCommandsDUnitTest.java | 357 +-
...auncherLifecycleCommandsIntegrationTest.java | 64 +-
.../LauncherLifecycleCommandsJUnitTest.java | 230 +-
.../SharedConfigurationEndToEndDUnitTest.java | 128 +-
.../rest/internal/web/GeodeRestClient.java | 53 +-
.../rest/internal/web/RestFunctionTemplate.java | 22 +-
.../internal/web/RestInterfaceJUnitTest.java | 136 +-
.../web/RestSecurityIntegrationTest.java | 108 +-
.../web/controllers/AddFreeItemToOrders.java | 110 +-
.../rest/internal/web/controllers/Customer.java | 30 +-
.../internal/web/controllers/DateTimeUtils.java | 22 +-
.../rest/internal/web/controllers/Gender.java | 26 +-
.../internal/web/controllers/GetAllEntries.java | 27 +-
.../web/controllers/GetDeliveredOrders.java | 82 +-
.../internal/web/controllers/GetRegions.java | 39 +-
.../web/controllers/GetValueForKey.java | 56 +-
.../rest/internal/web/controllers/Item.java | 30 +-
.../rest/internal/web/controllers/Order.java | 53 +-
.../rest/internal/web/controllers/Person.java | 109 +-
.../web/controllers/PutKeyFunction.java | 31 +-
...stAPIOnRegionFunctionExecutionDUnitTest.java | 112 +-
.../web/controllers/RestAPITestBase.java | 61 +-
.../RestAPIsAndInterOpsDUnitTest.java | 414 +-
...tAPIsOnGroupsFunctionExecutionDUnitTest.java | 62 +-
...APIsOnMembersFunctionExecutionDUnitTest.java | 50 +-
.../RestAPIsQueryAndFEJUnitTest.java | 1803 +--
.../controllers/RestAPIsWithSSLDUnitTest.java | 164 +-
.../internal/web/controllers/RestTestUtils.java | 78 +-
.../apache/geode/annotations/Experimental.java | 59 +-
.../annotations/ExperimentalJUnitTest.java | 92 +-
.../ClassInExperimentalPackage.java | 25 +-
.../experimentalpackage/package-info.java | 25 +-
.../ClassInNonExperimentalPackage.java | 25 +-
.../nonexperimentalpackage/package-info.java | 25 +-
.../internal/ra/GFConnectionFactoryImpl.java | 40 +-
.../geode/internal/ra/GFConnectionImpl.java | 40 +-
.../internal/ra/spi/JCALocalTransaction.java | 99 +-
.../internal/ra/spi/JCAManagedConnection.java | 117 +-
.../ra/spi/JCAManagedConnectionFactory.java | 84 +-
.../ra/spi/JCAManagedConnectionMetaData.java | 49 +-
.../java/org/apache/geode/CancelCriterion.java | 90 +-
.../java/org/apache/geode/CancelException.java | 31 +-
.../org/apache/geode/CanonicalInstantiator.java | 82 +-
.../java/org/apache/geode/CopyException.java | 35 +-
.../main/java/org/apache/geode/CopyHelper.java | 182 +-
.../java/org/apache/geode/DataSerializable.java | 137 +-
.../java/org/apache/geode/DataSerializer.java | 2089 ++--
.../src/main/java/org/apache/geode/Delta.java | 49 +-
.../geode/DeltaSerializationException.java | 29 +-
.../apache/geode/ForcedDisconnectException.java | 33 +-
.../org/apache/geode/GemFireCacheException.java | 36 +-
.../apache/geode/GemFireCheckedException.java | 79 +-
.../apache/geode/GemFireConfigException.java | 32 +-
.../java/org/apache/geode/GemFireException.java | 163 +-
.../org/apache/geode/GemFireIOException.java | 33 +-
.../org/apache/geode/GemFireRethrowable.java | 39 +-
.../geode/IncompatibleSystemException.java | 37 +-
.../java/org/apache/geode/Instantiator.java | 273 +-
.../org/apache/geode/InternalGemFireError.java | 101 +-
.../apache/geode/InternalGemFireException.java | 37 +-
.../org/apache/geode/InvalidDeltaException.java | 45 +-
.../org/apache/geode/InvalidValueException.java | 34 +-
.../apache/geode/InvalidVersionException.java | 22 +-
.../java/org/apache/geode/LicenseException.java | 37 +-
.../main/java/org/apache/geode/LogWriter.java | 568 +-
.../org/apache/geode/NoSystemException.java | 45 +-
.../geode/OutOfOffHeapMemoryException.java | 35 +-
.../apache/geode/SerializationException.java | 28 +-
.../org/apache/geode/StatisticDescriptor.java | 50 +-
.../main/java/org/apache/geode/Statistics.java | 633 +-
.../org/apache/geode/StatisticsFactory.java | 101 +-
.../java/org/apache/geode/StatisticsType.java | 55 +-
.../org/apache/geode/StatisticsTypeFactory.java | 197 +-
.../apache/geode/SystemConnectException.java | 38 +-
.../java/org/apache/geode/SystemFailure.java | 876 +-
.../apache/geode/SystemIsRunningException.java | 38 +-
.../geode/ThreadInterruptedException.java | 29 +-
.../java/org/apache/geode/ToDataException.java | 36 +-
.../apache/geode/UncreatedSystemException.java | 43 +-
.../org/apache/geode/UnmodifiableException.java | 33 +-
.../apache/geode/UnstartedSystemException.java | 45 +-
.../org/apache/geode/admin/AdminConfig.java | 104 +-
.../geode/admin/AdminDistributedSystem.java | 367 +-
.../admin/AdminDistributedSystemFactory.java | 143 +-
.../org/apache/geode/admin/AdminException.java | 88 +-
.../apache/geode/admin/AdminXmlException.java | 35 +-
.../main/java/org/apache/geode/admin/Alert.java | 48 +-
.../java/org/apache/geode/admin/AlertLevel.java | 170 +-
.../org/apache/geode/admin/AlertListener.java | 30 +-
.../org/apache/geode/admin/BackupStatus.java | 42 +-
.../geode/admin/CacheDoesNotExistException.java | 88 +-
.../apache/geode/admin/CacheHealthConfig.java | 117 +-
.../org/apache/geode/admin/CacheServer.java | 30 +-
.../apache/geode/admin/CacheServerConfig.java | 42 +-
.../java/org/apache/geode/admin/CacheVm.java | 40 +-
.../org/apache/geode/admin/CacheVmConfig.java | 46 +-
.../geode/admin/ConfigurationParameter.java | 63 +-
.../geode/admin/DistributedSystemConfig.java | 420 +-
.../admin/DistributedSystemHealthConfig.java | 66 +-
.../apache/geode/admin/DistributionLocator.java | 37 +-
.../geode/admin/DistributionLocatorConfig.java | 80 +-
.../org/apache/geode/admin/GemFireHealth.java | 178 +-
.../apache/geode/admin/GemFireHealthConfig.java | 53 +-
.../apache/geode/admin/GemFireMemberStatus.java | 274 +-
.../org/apache/geode/admin/ManagedEntity.java | 118 +-
.../apache/geode/admin/ManagedEntityConfig.java | 73 +-
.../apache/geode/admin/MemberHealthConfig.java | 123 +-
.../admin/OperationCancelledException.java | 67 +-
.../geode/admin/RegionNotFoundException.java | 42 +-
.../geode/admin/RegionSubRegionSnapshot.java | 75 +-
.../geode/admin/RuntimeAdminException.java | 39 +-
.../java/org/apache/geode/admin/Statistic.java | 43 +-
.../apache/geode/admin/StatisticResource.java | 61 +-
.../org/apache/geode/admin/SystemMember.java | 120 +-
.../geode/admin/SystemMemberBridgeServer.java | 263 +-
.../apache/geode/admin/SystemMemberCache.java | 147 +-
.../geode/admin/SystemMemberCacheEvent.java | 32 +-
.../geode/admin/SystemMemberCacheListener.java | 56 +-
.../geode/admin/SystemMemberCacheServer.java | 268 +-
.../apache/geode/admin/SystemMemberRegion.java | 139 +-
.../geode/admin/SystemMemberRegionEvent.java | 31 +-
.../apache/geode/admin/SystemMemberType.java | 137 +-
.../geode/admin/SystemMembershipEvent.java | 34 +-
.../geode/admin/SystemMembershipListener.java | 62 +-
.../UnmodifiableConfigurationException.java | 89 +-
.../admin/internal/AbstractHealthEvaluator.java | 112 +-
.../internal/AdminDistributedSystemImpl.java | 1566 ++-
.../admin/internal/BackupDataStoreHelper.java | 36 +-
.../admin/internal/BackupDataStoreResult.java | 41 +-
.../geode/admin/internal/BackupStatusImpl.java | 36 +-
.../admin/internal/CacheHealthConfigImpl.java | 52 +-
.../admin/internal/CacheHealthEvaluator.java | 137 +-
.../admin/internal/CacheServerConfigImpl.java | 47 +-
.../geode/admin/internal/CacheServerImpl.java | 73 +-
.../internal/ConfigurationParameterImpl.java | 212 +-
.../ConfigurationParameterListener.java | 32 +-
.../DisabledManagedEntityController.java | 71 +-
.../internal/DistributedSystemConfigImpl.java | 321 +-
.../DistributedSystemHealthConfigImpl.java | 51 +-
.../DistributedSystemHealthEvaluator.java | 97 +-
.../DistributedSystemHealthMonitor.java | 321 +-
.../internal/DistributionLocatorConfigImpl.java | 85 +-
.../admin/internal/DistributionLocatorImpl.java | 81 +-
.../EnabledManagedEntityController.java | 282 +-
.../admin/internal/FinishBackupRequest.java | 78 +-
.../admin/internal/FinishBackupResponse.java | 38 +-
.../admin/internal/FlushToDiskRequest.java | 53 +-
.../admin/internal/FlushToDiskResponse.java | 26 +-
.../admin/internal/GemFireHealthConfigImpl.java | 51 +-
.../admin/internal/GemFireHealthEvaluator.java | 75 +-
.../geode/admin/internal/GemFireHealthImpl.java | 220 +-
.../geode/admin/internal/InetAddressUtil.java | 144 +-
.../admin/internal/InternalManagedEntity.java | 63 +-
.../geode/admin/internal/LogCollator.java | 86 +-
.../admin/internal/ManagedEntityConfigImpl.java | 112 +-
.../admin/internal/ManagedEntityConfigXml.java | 79 +-
.../ManagedEntityConfigXmlGenerator.java | 161 +-
.../internal/ManagedEntityConfigXmlParser.java | 215 +-
.../admin/internal/ManagedEntityController.java | 55 +-
.../ManagedEntityControllerFactory.java | 47 +-
.../admin/internal/ManagedSystemMemberImpl.java | 103 +-
.../admin/internal/MemberHealthConfigImpl.java | 56 +-
.../admin/internal/MemberHealthEvaluator.java | 169 +-
.../admin/internal/PrepareBackupRequest.java | 71 +-
.../admin/internal/PrepareBackupResponse.java | 33 +-
.../geode/admin/internal/StatisticImpl.java | 72 +-
.../admin/internal/StatisticResourceImpl.java | 132 +-
.../internal/SystemMemberBridgeServerImpl.java | 69 +-
.../internal/SystemMemberCacheEventImpl.java | 40 +-
.../SystemMemberCacheEventProcessor.java | 53 +-
.../admin/internal/SystemMemberCacheImpl.java | 137 +-
.../geode/admin/internal/SystemMemberImpl.java | 310 +-
.../internal/SystemMemberRegionEventImpl.java | 44 +-
.../admin/internal/SystemMemberRegionImpl.java | 107 +-
.../internal/SystemMembershipEventImpl.java | 57 +-
.../java/org/apache/geode/admin/jmx/Agent.java | 131 +-
.../org/apache/geode/admin/jmx/AgentConfig.java | 555 +-
.../apache/geode/admin/jmx/AgentFactory.java | 37 +-
.../internal/AdminDistributedSystemJmxImpl.java | 1434 ++-
.../admin/jmx/internal/AgentConfigImpl.java | 741 +-
.../geode/admin/jmx/internal/AgentImpl.java | 728 +-
.../geode/admin/jmx/internal/AgentLauncher.java | 362 +-
.../admin/jmx/internal/CacheServerJmxImpl.java | 461 +-
.../admin/jmx/internal/ConfigAttributeInfo.java | 66 +-
.../internal/ConfigurationParameterJmxImpl.java | 114 +-
.../DistributedSystemHealthConfigJmxImpl.java | 64 +-
.../internal/DistributionLocatorJmxImpl.java | 128 +-
.../admin/jmx/internal/DynamicManagedBean.java | 72 +-
.../internal/GemFireHealthConfigJmxImpl.java | 91 +-
.../jmx/internal/GemFireHealthJmxImpl.java | 109 +-
.../admin/jmx/internal/GenerateMBeanHTML.java | 149 +-
.../geode/admin/jmx/internal/MBeanUtil.java | 521 +-
.../admin/jmx/internal/MX4JModelMBean.java | 2219 ++--
.../jmx/internal/MX4JServerSocketFactory.java | 168 +-
.../geode/admin/jmx/internal/MailManager.java | 94 +-
.../admin/jmx/internal/ManagedResource.java | 51 +-
.../admin/jmx/internal/ManagedResourceType.java | 195 +-
.../jmx/internal/MemberInfoWithStatsMBean.java | 1233 +-
.../admin/jmx/internal/RMIRegistryService.java | 96 +-
.../jmx/internal/RMIRegistryServiceMBean.java | 30 +-
.../jmx/internal/RefreshNotificationType.java | 146 +-
.../jmx/internal/StatAlertNotification.java | 55 +-
.../jmx/internal/StatAlertsAggregator.java | 83 +-
.../jmx/internal/StatisticAttributeInfo.java | 67 +-
.../jmx/internal/StatisticResourceJmxImpl.java | 236 +-
.../SystemMemberBridgeServerJmxImpl.java | 93 +-
.../jmx/internal/SystemMemberCacheJmxImpl.java | 336 +-
.../admin/jmx/internal/SystemMemberJmx.java | 405 +-
.../admin/jmx/internal/SystemMemberJmxImpl.java | 479 +-
.../jmx/internal/SystemMemberRegionJmxImpl.java | 120 +-
.../apache/geode/cache/AttributesFactory.java | 1598 +--
.../apache/geode/cache/AttributesMutator.java | 223 +-
.../main/java/org/apache/geode/cache/Cache.java | 330 +-
.../org/apache/geode/cache/CacheCallback.java | 42 +-
.../geode/cache/CacheClosedException.java | 40 +-
.../java/org/apache/geode/cache/CacheEvent.java | 100 +-
.../org/apache/geode/cache/CacheException.java | 45 +-
.../geode/cache/CacheExistsException.java | 35 +-
.../org/apache/geode/cache/CacheFactory.java | 368 +-
.../org/apache/geode/cache/CacheListener.java | 120 +-
.../org/apache/geode/cache/CacheLoader.java | 76 +-
.../geode/cache/CacheLoaderException.java | 47 +-
.../geode/cache/CacheRuntimeException.java | 46 +-
.../org/apache/geode/cache/CacheStatistics.java | 142 +-
.../geode/cache/CacheTransactionManager.java | 493 +-
.../org/apache/geode/cache/CacheWriter.java | 170 +-
.../geode/cache/CacheWriterException.java | 46 +-
.../apache/geode/cache/CacheXmlException.java | 37 +-
.../org/apache/geode/cache/ClientSession.java | 200 +-
.../geode/cache/CommitConflictException.java | 41 +-
.../cache/CommitDistributionException.java | 75 +-
.../geode/cache/CommitIncompleteException.java | 25 +-
.../org/apache/geode/cache/CustomExpiry.java | 44 +-
.../java/org/apache/geode/cache/DataPolicy.java | 177 +-
.../java/org/apache/geode/cache/Declarable.java | 56 +-
.../apache/geode/cache/DiskAccessException.java | 52 +-
.../java/org/apache/geode/cache/DiskStore.java | 161 +-
.../apache/geode/cache/DiskStoreFactory.java | 195 +-
.../apache/geode/cache/DiskWriteAttributes.java | 76 +-
.../geode/cache/DiskWriteAttributesFactory.java | 222 +-
.../DuplicatePrimaryPartitionException.java | 39 +-
.../geode/cache/DynamicRegionFactory.java | 815 +-
.../geode/cache/DynamicRegionListener.java | 60 +-
.../geode/cache/EntryDestroyedException.java | 55 +-
.../java/org/apache/geode/cache/EntryEvent.java | 143 +-
.../geode/cache/EntryExistsException.java | 28 +-
.../geode/cache/EntryNotFoundException.java | 39 +-
.../geode/cache/EntryNotFoundInRegion.java | 30 +-
.../org/apache/geode/cache/EntryOperation.java | 89 +-
.../org/apache/geode/cache/EvictionAction.java | 103 +-
.../apache/geode/cache/EvictionAlgorithm.java | 151 +-
.../apache/geode/cache/EvictionAttributes.java | 463 +-
.../geode/cache/EvictionAttributesMutator.java | 40 +-
.../apache/geode/cache/ExpirationAction.java | 217 +-
.../geode/cache/ExpirationAttributes.java | 107 +-
.../cache/FailedSynchronizationException.java | 48 +-
.../geode/cache/FixedPartitionAttributes.java | 86 +-
.../geode/cache/FixedPartitionResolver.java | 56 +-
.../cache/GatewayConfigurationException.java | 29 +-
.../apache/geode/cache/GatewayException.java | 48 +-
.../org/apache/geode/cache/GemFireCache.java | 167 +-
.../cache/IncompatibleVersionException.java | 36 +-
.../org/apache/geode/cache/InterestPolicy.java | 118 +-
.../geode/cache/InterestRegistrationEvent.java | 56 +-
.../cache/InterestRegistrationListener.java | 69 +-
.../geode/cache/InterestResultPolicy.java | 46 +-
.../org/apache/geode/cache/LoaderHelper.java | 78 +-
.../java/org/apache/geode/cache/LossAction.java | 124 +-
.../apache/geode/cache/LowMemoryException.java | 32 +-
.../geode/cache/MembershipAttributes.java | 266 +-
.../java/org/apache/geode/cache/MirrorType.java | 227 +-
.../cache/NoQueueServersAvailableException.java | 34 +-
...NoSubscriptionServersAvailableException.java | 40 +-
.../java/org/apache/geode/cache/Operation.java | 827 +-
.../geode/cache/OperationAbortedException.java | 49 +-
.../apache/geode/cache/PartitionAttributes.java | 110 +-
.../geode/cache/PartitionAttributesFactory.java | 363 +-
.../apache/geode/cache/PartitionResolver.java | 85 +-
.../PartitionedRegionDistributionException.java | 32 +-
.../PartitionedRegionStorageException.java | 100 +-
.../java/org/apache/geode/cache/Region.java | 2799 ++---
.../geode/cache/RegionAccessException.java | 93 +-
.../apache/geode/cache/RegionAttributes.java | 334 +-
.../geode/cache/RegionDestroyedException.java | 43 +-
.../cache/RegionDistributionException.java | 102 +-
.../org/apache/geode/cache/RegionEvent.java | 40 +-
.../geode/cache/RegionExistsException.java | 39 +-
.../org/apache/geode/cache/RegionFactory.java | 679 +-
.../geode/cache/RegionMembershipListener.java | 75 +-
.../cache/RegionReinitializedException.java | 46 +-
.../apache/geode/cache/RegionRoleException.java | 51 +-
.../apache/geode/cache/RegionRoleListener.java | 49 +-
.../org/apache/geode/cache/RegionService.java | 129 +-
.../org/apache/geode/cache/RegionShortcut.java | 278 +-
.../geode/cache/RemoteTransactionException.java | 39 +-
.../org/apache/geode/cache/RequiredRoles.java | 97 +-
.../apache/geode/cache/ResourceException.java | 44 +-
.../apache/geode/cache/ResumptionAction.java | 90 +-
.../java/org/apache/geode/cache/RoleEvent.java | 38 +-
.../org/apache/geode/cache/RoleException.java | 56 +-
.../main/java/org/apache/geode/cache/Scope.java | 292 +-
.../geode/cache/SerializedCacheValue.java | 53 +-
.../cache/StatisticsDisabledException.java | 50 +-
.../geode/cache/SubscriptionAttributes.java | 74 +-
.../SynchronizationCommitConflictException.java | 38 +-
.../apache/geode/cache/TimeoutException.java | 49 +-
...TransactionDataNodeHasDepartedException.java | 37 +-
.../TransactionDataNotColocatedException.java | 42 +-
.../TransactionDataRebalancedException.java | 32 +-
.../apache/geode/cache/TransactionEvent.java | 109 +-
.../geode/cache/TransactionException.java | 31 +-
.../org/apache/geode/cache/TransactionId.java | 26 +-
.../cache/TransactionInDoubtException.java | 30 +-
.../apache/geode/cache/TransactionListener.java | 57 +-
.../apache/geode/cache/TransactionWriter.java | 41 +-
.../geode/cache/TransactionWriterException.java | 28 +-
...upportedOperationInTransactionException.java | 32 +-
.../cache/UnsupportedVersionException.java | 26 +-
.../apache/geode/cache/VersionException.java | 30 +-
.../geode/cache/asyncqueue/AsyncEvent.java | 35 +-
.../cache/asyncqueue/AsyncEventListener.java | 87 +-
.../geode/cache/asyncqueue/AsyncEventQueue.java | 149 +-
.../asyncqueue/AsyncEventQueueFactory.java | 154 +-
.../internal/AsyncEventQueueFactoryImpl.java | 180 +-
.../internal/AsyncEventQueueImpl.java | 105 +-
.../internal/AsyncEventQueueStats.java | 262 +-
.../internal/ParallelAsyncEventQueueImpl.java | 207 +-
.../internal/SerialAsyncEventQueueImpl.java | 133 +-
.../client/AllConnectionsInUseException.java | 36 +-
.../apache/geode/cache/client/ClientCache.java | 197 +-
.../geode/cache/client/ClientCacheFactory.java | 516 +-
.../cache/client/ClientNotReadyException.java | 46 +-
.../geode/cache/client/ClientRegionFactory.java | 277 +-
.../cache/client/ClientRegionShortcut.java | 149 +-
.../client/NoAvailableLocatorsException.java | 29 +-
.../client/NoAvailableServersException.java | 29 +-
.../org/apache/geode/cache/client/Pool.java | 181 +-
.../apache/geode/cache/client/PoolFactory.java | 490 +-
.../apache/geode/cache/client/PoolManager.java | 66 +-
.../client/ServerConnectivityException.java | 36 +-
.../cache/client/ServerOperationException.java | 35 +-
.../ServerRefusedConnectionException.java | 34 +-
.../client/SubscriptionNotEnabledException.java | 35 +-
.../geode/cache/client/internal/AbstractOp.java | 185 +-
.../cache/client/internal/AddPDXEnumOp.java | 53 +-
.../cache/client/internal/AddPDXTypeOp.java | 51 +-
.../client/internal/AuthenticateUserOp.java | 142 +-
.../internal/AutoConnectionSourceImpl.java | 269 +-
.../client/internal/CacheServerLoadMessage.java | 51 +-
.../geode/cache/client/internal/ClearOp.java | 62 +-
.../client/internal/ClientMetadataService.java | 520 +-
.../client/internal/ClientPartitionAdvisor.java | 113 +-
.../internal/ClientRegionFactoryImpl.java | 169 +-
.../cache/client/internal/ClientUpdater.java | 30 +-
.../client/internal/CloseConnectionOp.java | 52 +-
.../geode/cache/client/internal/CommitOp.java | 66 +-
.../geode/cache/client/internal/Connection.java | 65 +-
.../client/internal/ConnectionFactory.java | 65 +-
.../client/internal/ConnectionFactoryImpl.java | 254 +-
.../cache/client/internal/ConnectionImpl.java | 141 +-
.../cache/client/internal/ConnectionSource.java | 71 +-
.../cache/client/internal/ConnectionStats.java | 2765 ++--
.../cache/client/internal/ContainsKeyOp.java | 63 +-
.../DataSerializerRecoveryListener.java | 99 +-
.../geode/cache/client/internal/DestroyOp.java | 174 +-
.../cache/client/internal/DestroyRegionOp.java | 62 +-
.../geode/cache/client/internal/Endpoint.java | 48 +-
.../cache/client/internal/EndpointManager.java | 74 +-
.../client/internal/EndpointManagerImpl.java | 226 +-
.../cache/client/internal/ExecutablePool.java | 116 +-
.../client/internal/ExecuteFunctionHelper.java | 29 +-
.../client/internal/ExecuteFunctionNoAckOp.java | 183 +-
.../client/internal/ExecuteFunctionOp.java | 436 +-
.../internal/ExecuteRegionFunctionNoAckOp.java | 180 +-
.../internal/ExecuteRegionFunctionOp.java | 540 +-
.../ExecuteRegionFunctionSingleHopOp.java | 342 +-
.../internal/ExplicitConnectionSourceImpl.java | 185 +-
.../geode/cache/client/internal/GetAllOp.java | 171 +-
.../client/internal/GetClientPRMetaDataOp.java | 68 +-
.../GetClientPartitionAttributesOp.java | 92 +-
.../geode/cache/client/internal/GetEntryOp.java | 37 +-
.../cache/client/internal/GetEventValueOp.java | 41 +-
.../client/internal/GetFunctionAttributeOp.java | 26 +-
.../geode/cache/client/internal/GetOp.java | 141 +-
.../cache/client/internal/GetPDXEnumByIdOp.java | 48 +-
.../cache/client/internal/GetPDXEnumsOp.java | 42 +-
.../client/internal/GetPDXIdForEnumOp.java | 59 +-
.../client/internal/GetPDXIdForTypeOp.java | 56 +-
.../cache/client/internal/GetPDXTypeByIdOp.java | 48 +-
.../cache/client/internal/GetPDXTypesOp.java | 42 +-
.../internal/InstantiatorRecoveryListener.java | 93 +-
.../cache/client/internal/InternalPool.java | 36 +-
.../cache/client/internal/InvalidateOp.java | 102 +-
.../geode/cache/client/internal/KeySetOp.java | 76 +-
.../cache/client/internal/LiveServerPinger.java | 74 +-
.../internal/LocatorDiscoveryCallback.java | 47 +-
.../LocatorDiscoveryCallbackAdapter.java | 32 +-
.../cache/client/internal/MakePrimaryOp.java | 41 +-
.../apache/geode/cache/client/internal/Op.java | 34 +-
.../cache/client/internal/OpExecutorImpl.java | 562 +-
.../internal/PdxRegistryRecoveryListener.java | 54 +-
.../geode/cache/client/internal/PingOp.java | 42 +-
.../geode/cache/client/internal/PoolImpl.java | 840 +-
.../cache/client/internal/PrimaryAckOp.java | 52 +-
.../geode/cache/client/internal/ProxyCache.java | 73 +-
.../client/internal/ProxyCacheCloseOp.java | 47 +-
.../cache/client/internal/ProxyRegion.java | 126 +-
.../geode/cache/client/internal/PutAllOp.java | 296 +-
.../geode/cache/client/internal/PutOp.java | 417 +-
.../geode/cache/client/internal/QueryOp.java | 189 +-
.../client/internal/QueueConnectionImpl.java | 101 +-
.../cache/client/internal/QueueManager.java | 34 +-
.../cache/client/internal/QueueManagerImpl.java | 742 +-
.../geode/cache/client/internal/QueueState.java | 31 +-
.../cache/client/internal/QueueStateImpl.java | 219 +-
.../cache/client/internal/ReadyForEventsOp.java | 48 +-
.../internal/RegisterDataSerializersOp.java | 74 +-
.../internal/RegisterInstantiatorsOp.java | 104 +-
.../client/internal/RegisterInterestListOp.java | 122 +-
.../client/internal/RegisterInterestOp.java | 301 +-
.../internal/RegisterInterestTracker.java | 311 +-
.../cache/client/internal/RemoveAllOp.java | 287 +-
.../geode/cache/client/internal/RollbackOp.java | 38 +-
.../cache/client/internal/ServerBlackList.java | 130 +-
.../cache/client/internal/ServerProxy.java | 39 +-
.../client/internal/ServerRegionDataAccess.java | 72 +-
.../client/internal/ServerRegionProxy.java | 716 +-
.../internal/SingleHopClientExecutor.java | 260 +-
.../internal/SingleHopOperationCallable.java | 50 +-
.../geode/cache/client/internal/SizeOp.java | 58 +-
.../cache/client/internal/TXFailoverOp.java | 46 +-
.../client/internal/TXSynchronizationOp.java | 96 +-
.../internal/UnregisterInterestListOp.java | 57 +-
.../client/internal/UnregisterInterestOp.java | 57 +-
.../cache/client/internal/UserAttributes.java | 28 +-
.../locator/ClientConnectionRequest.java | 39 +-
.../locator/ClientConnectionResponse.java | 36 +-
.../locator/ClientReplacementRequest.java | 41 +-
.../internal/locator/GetAllServersRequest.java | 23 +-
.../internal/locator/GetAllServersResponse.java | 25 +-
.../internal/locator/LocatorListRequest.java | 24 +-
.../internal/locator/LocatorListResponse.java | 39 +-
.../internal/locator/LocatorStatusRequest.java | 23 +-
.../internal/locator/LocatorStatusResponse.java | 79 +-
.../locator/QueueConnectionRequest.java | 50 +-
.../locator/QueueConnectionResponse.java | 42 +-
.../internal/locator/SerializationHelper.java | 85 +-
.../internal/locator/ServerLocationRequest.java | 32 +-
.../locator/ServerLocationResponse.java | 24 +-
.../locator/wan/LocatorMembershipListener.java | 52 +-
.../pooling/ConnectionDestroyedException.java | 31 +-
.../internal/pooling/ConnectionManager.java | 84 +-
.../internal/pooling/ConnectionManagerImpl.java | 995 +-
.../internal/pooling/PooledConnection.java | 133 +-
.../geode/cache/control/RebalanceFactory.java | 56 +-
.../geode/cache/control/RebalanceOperation.java | 43 +-
.../geode/cache/control/RebalanceResults.java | 64 +-
.../geode/cache/control/ResourceManager.java | 209 +-
.../execute/EmptyRegionFunctionException.java | 34 +-
.../apache/geode/cache/execute/Execution.java | 232 +-
.../apache/geode/cache/execute/Function.java | 93 +-
.../geode/cache/execute/FunctionAdapter.java | 30 +-
.../geode/cache/execute/FunctionContext.java | 62 +-
.../geode/cache/execute/FunctionException.java | 59 +-
.../FunctionInvocationTargetException.java | 52 +-
.../geode/cache/execute/FunctionService.java | 281 +-
.../cache/execute/RegionFunctionContext.java | 39 +-
.../geode/cache/execute/ResultCollector.java | 104 +-
.../geode/cache/execute/ResultSender.java | 56 +-
.../internal/FunctionServiceManager.java | 232 +-
.../operations/CloseCQOperationContext.java | 41 +-
.../operations/DestroyOperationContext.java | 39 +-
.../operations/ExecuteCQOperationContext.java | 45 +-
.../ExecuteFunctionOperationContext.java | 37 +-
.../GetDurableCQsOperationContext.java | 32 +-
.../cache/operations/GetOperationContext.java | 52 +-
.../operations/InterestOperationContext.java | 31 +-
.../geode/cache/operations/InterestType.java | 57 +-
.../operations/InvalidateOperationContext.java | 40 +-
.../cache/operations/KeyOperationContext.java | 51 +-
.../operations/KeySetOperationContext.java | 41 +-
.../operations/KeyValueOperationContext.java | 119 +-
.../cache/operations/OperationContext.java | 117 +-
.../operations/PutAllOperationContext.java | 66 +-
.../cache/operations/PutOperationContext.java | 100 +-
.../cache/operations/QueryOperationContext.java | 66 +-
.../operations/RegionClearOperationContext.java | 33 +-
.../RegionCreateOperationContext.java | 33 +-
.../RegionDestroyOperationContext.java | 33 +-
.../operations/RegionOperationContext.java | 42 +-
.../RegisterInterestOperationContext.java | 47 +-
.../operations/RemoveAllOperationContext.java | 36 +-
.../operations/StopCQOperationContext.java | 41 +-
.../UnregisterInterestOperationContext.java | 39 +-
.../internal/GetOperationContextImpl.java | 40 +-
.../operations/internal/UpdateOnlyMap.java | 138 +-
.../cache/partition/PartitionListener.java | 73 +-
.../partition/PartitionListenerAdapter.java | 53 +-
.../cache/partition/PartitionMemberInfo.java | 62 +-
.../PartitionNotAvailableException.java | 40 +-
.../cache/partition/PartitionRebalanceInfo.java | 112 +-
.../cache/partition/PartitionRegionHelper.java | 438 +-
.../cache/partition/PartitionRegionInfo.java | 99 +-
.../ConflictingPersistentDataException.java | 37 +-
.../persistence/PartitionOfflineException.java | 52 +-
.../geode/cache/persistence/PersistentID.java | 41 +-
.../PersistentReplicatesOfflineException.java | 37 +-
.../persistence/RevokeFailedException.java | 29 +-
.../RevokedPersistentDataException.java | 36 +-
.../apache/geode/cache/query/Aggregator.java | 27 +-
.../cache/query/AmbiguousNameException.java | 35 +-
.../apache/geode/cache/query/CqAttributes.java | 49 +-
.../geode/cache/query/CqAttributesFactory.java | 87 +-
.../geode/cache/query/CqAttributesMutator.java | 56 +-
.../geode/cache/query/CqClosedException.java | 37 +-
.../org/apache/geode/cache/query/CqEvent.java | 86 +-
.../apache/geode/cache/query/CqException.java | 41 +-
.../geode/cache/query/CqExistsException.java | 40 +-
.../apache/geode/cache/query/CqListener.java | 62 +-
.../org/apache/geode/cache/query/CqQuery.java | 112 +-
.../org/apache/geode/cache/query/CqResults.java | 31 +-
.../geode/cache/query/CqServiceStatistics.java | 56 +-
.../org/apache/geode/cache/query/CqState.java | 36 +-
.../apache/geode/cache/query/CqStatistics.java | 34 +-
.../geode/cache/query/CqStatusListener.java | 31 +-
.../cache/query/FunctionDomainException.java | 27 +-
.../org/apache/geode/cache/query/Index.java | 86 +-
.../cache/query/IndexCreationException.java | 32 +-
.../geode/cache/query/IndexExistsException.java | 36 +-
.../cache/query/IndexInvalidException.java | 35 +-
.../cache/query/IndexMaintenanceException.java | 57 +-
.../cache/query/IndexNameConflictException.java | 35 +-
.../geode/cache/query/IndexStatistics.java | 52 +-
.../org/apache/geode/cache/query/IndexType.java | 104 +-
.../query/MultiIndexCreationException.java | 46 +-
.../cache/query/NameNotFoundException.java | 35 +-
.../cache/query/NameResolutionException.java | 34 +-
.../query/ParameterCountInvalidException.java | 32 +-
.../org/apache/geode/cache/query/Query.java | 442 +-
.../geode/cache/query/QueryException.java | 50 +-
.../query/QueryExecutionLowMemoryException.java | 53 +-
.../query/QueryExecutionTimeoutException.java | 49 +-
.../cache/query/QueryInvalidException.java | 30 +-
.../query/QueryInvocationTargetException.java | 37 +-
.../apache/geode/cache/query/QueryService.java | 1046 +-
.../geode/cache/query/QueryStatistics.java | 28 +-
.../cache/query/RegionNotFoundException.java | 30 +-
.../apache/geode/cache/query/SelectResults.java | 113 +-
.../org/apache/geode/cache/query/Struct.java | 42 +-
.../cache/query/TypeMismatchException.java | 32 +-
.../query/internal/AbstractCompiledValue.java | 193 +-
.../internal/AbstractGroupOrRangeJunction.java | 451 +-
.../cache/query/internal/AllGroupJunction.java | 160 +-
.../query/internal/AttributeDescriptor.java | 326 +-
.../apache/geode/cache/query/internal/Bag.java | 97 +-
.../internal/CompiledAggregateFunction.java | 147 +-
.../query/internal/CompiledBindArgument.java | 111 +-
.../query/internal/CompiledComparison.java | 751 +-
.../query/internal/CompiledConstruction.java | 51 +-
.../cache/query/internal/CompiledFunction.java | 96 +-
.../query/internal/CompiledGroupBySelect.java | 264 +-
.../geode/cache/query/internal/CompiledID.java | 67 +-
.../geode/cache/query/internal/CompiledIn.java | 854 +-
.../query/internal/CompiledIndexOperation.java | 117 +-
.../query/internal/CompiledIteratorDef.java | 221 +-
.../cache/query/internal/CompiledJunction.java | 820 +-
.../cache/query/internal/CompiledLike.java | 326 +-
.../cache/query/internal/CompiledLiteral.java | 70 +-
.../cache/query/internal/CompiledNegation.java | 59 +-
.../cache/query/internal/CompiledOperation.java | 295 +-
.../cache/query/internal/CompiledPath.java | 133 +-
.../cache/query/internal/CompiledRegion.java | 80 +-
.../cache/query/internal/CompiledSelect.java | 995 +-
.../query/internal/CompiledSortCriterion.java | 124 +-
.../query/internal/CompiledUnaryMinus.java | 152 +-
.../cache/query/internal/CompiledUndefined.java | 243 +-
.../cache/query/internal/CompiledValue.java | 101 +-
.../query/internal/CompositeGroupJunction.java | 321 +-
.../geode/cache/query/internal/CqEntry.java | 55 +-
.../cache/query/internal/CqQueryVsdStats.java | 164 +-
.../geode/cache/query/internal/CqStateImpl.java | 49 +-
.../internal/CumulativeNonDistinctResults.java | 104 +-
.../cache/query/internal/DefaultQuery.java | 574 +-
.../query/internal/DefaultQueryService.java | 743 +-
.../geode/cache/query/internal/DerivedInfo.java | 221 +-
.../cache/query/internal/ExecutionContext.java | 444 +-
.../geode/cache/query/internal/Filter.java | 233 +-
.../geode/cache/query/internal/Functions.java | 310 +-
.../cache/query/internal/GroupJunction.java | 183 +-
.../cache/query/internal/HashingStrategy.java | 37 +-
.../geode/cache/query/internal/IndexInfo.java | 50 +-
.../internal/IndexTrackingQueryObserver.java | 129 +-
.../geode/cache/query/internal/Indexable.java | 40 +-
.../cache/query/internal/LinkedResultSet.java | 47 +-
.../cache/query/internal/LinkedStructSet.java | 88 +-
.../cache/query/internal/MapIndexable.java | 33 +-
.../cache/query/internal/MethodDispatch.java | 381 +-
.../cache/query/internal/NWayMergeResults.java | 139 +-
.../geode/cache/query/internal/Negatable.java | 27 +-
.../geode/cache/query/internal/NullToken.java | 149 +-
.../cache/query/internal/ObjectIntHashMap.java | 1901 ++-
.../cache/query/internal/OrderByComparator.java | 76 +-
.../internal/OrderByComparatorUnmapped.java | 34 +-
.../geode/cache/query/internal/Ordered.java | 37 +-
.../cache/query/internal/OrganizedOperands.java | 58 +-
.../cache/query/internal/PRQueryTraceInfo.java | 54 +-
.../geode/cache/query/internal/PathUtils.java | 238 +-
.../geode/cache/query/internal/PlanInfo.java | 24 +-
.../cache/query/internal/ProxyQueryService.java | 177 +-
.../geode/cache/query/internal/QCompiler.java | 740 +-
.../geode/cache/query/internal/QRegion.java | 207 +-
.../geode/cache/query/internal/QScope.java | 50 +-
.../QueryExecutionCanceledException.java | 56 +-
.../query/internal/QueryExecutionContext.java | 121 +-
.../cache/query/internal/QueryExecutor.java | 35 +-
.../cache/query/internal/QueryMonitor.java | 249 +-
.../cache/query/internal/QueryObserver.java | 321 +-
.../query/internal/QueryObserverAdapter.java | 356 +-
.../query/internal/QueryObserverHolder.java | 59 +-
.../geode/cache/query/internal/QueryUtils.java | 1708 ++-
.../cache/query/internal/RangeJunction.java | 1082 +-
.../geode/cache/query/internal/ResultsBag.java | 72 +-
.../ResultsCollectionCopyOnReadWrapper.java | 66 +-
...ResultsCollectionPdxDeserializerWrapper.java | 48 +-
.../internal/ResultsCollectionWrapper.java | 385 +-
.../geode/cache/query/internal/ResultsSet.java | 87 +-
.../cache/query/internal/RuntimeIterator.java | 260 +-
.../query/internal/SelectResultsComparator.java | 32 +-
.../cache/query/internal/SortedResultSet.java | 42 +-
.../cache/query/internal/SortedResultsBag.java | 83 +-
.../cache/query/internal/SortedStructBag.java | 55 +-
.../cache/query/internal/SortedStructSet.java | 69 +-
.../geode/cache/query/internal/StructBag.java | 216 +-
.../cache/query/internal/StructFields.java | 30 +-
.../geode/cache/query/internal/StructImpl.java | 97 +-
.../geode/cache/query/internal/StructSet.java | 195 +-
.../geode/cache/query/internal/Support.java | 143 +-
.../geode/cache/query/internal/Undefined.java | 45 +-
.../internal/aggregate/AbstractAggregator.java | 22 +-
.../cache/query/internal/aggregate/Avg.java | 22 +-
.../query/internal/aggregate/AvgBucketNode.java | 31 +-
.../query/internal/aggregate/AvgDistinct.java | 22 +-
.../aggregate/AvgDistinctPRQueryNode.java | 27 +-
.../internal/aggregate/AvgPRQueryNode.java | 32 +-
.../cache/query/internal/aggregate/Count.java | 25 +-
.../query/internal/aggregate/CountDistinct.java | 22 +-
.../aggregate/CountDistinctPRQueryNode.java | 25 +-
.../internal/aggregate/CountPRQueryNode.java | 22 +-
.../internal/aggregate/DistinctAggregator.java | 26 +-
.../cache/query/internal/aggregate/MaxMin.java | 24 +-
.../cache/query/internal/aggregate/Sum.java | 22 +-
.../query/internal/aggregate/SumDistinct.java | 22 +-
.../aggregate/SumDistinctPRQueryNode.java | 25 +-
.../geode/cache/query/internal/cq/ClientCQ.java | 36 +-
.../query/internal/cq/CqAttributesImpl.java | 119 +-
.../cache/query/internal/cq/CqService.java | 146 +-
.../query/internal/cq/CqServiceProvider.java | 53 +-
.../query/internal/cq/InternalCqQuery.java | 45 +-
.../query/internal/cq/MissingCqService.java | 94 +-
.../internal/cq/MissingCqServiceStatistics.java | 22 +-
.../geode/cache/query/internal/cq/ServerCQ.java | 45 +-
.../query/internal/cq/spi/CqServiceFactory.java | 26 +-
.../query/internal/index/AbstractIndex.java | 1425 +--
.../query/internal/index/AbstractMapIndex.java | 195 +-
.../internal/index/CompactMapRangeIndex.java | 153 +-
.../query/internal/index/CompactRangeIndex.java | 1078 +-
.../query/internal/index/DummyQRegion.java | 154 +-
.../index/FunctionalIndexCreationHelper.java | 590 +-
.../cache/query/internal/index/HashIndex.java | 739 +-
.../query/internal/index/HashIndexSet.java | 232 +-
.../query/internal/index/IMQException.java | 35 +-
.../internal/index/IndexConcurrentHashSet.java | 57 +-
.../query/internal/index/IndexCreationData.java | 55 +-
.../internal/index/IndexCreationHelper.java | 68 +-
.../cache/query/internal/index/IndexData.java | 57 +-
.../query/internal/index/IndexElemArray.java | 142 +-
.../query/internal/index/IndexManager.java | 962 +-
.../query/internal/index/IndexProtocol.java | 217 +-
.../cache/query/internal/index/IndexStats.java | 274 +-
.../cache/query/internal/index/IndexStore.java | 295 +-
.../cache/query/internal/index/IndexUtils.java | 101 +-
.../index/IndexedExpressionEvaluator.java | 29 +-
.../query/internal/index/MapIndexStore.java | 172 +-
.../query/internal/index/MapRangeIndex.java | 128 +-
.../query/internal/index/MemoryIndexStore.java | 400 +-
.../query/internal/index/PartitionedIndex.java | 356 +-
.../query/internal/index/PrimaryKeyIndex.java | 316 +-
.../index/PrimaryKeyIndexCreationHelper.java | 96 +-
.../cache/query/internal/index/RangeIndex.java | 1567 ++-
.../query/internal/parse/ASTAggregateFunc.java | 54 +-
.../cache/query/internal/parse/ASTAnd.java | 34 +-
.../query/internal/parse/ASTCombination.java | 32 +-
.../query/internal/parse/ASTCompareOp.java | 30 +-
.../query/internal/parse/ASTConstruction.java | 38 +-
.../query/internal/parse/ASTConversionExpr.java | 38 +-
.../cache/query/internal/parse/ASTDummy.java | 30 +-
.../cache/query/internal/parse/ASTGroupBy.java | 36 +-
.../cache/query/internal/parse/ASTHint.java | 28 +-
.../query/internal/parse/ASTHintIdentifier.java | 30 +-
.../query/internal/parse/ASTIdentifier.java | 38 +-
.../cache/query/internal/parse/ASTImport.java | 39 +-
.../geode/cache/query/internal/parse/ASTIn.java | 38 +-
.../query/internal/parse/ASTIteratorDef.java | 63 +-
.../cache/query/internal/parse/ASTLike.java | 37 +-
.../cache/query/internal/parse/ASTLimit.java | 25 +-
.../cache/query/internal/parse/ASTLiteral.java | 160 +-
.../internal/parse/ASTMethodInvocation.java | 52 +-
.../geode/cache/query/internal/parse/ASTOr.java | 31 +-
.../cache/query/internal/parse/ASTOrderBy.java | 36 +-
.../query/internal/parse/ASTParameter.java | 36 +-
.../cache/query/internal/parse/ASTPostfix.java | 52 +-
.../query/internal/parse/ASTProjection.java | 38 +-
.../query/internal/parse/ASTRegionPath.java | 38 +-
.../cache/query/internal/parse/ASTSelect.java | 40 +-
.../query/internal/parse/ASTSortCriterion.java | 31 +-
.../cache/query/internal/parse/ASTTrace.java | 22 +-
.../cache/query/internal/parse/ASTType.java | 51 +-
.../cache/query/internal/parse/ASTTypeCast.java | 38 +-
.../cache/query/internal/parse/ASTUnary.java | 45 +-
.../query/internal/parse/ASTUndefinedExpr.java | 37 +-
.../query/internal/parse/ASTUnsupported.java | 39 +-
.../cache/query/internal/parse/GemFireAST.java | 44 +-
.../cache/query/internal/parse/OQLLexer.java | 5662 +++++----
.../internal/parse/OQLLexerTokenTypes.java | 295 +-
.../cache/query/internal/parse/OQLParser.java | 7421 ++++++-----
.../cache/query/internal/parse/UtilParser.java | 125 +-
.../internal/types/CollectionTypeImpl.java | 94 +-
.../types/ExtendedNumericComparator.java | 31 +-
.../cache/query/internal/types/MapTypeImpl.java | 85 +-
.../query/internal/types/NumericComparator.java | 129 +-
.../query/internal/types/ObjectTypeImpl.java | 74 +-
.../query/internal/types/StructTypeImpl.java | 115 +-
.../internal/types/TemporalComparator.java | 101 +-
.../cache/query/internal/types/TypeUtils.java | 827 +-
.../query/internal/utils/LimitIterator.java | 22 +-
.../cache/query/internal/utils/PDXUtils.java | 39 +-
.../geode/cache/query/types/CollectionType.java | 46 +-
.../apache/geode/cache/query/types/MapType.java | 40 +-
.../geode/cache/query/types/ObjectType.java | 55 +-
.../geode/cache/query/types/StructType.java | 40 +-
.../apache/geode/cache/server/CacheServer.java | 444 +-
.../cache/server/ClientSubscriptionConfig.java | 96 +-
.../apache/geode/cache/server/ServerLoad.java | 91 +-
.../geode/cache/server/ServerLoadProbe.java | 69 +-
.../cache/server/ServerLoadProbeAdapter.java | 36 +-
.../geode/cache/server/ServerMetrics.java | 48 +-
.../server/internal/ConnectionCountProbe.java | 68 +-
.../cache/server/internal/LoadMonitor.java | 121 +-
.../server/internal/ServerMetricsImpl.java | 41 +-
.../cache/snapshot/CacheSnapshotService.java | 110 +-
.../cache/snapshot/RegionSnapshotService.java | 80 +-
.../geode/cache/snapshot/SnapshotFilter.java | 29 +-
.../geode/cache/snapshot/SnapshotIterator.java | 29 +-
.../geode/cache/snapshot/SnapshotOptions.java | 41 +-
.../geode/cache/snapshot/SnapshotReader.java | 34 +-
.../geode/cache/util/CacheListenerAdapter.java | 71 +-
.../geode/cache/util/CacheWriterAdapter.java | 47 +-
.../geode/cache/util/CqListenerAdapter.java | 76 +-
.../org/apache/geode/cache/util/Gateway.java | 40 +-
.../geode/cache/util/GatewayConflictHelper.java | 64 +-
.../cache/util/GatewayConflictResolver.java | 98 +-
.../apache/geode/cache/util/GatewayEvent.java | 39 +-
.../apache/geode/cache/util/ObjectSizer.java | 75 +-
.../geode/cache/util/ObjectSizerImpl.java | 33 +-
.../util/RegionMembershipListenerAdapter.java | 48 +-
.../cache/util/RegionRoleListenerAdapter.java | 40 +-
.../geode/cache/util/TimestampedEntryEvent.java | 78 +-
.../cache/util/TransactionListenerAdapter.java | 40 +-
.../apache/geode/cache/wan/EventSequenceID.java | 55 +-
.../geode/cache/wan/GatewayEventFilter.java | 44 +-
.../wan/GatewayEventSubstitutionFilter.java | 44 +-
.../geode/cache/wan/GatewayQueueEvent.java | 38 +-
.../apache/geode/cache/wan/GatewayReceiver.java | 142 +-
.../geode/cache/wan/GatewayReceiverFactory.java | 101 +-
.../apache/geode/cache/wan/GatewaySender.java | 280 +-
.../geode/cache/wan/GatewaySenderFactory.java | 180 +-
.../geode/cache/wan/GatewayTransportFilter.java | 25 +-
.../geode/compression/CompressionException.java | 25 +-
.../apache/geode/compression/Compressor.java | 24 +-
.../geode/compression/SnappyCompressor.java | 44 +-
.../geode/distributed/AbstractLauncher.java | 309 +-
.../geode/distributed/ClientSocketFactory.java | 35 +-
.../distributed/ConfigurationProperties.java | 2166 ++--
.../distributed/DistributedLockService.java | 446 +-
.../geode/distributed/DistributedMember.java | 64 +-
.../geode/distributed/DistributedSystem.java | 608 +-
.../DistributedSystemDisconnectedException.java | 22 +-
.../distributed/DurableClientAttributes.java | 118 +-
.../distributed/FutureCancelledException.java | 22 +-
.../distributed/GatewayCancelledException.java | 22 +-
.../distributed/LeaseExpiredException.java | 31 +-
.../org/apache/geode/distributed/Locator.java | 538 +-
.../geode/distributed/LocatorLauncher.java | 1127 +-
.../geode/distributed/LockNotHeldException.java | 45 +-
.../LockServiceDestroyedException.java | 45 +-
.../distributed/OplogCancelledException.java | 22 +-
.../distributed/PoolCancelledException.java | 22 +-
.../java/org/apache/geode/distributed/Role.java | 55 +-
.../geode/distributed/ServerLauncher.java | 1329 +-
.../ServerLauncherCacheProvider.java | 27 +-
.../TXManagerCancelledException.java | 22 +-
.../internal/AbstractDistributionConfig.java | 987 +-
.../distributed/internal/AdminMessageType.java | 22 +-
.../internal/AtomicLongWithTerminalState.java | 50 +-
.../geode/distributed/internal/CacheTime.java | 26 +-
.../internal/CollectingReplyProcessor.java | 106 +-
.../distributed/internal/ConfigAttribute.java | 22 +-
.../internal/ConfigAttributeChecker.java | 22 +-
.../internal/ConfigAttributeDesc.java | 22 +-
.../internal/ConfigAttributeGetter.java | 22 +-
.../internal/ConfigAttributeSetter.java | 22 +-
.../distributed/internal/ConflationKey.java | 46 +-
.../apache/geode/distributed/internal/DM.java | 324 +-
.../geode/distributed/internal/DMStats.java | 310 +-
.../geode/distributed/internal/DSClock.java | 622 +-
.../DefaultServerLauncherCacheProvider.java | 25 +-
.../internal/DirectReplyProcessor.java | 122 +-
.../internal/DistributionAdvisee.java | 56 +-
.../internal/DistributionAdvisor.java | 1006 +-
.../internal/DistributionChannel.java | 114 +-
.../internal/DistributionConfig.java | 1797 +--
.../internal/DistributionConfigImpl.java | 1084 +-
.../internal/DistributionConfigSnapshot.java | 46 +-
.../internal/DistributionException.java | 32 +-
.../internal/DistributionManager.java | 2993 ++---
.../internal/DistributionMessage.java | 359 +-
.../internal/DistributionMessageObserver.java | 55 +-
.../distributed/internal/DistributionStats.java | 1384 +-
.../distributed/internal/FlowControlParams.java | 96 +-
.../FunctionExecutionPooledExecutor.java | 248 +-
.../distributed/internal/HealthMonitor.java | 34 +-
.../distributed/internal/HealthMonitorImpl.java | 64 +-
.../internal/HighPriorityAckedMessage.java | 160 +-
.../HighPriorityDistributionMessage.java | 26 +-
.../distributed/internal/IgnoredByManager.java | 27 +-
.../internal/InternalDistributedSystem.java | 808 +-
.../distributed/internal/InternalLocator.java | 440 +-
.../internal/LocatorLoadSnapshot.java | 279 +-
.../distributed/internal/LocatorStats.java | 130 +-
.../internal/LonerDistributionManager.java | 754 +-
.../geode/distributed/internal/MQueue.java | 26 +-
.../internal/MembershipListener.java | 71 +-
.../distributed/internal/MessageFactory.java | 48 +-
.../distributed/internal/MessageWithReply.java | 32 +-
.../internal/OverflowQueueWithDMStats.java | 64 +-
.../distributed/internal/PoolStatHelper.java | 27 +-
.../internal/PooledDistributionMessage.java | 29 +-
.../internal/PooledExecutorWithDMStats.java | 160 +-
.../distributed/internal/ProcessorKeeper21.java | 63 +-
.../distributed/internal/ProductUseLog.java | 291 +-
.../distributed/internal/ProfileListener.java | 44 +-
.../distributed/internal/QueueStatHelper.java | 28 +-
.../internal/ReliableReplyException.java | 28 +-
.../internal/ReliableReplyProcessor21.java | 74 +-
.../distributed/internal/ReplyException.java | 121 +-
.../distributed/internal/ReplyMessage.java | 195 +-
.../distributed/internal/ReplyProcessor21.java | 648 +-
.../geode/distributed/internal/ReplySender.java | 35 +-
.../distributed/internal/ResourceEvent.java | 52 +-
.../internal/ResourceEventsListener.java | 31 +-
.../internal/RuntimeDistributionConfigImpl.java | 79 +-
.../internal/SerialAckedMessage.java | 72 +-
.../internal/SerialDistributionMessage.java | 26 +-
.../SerialQueuedExecutorWithDMStats.java | 37 +-
.../distributed/internal/ServerLocation.java | 61 +-
.../distributed/internal/ServerLocator.java | 275 +-
.../internal/SharedConfiguration.java | 263 +-
.../distributed/internal/ShutdownMessage.java | 78 +-
.../geode/distributed/internal/Sizeable.java | 29 +-
.../distributed/internal/SizeableRunnable.java | 41 +-
.../distributed/internal/StartupMessage.java | 240 +-
.../internal/StartupMessageData.java | 155 +-
.../internal/StartupMessageReplyProcessor.java | 69 +-
.../distributed/internal/StartupOperation.java | 98 +-
.../internal/StartupResponseMessage.java | 176 +-
.../StartupResponseWithVersionMessage.java | 44 +-
.../internal/ThrottledMemQueueStatHelper.java | 36 +-
.../internal/ThrottledQueueStatHelper.java | 28 +-
.../ThrottlingMemLinkedQueueWithDMStats.java | 98 +-
.../internal/WaitForViewInstallation.java | 60 +-
.../internal/WanLocatorDiscoverer.java | 34 +-
.../deadlock/DLockDependencyMonitor.java | 76 +-
.../internal/deadlock/DeadlockDetector.java | 272 +-
.../internal/deadlock/Dependency.java | 48 +-
.../internal/deadlock/DependencyGraph.java | 203 +-
.../internal/deadlock/DependencyMonitor.java | 43 +-
.../deadlock/DependencyMonitorManager.java | 84 +-
.../deadlock/GemFireDeadlockDetector.java | 104 +-
.../internal/deadlock/LocalLockInfo.java | 51 +-
.../internal/deadlock/LocalThread.java | 85 +-
.../deadlock/MessageDependencyMonitor.java | 87 +-
.../internal/deadlock/ThreadReference.java | 22 +-
.../internal/deadlock/UnsafeThreadLocal.java | 52 +-
.../internal/direct/DirectChannel.java | 779 +-
.../internal/direct/DirectChannelListener.java | 75 +-
.../internal/direct/ShunnedMemberException.java | 27 +-
.../internal/locks/Collaboration.java | 283 +-
.../distributed/internal/locks/DLockBatch.java | 37 +-
.../internal/locks/DLockBatchId.java | 24 +-
.../internal/locks/DLockGrantor.java | 2175 ++--
.../locks/DLockLessorDepartureHandler.java | 26 +-
.../internal/locks/DLockQueryProcessor.java | 255 +-
.../locks/DLockRecoverGrantorProcessor.java | 316 +-
.../internal/locks/DLockReleaseProcessor.java | 259 +-
.../internal/locks/DLockRemoteToken.java | 146 +-
.../internal/locks/DLockRequestProcessor.java | 920 +-
.../internal/locks/DLockService.java | 2738 ++--
.../distributed/internal/locks/DLockStats.java | 683 +-
.../distributed/internal/locks/DLockToken.java | 426 +-
.../internal/locks/DeposeGrantorProcessor.java | 148 +-
.../internal/locks/DistributedLockStats.java | 146 +-
.../internal/locks/DistributedMemberLock.java | 132 +-
.../internal/locks/DummyDLockStats.java | 421 +-
.../internal/locks/ElderInitProcessor.java | 207 +-
.../distributed/internal/locks/ElderState.java | 368 +-
.../distributed/internal/locks/GrantorInfo.java | 52 +-
.../internal/locks/GrantorRequestProcessor.java | 559 +-
.../locks/LockGrantorDestroyedException.java | 45 +-
.../internal/locks/LockGrantorId.java | 162 +-
.../locks/NonGrantorDestroyedProcessor.java | 204 +-
.../internal/locks/RemoteThread.java | 59 +-
.../DistributedMembershipListener.java | 64 +-
.../membership/InternalDistributedMember.java | 918 +-
.../internal/membership/InternalRole.java | 189 +-
.../internal/membership/MemberAttributes.java | 60 +-
.../internal/membership/MemberFactory.java | 65 +-
.../internal/membership/MemberServices.java | 50 +-
.../internal/membership/MembershipManager.java | 256 +-
.../internal/membership/MembershipTestHook.java | 27 +-
.../internal/membership/NetMember.java | 56 +-
.../internal/membership/NetView.java | 219 +-
.../internal/membership/QuorumChecker.java | 47 +-
.../internal/membership/gms/GMSMember.java | 197 +-
.../membership/gms/GMSMemberFactory.java | 256 +-
.../internal/membership/gms/GMSUtil.java | 271 +-
.../internal/membership/gms/NetLocator.java | 63 +-
.../internal/membership/gms/ServiceConfig.java | 344 +-
.../internal/membership/gms/Services.java | 796 +-
.../internal/membership/gms/SuspectMember.java | 46 +-
.../membership/gms/auth/GMSAuthenticator.java | 413 +-
.../membership/gms/fd/GMSHealthMonitor.java | 535 +-
.../gms/interfaces/Authenticator.java | 57 +-
.../gms/interfaces/HealthMonitor.java | 127 +-
.../membership/gms/interfaces/JoinLeave.java | 156 +-
.../membership/gms/interfaces/Locator.java | 61 +-
.../membership/gms/interfaces/Manager.java | 238 +-
.../gms/interfaces/MessageHandler.java | 57 +-
.../membership/gms/interfaces/Messenger.java | 255 +-
.../membership/gms/interfaces/Service.java | 163 +-
.../gms/locator/FindCoordinatorRequest.java | 338 +-
.../gms/locator/FindCoordinatorResponse.java | 448 +-
.../membership/gms/locator/GMSLocator.java | 830 +-
.../membership/gms/locator/GetViewRequest.java | 93 +-
.../membership/gms/locator/GetViewResponse.java | 126 +-
.../gms/locator/PeerLocatorRequest.java | 48 +-
.../membership/gms/membership/GMSJoinLeave.java | 741 +-
.../membership/gms/messages/HasMemberID.java | 48 +-
.../gms/messages/HeartbeatMessage.java | 40 +-
.../gms/messages/HeartbeatRequestMessage.java | 47 +-
.../gms/messages/InstallViewMessage.java | 276 +-
.../gms/messages/JoinRequestMessage.java | 259 +-
.../gms/messages/JoinResponseMessage.java | 340 +-
.../gms/messages/LeaveRequestMessage.java | 186 +-
.../gms/messages/NetworkPartitionMessage.java | 85 +-
.../gms/messages/RemoveMemberMessage.java | 190 +-
.../gms/messages/SuspectMembersMessage.java | 181 +-
.../membership/gms/messages/SuspectRequest.java | 22 +-
.../membership/gms/messages/ViewAckMessage.java | 203 +-
.../gms/messenger/AddressManager.java | 238 +-
.../membership/gms/messenger/GMSEncrypt.java | 252 +-
.../membership/gms/messenger/GMSPingPonger.java | 48 +-
.../gms/messenger/GMSQuorumChecker.java | 77 +-
.../membership/gms/messenger/JGAddress.java | 430 +-
.../gms/messenger/JGroupsMessenger.java | 2756 ++--
.../membership/gms/messenger/StatRecorder.java | 363 +-
.../membership/gms/messenger/Transport.java | 328 +-
.../gms/mgr/GMSMembershipManager.java | 5143 ++++----
.../membership/gms/mgr/LocalViewMessage.java | 52 +-
.../internal/streaming/StreamingOperation.java | 379 +-
.../internal/tcpserver/InfoRequest.java | 36 +-
.../internal/tcpserver/InfoResponse.java | 37 +-
.../tcpserver/LocatorCancelException.java | 25 +-
.../internal/tcpserver/ShutdownRequest.java | 33 +-
.../internal/tcpserver/ShutdownResponse.java | 34 +-
.../internal/tcpserver/TcpClient.java | 95 +-
.../internal/tcpserver/TcpHandler.java | 49 +-
.../internal/tcpserver/TcpServer.java | 170 +-
.../internal/tcpserver/VersionRequest.java | 28 +-
.../internal/tcpserver/VersionResponse.java | 23 +-
.../unsafe/RegisterSignalHandlerSupport.java | 26 +-
.../org/apache/geode/i18n/LogWriterI18n.java | 840 +-
.../java/org/apache/geode/i18n/StringId.java | 325 +-
.../apache/geode/internal/AbstractConfig.java | 116 +-
.../java/org/apache/geode/internal/Assert.java | 122 +-
.../apache/geode/internal/AvailablePort.java | 343 +-
.../java/org/apache/geode/internal/Banner.java | 61 +-
.../geode/internal/ByteArrayDataInput.java | 133 +-
.../geode/internal/ByteBufferOutputStream.java | 66 +-
.../apache/geode/internal/ByteBufferWriter.java | 33 +-
.../apache/geode/internal/ClassLoadUtil.java | 77 +-
.../apache/geode/internal/ClassPathLoader.java | 198 +-
.../java/org/apache/geode/internal/Config.java | 80 +-
.../org/apache/geode/internal/ConfigSource.java | 109 +-
.../geode/internal/ConnectionWatcher.java | 76 +-
.../geode/internal/CopyOnWriteHashSet.java | 81 +-
.../java/org/apache/geode/internal/DSCODE.java | 341 +-
.../org/apache/geode/internal/DSFIDFactory.java | 490 +-
.../geode/internal/DSFIDNotFoundException.java | 29 +-
.../geode/internal/DataSerializableFixedID.java | 369 +-
.../geode/internal/DistributionLocator.java | 205 +-
.../geode/internal/ExternalizableDSFID.java | 39 +-
.../org/apache/geode/internal/FileUtil.java | 193 +-
.../apache/geode/internal/GemFireVersion.java | 116 +-
.../geode/internal/GfeConsoleReaderFactory.java | 42 +-
.../geode/internal/HeapDataOutputStream.java | 845 +-
.../apache/geode/internal/HistogramStats.java | 52 +-
.../geode/internal/InternalDataSerializer.java | 2789 ++---
.../apache/geode/internal/InternalEntity.java | 29 +-
.../geode/internal/InternalInstantiator.java | 583 +-
.../InternalStatisticsDisabledException.java | 50 +-
.../apache/geode/internal/JarClassLoader.java | 166 +-
.../org/apache/geode/internal/JarDeployer.java | 186 +-
.../org/apache/geode/internal/ManagerInfo.java | 180 +-
.../apache/geode/internal/MigrationClient.java | 128 +-
.../apache/geode/internal/MigrationServer.java | 266 +-
.../org/apache/geode/internal/NanoTimer.java | 112 +-
.../geode/internal/NullDataOutputStream.java | 466 +-
.../org/apache/geode/internal/OSProcess.java | 1057 +-
.../geode/internal/ObjIdConcurrentMap.java | 2354 ++--
.../org/apache/geode/internal/ObjIdMap.java | 124 +-
.../internal/ObjToByteArraySerializer.java | 30 +-
.../geode/internal/OneTaskOnlyExecutor.java | 128 +-
.../geode/internal/PdxSerializerObject.java | 33 +-
.../geode/internal/ProcessOutputReader.java | 229 +-
.../org/apache/geode/internal/PureJavaMode.java | 45 +-
...cheduledThreadPoolExecutorWithKeepAlive.java | 145 +-
.../org/apache/geode/internal/Sendable.java | 38 +-
.../geode/internal/SerializationVersions.java | 78 +-
.../org/apache/geode/internal/SetUtils.java | 53 +-
.../apache/geode/internal/SharedLibrary.java | 271 +-
.../org/apache/geode/internal/SmHelper.java | 106 +-
.../org/apache/geode/internal/SystemAdmin.java | 1305 +-
.../geode/internal/SystemFailureTestHook.java | 32 +-
.../org/apache/geode/internal/SystemTimer.java | 231 +-
.../geode/internal/UniqueIdGenerator.java | 131 +-
.../java/org/apache/geode/internal/Version.java | 404 +-
.../internal/VersionedDataInputStream.java | 40 +-
.../internal/VersionedDataOutputStream.java | 39 +-
.../internal/VersionedDataSerializable.java | 63 +-
.../geode/internal/VersionedDataStream.java | 44 +-
.../geode/internal/VersionedObjectInput.java | 43 +-
.../geode/internal/VersionedObjectOutput.java | 43 +-
.../geode/internal/admin/AdminBridgeServer.java | 25 +-
.../org/apache/geode/internal/admin/Alert.java | 39 +-
.../geode/internal/admin/AlertListener.java | 27 +-
.../geode/internal/admin/ApplicationVM.java | 33 +-
.../geode/internal/admin/CacheCollector.java | 306 +-
.../apache/geode/internal/admin/CacheInfo.java | 65 +-
.../geode/internal/admin/CacheSnapshot.java | 32 +-
.../admin/ClientHealthMonitoringRegion.java | 54 +-
.../internal/admin/ClientMembershipMessage.java | 119 +-
.../internal/admin/ClientStatsManager.java | 185 +-
.../internal/admin/CompoundEntrySnapshot.java | 121 +-
.../internal/admin/CompoundRegionSnapshot.java | 218 +-
.../apache/geode/internal/admin/DLockInfo.java | 30 +-
.../geode/internal/admin/EntrySnapshot.java | 22 +-
.../geode/internal/admin/EntryValueNode.java | 33 +-
.../apache/geode/internal/admin/GemFireVM.java | 274 +-
.../geode/internal/admin/GfManagerAgent.java | 80 +-
.../internal/admin/GfManagerAgentConfig.java | 50 +-
.../internal/admin/GfManagerAgentFactory.java | 31 +-
.../apache/geode/internal/admin/GfObject.java | 33 +-
.../geode/internal/admin/HealthListener.java | 36 +-
.../geode/internal/admin/JoinLeaveListener.java | 35 +-
.../geode/internal/admin/ListenerIdMap.java | 113 +-
.../geode/internal/admin/RegionSnapshot.java | 22 +-
.../apache/geode/internal/admin/SSLConfig.java | 50 +-
.../geode/internal/admin/SnapshotClient.java | 34 +-
.../org/apache/geode/internal/admin/Stat.java | 32 +-
.../apache/geode/internal/admin/StatAlert.java | 58 +-
.../internal/admin/StatAlertDefinition.java | 48 +-
.../geode/internal/admin/StatAlertsManager.java | 152 +-
.../geode/internal/admin/StatListener.java | 41 +-
.../geode/internal/admin/StatResource.java | 34 +-
.../geode/internal/admin/TransportConfig.java | 27 +-
.../admin/remote/AddHealthListenerRequest.java | 61 +-
.../admin/remote/AddHealthListenerResponse.java | 52 +-
.../admin/remote/AddStatListenerRequest.java | 55 +-
.../admin/remote/AddStatListenerResponse.java | 51 +-
.../remote/AdminConsoleDisconnectMessage.java | 64 +-
.../admin/remote/AdminConsoleMessage.java | 41 +-
.../admin/remote/AdminFailureResponse.java | 47 +-
.../remote/AdminMultipleReplyProcessor.java | 42 +-
.../internal/admin/remote/AdminRegion.java | 265 +-
.../admin/remote/AdminReplyProcessor.java | 89 +-
.../internal/admin/remote/AdminRequest.java | 83 +-
.../internal/admin/remote/AdminResponse.java | 49 +-
.../internal/admin/remote/AdminWaiters.java | 108 +-
.../admin/remote/AlertLevelChangeMessage.java | 40 +-
.../admin/remote/AlertListenerMessage.java | 86 +-
.../admin/remote/AlertsNotificationMessage.java | 41 +-
.../admin/remote/AppCacheSnapshotMessage.java | 207 +-
.../admin/remote/BridgeServerRequest.java | 99 +-
.../admin/remote/BridgeServerResponse.java | 153 +-
.../admin/remote/CacheConfigRequest.java | 48 +-
.../admin/remote/CacheConfigResponse.java | 87 +-
.../internal/admin/remote/CacheDisplay.java | 104 +-
.../internal/admin/remote/CacheInfoRequest.java | 42 +-
.../admin/remote/CacheInfoResponse.java | 57 +-
.../admin/remote/CancelStatListenerRequest.java | 48 +-
.../remote/CancelStatListenerResponse.java | 51 +-
.../internal/admin/remote/Cancellable.java | 30 +-
.../admin/remote/CancellationMessage.java | 45 +-
.../admin/remote/CancellationRegistry.java | 48 +-
.../remote/ChangeRefreshIntervalMessage.java | 28 +-
.../internal/admin/remote/CliLegacyMessage.java | 42 +-
.../admin/remote/ClientHealthStats.java | 140 +-
.../internal/admin/remote/CompactRequest.java | 75 +-
.../internal/admin/remote/CompactResponse.java | 37 +-
.../admin/remote/DestroyEntryMessage.java | 48 +-
.../admin/remote/DestroyRegionMessage.java | 48 +-
.../admin/remote/DistributionLocatorId.java | 342 +-
.../geode/internal/admin/remote/DummyEntry.java | 46 +-
.../admin/remote/DurableClientInfoRequest.java | 77 +-
.../admin/remote/DurableClientInfoResponse.java | 80 +-
.../admin/remote/EntryValueNodeImpl.java | 227 +-
.../admin/remote/FetchDistLockInfoRequest.java | 51 +-
.../admin/remote/FetchDistLockInfoResponse.java | 67 +-
.../remote/FetchHealthDiagnosisRequest.java | 60 +-
.../remote/FetchHealthDiagnosisResponse.java | 52 +-
.../internal/admin/remote/FetchHostRequest.java | 45 +-
.../admin/remote/FetchHostResponse.java | 85 +-
.../remote/FetchResourceAttributesRequest.java | 59 +-
.../remote/FetchResourceAttributesResponse.java | 50 +-
.../admin/remote/FetchStatsRequest.java | 53 +-
.../admin/remote/FetchStatsResponse.java | 96 +-
.../admin/remote/FetchSysCfgRequest.java | 51 +-
.../admin/remote/FetchSysCfgResponse.java | 58 +-
.../remote/FlushAppCacheSnapshotMessage.java | 51 +-
.../admin/remote/HealthListenerMessage.java | 66 +-
.../remote/InspectionClasspathManager.java | 48 +-
.../admin/remote/LicenseInfoRequest.java | 51 +-
.../admin/remote/LicenseInfoResponse.java | 51 +-
.../remote/MissingPersistentIDsRequest.java | 71 +-
.../remote/MissingPersistentIDsResponse.java | 62 +-
.../admin/remote/ObjectDetailsRequest.java | 44 +-
.../admin/remote/ObjectDetailsResponse.java | 84 +-
.../admin/remote/ObjectNamesRequest.java | 47 +-
.../admin/remote/ObjectNamesResponse.java | 57 +-
.../PrepareRevokePersistentIDRequest.java | 60 +-
.../remote/RefreshMemberSnapshotRequest.java | 35 +-
.../remote/RefreshMemberSnapshotResponse.java | 44 +-
.../admin/remote/RegionAdminMessage.java | 39 +-
.../admin/remote/RegionAdminRequest.java | 49 +-
.../admin/remote/RegionAttributesRequest.java | 43 +-
.../admin/remote/RegionAttributesResponse.java | 49 +-
.../internal/admin/remote/RegionRequest.java | 83 +-
.../internal/admin/remote/RegionResponse.java | 103 +-
.../admin/remote/RegionSizeRequest.java | 47 +-
.../admin/remote/RegionSizeResponse.java | 55 +-
.../admin/remote/RegionStatisticsRequest.java | 43 +-
.../admin/remote/RegionStatisticsResponse.java | 49 +-
.../remote/RegionSubRegionSizeRequest.java | 32 +-
.../remote/RegionSubRegionsSizeResponse.java | 80 +-
.../internal/admin/remote/RemoteAlert.java | 117 +-
.../admin/remote/RemoteApplicationVM.java | 49 +-
.../admin/remote/RemoteBridgeServer.java | 167 +-
.../internal/admin/remote/RemoteCacheInfo.java | 48 +-
.../admin/remote/RemoteCacheStatistics.java | 30 +-
.../internal/admin/remote/RemoteDLockInfo.java | 52 +-
.../admin/remote/RemoteEntrySnapshot.java | 43 +-
.../internal/admin/remote/RemoteGemFireVM.java | 643 +-
.../admin/remote/RemoteGfManagerAgent.java | 749 +-
.../internal/admin/remote/RemoteObjectName.java | 50 +-
.../admin/remote/RemoteRegionAttributes.java | 229 +-
.../admin/remote/RemoteRegionSnapshot.java | 70 +-
.../geode/internal/admin/remote/RemoteStat.java | 51 +-
.../admin/remote/RemoteStatResource.java | 73 +-
.../admin/remote/RemoteTransportConfig.java | 78 +-
.../remote/RemoveHealthListenerRequest.java | 46 +-
.../remote/RemoveHealthListenerResponse.java | 47 +-
.../admin/remote/ResetHealthStatusRequest.java | 52 +-
.../admin/remote/ResetHealthStatusResponse.java | 53 +-
.../admin/remote/RevokePersistentIDRequest.java | 49 +-
.../remote/RevokePersistentIDResponse.java | 27 +-
.../admin/remote/RootRegionRequest.java | 51 +-
.../admin/remote/RootRegionResponse.java | 90 +-
.../remote/ShutdownAllGatewayHubsRequest.java | 36 +-
.../admin/remote/ShutdownAllRequest.java | 117 +-
.../admin/remote/ShutdownAllResponse.java | 43 +-
.../admin/remote/SnapshotResultMessage.java | 50 +-
.../remote/StatAlertsManagerAssignMessage.java | 82 +-
.../admin/remote/StatListenerMessage.java | 65 +-
.../admin/remote/StoreSysCfgRequest.java | 47 +-
.../admin/remote/StoreSysCfgResponse.java | 47 +-
.../internal/admin/remote/SubRegionRequest.java | 41 +-
.../admin/remote/SubRegionResponse.java | 64 +-
.../internal/admin/remote/TailLogRequest.java | 45 +-
.../internal/admin/remote/TailLogResponse.java | 120 +-
.../remote/UpdateAlertDefinitionMessage.java | 103 +-
.../admin/remote/VersionInfoRequest.java | 46 +-
.../admin/remote/VersionInfoResponse.java | 48 +-
.../admin/remote/VersionMismatchAlert.java | 60 +-
.../admin/statalerts/BaseDecoratorImpl.java | 70 +-
.../statalerts/DummyStatisticInfoImpl.java | 48 +-
.../admin/statalerts/FunctionDecoratorImpl.java | 36 +-
.../admin/statalerts/FunctionHelper.java | 106 +-
.../statalerts/GaugeThresholdDecoratorImpl.java | 50 +-
.../statalerts/MultiAttrDefinitionImpl.java | 48 +-
.../NumberThresholdDecoratorImpl.java | 54 +-
.../statalerts/SingleAttrDefinitionImpl.java | 48 +-
.../admin/statalerts/StatisticInfo.java | 31 +-
.../admin/statalerts/StatisticInfoImpl.java | 40 +-
.../cache/AbstractBucketRegionQueue.java | 365 +-
.../internal/cache/AbstractCacheServer.java | 173 +-
.../cache/AbstractDiskLRURegionEntry.java | 34 +-
.../internal/cache/AbstractDiskRegion.java | 480 +-
.../internal/cache/AbstractDiskRegionEntry.java | 41 +-
.../internal/cache/AbstractLRURegionEntry.java | 32 +-
.../internal/cache/AbstractLRURegionMap.java | 491 +-
.../cache/AbstractOplogDiskRegionEntry.java | 92 +-
.../geode/internal/cache/AbstractRegion.java | 1084 +-
.../internal/cache/AbstractRegionEntry.java | 1290 +-
.../geode/internal/cache/AbstractRegionMap.java | 2580 ++--
.../internal/cache/AbstractUpdateOperation.java | 235 +-
.../geode/internal/cache/AcceptHelper.java | 55 +-
.../cache/AddCacheServerProfileMessage.java | 83 +-
.../apache/geode/internal/cache/BackupLock.java | 69 +-
.../geode/internal/cache/BucketAdvisor.java | 1576 ++-
.../apache/geode/internal/cache/BucketDump.java | 55 +-
.../internal/cache/BucketNotFoundException.java | 25 +-
.../cache/BucketPersistenceAdvisor.java | 300 +-
.../geode/internal/cache/BucketRegion.java | 1430 +--
.../internal/cache/BucketRegionEvictior.java | 32 +-
.../geode/internal/cache/BucketRegionQueue.java | 251 +-
.../internal/cache/BucketServerLocation.java | 48 +-
.../internal/cache/BucketServerLocation66.java | 60 +-
.../cache/BytesAndBitsForCompactor.java | 72 +-
.../geode/internal/cache/CacheClientStatus.java | 49 +-
.../geode/internal/cache/CacheConfig.java | 106 +-
.../cache/CacheDistributionAdvisee.java | 43 +-
.../cache/CacheDistributionAdvisor.java | 703 +-
.../internal/cache/CacheLifecycleListener.java | 26 +-
.../geode/internal/cache/CacheObserver.java | 159 +-
.../internal/cache/CacheObserverAdapter.java | 127 +-
.../internal/cache/CacheObserverHolder.java | 56 +-
.../geode/internal/cache/CachePerfStats.java | 1415 ++-
.../internal/cache/CacheServerAdvisor.java | 55 +-
.../geode/internal/cache/CacheServerImpl.java | 429 +-
.../internal/cache/CacheServerLauncher.java | 674 +-
.../geode/internal/cache/CacheService.java | 35 +-
.../internal/cache/CacheServiceProfile.java | 29 +-
.../internal/cache/CacheStatisticsImpl.java | 63 +-
.../internal/cache/CachedDeserializable.java | 95 +-
.../cache/CachedDeserializableFactory.java | 135 +-
.../internal/cache/ClientRegionEventImpl.java | 70 +-
.../internal/cache/ClientServerObserver.java | 78 +-
.../cache/ClientServerObserverAdapter.java | 90 +-
.../cache/ClientServerObserverHolder.java | 44 +-
.../cache/ClientSubscriptionConfigImpl.java | 137 +-
.../geode/internal/cache/CloseCacheMessage.java | 57 +-
.../cache/ClusterConfigurationLoader.java | 185 +-
.../geode/internal/cache/ColocationHelper.java | 323 +-
.../geode/internal/cache/ColocationLogger.java | 74 +-
.../internal/cache/CommitReplyException.java | 51 +-
.../geode/internal/cache/CompactableOplog.java | 33 +-
.../geode/internal/cache/Conflatable.java | 33 +-
.../geode/internal/cache/ControllerAdvisor.java | 57 +-
.../internal/cache/CountingDataInputStream.java | 39 +-
.../internal/cache/CreateRegionProcessor.java | 713 +-
.../internal/cache/CustomEntryExpiryTask.java | 30 +-
.../internal/cache/DataLocationException.java | 30 +-
.../geode/internal/cache/DestroyOperation.java | 203 +-
.../cache/DestroyPartitionedRegionMessage.java | 151 +-
.../internal/cache/DestroyRegionOperation.java | 353 +-
.../geode/internal/cache/DestroyedEntry.java | 31 +-
.../internal/cache/DirectReplyMessage.java | 52 +-
.../geode/internal/cache/DirectoryHolder.java | 74 +-
.../internal/cache/DiskDirectoryStats.java | 68 +-
.../apache/geode/internal/cache/DiskEntry.java | 1104 +-
.../org/apache/geode/internal/cache/DiskId.java | 336 +-
.../geode/internal/cache/DiskInitFile.java | 1378 +-
.../apache/geode/internal/cache/DiskRegion.java | 577 +-
.../geode/internal/cache/DiskRegionStats.java | 168 +-
.../internal/cache/DiskStoreAttributes.java | 73 +-
.../geode/internal/cache/DiskStoreBackup.java | 64 +-
.../internal/cache/DiskStoreFactoryImpl.java | 133 +-
.../geode/internal/cache/DiskStoreImpl.java | 1275 +-
.../geode/internal/cache/DiskStoreMonitor.java | 285 +-
.../geode/internal/cache/DiskStoreObserver.java | 53 +-
.../geode/internal/cache/DiskStoreStats.java | 262 +-
.../geode/internal/cache/DiskStoreTask.java | 24 +-
.../internal/cache/DiskWriteAttributesImpl.java | 299 +-
.../internal/cache/DistPeerTXStateStub.java | 203 +-
.../cache/DistTXAdjunctCommitMessage.java | 29 +-
.../internal/cache/DistTXCommitMessage.java | 201 +-
.../cache/DistTXCoordinatorInterface.java | 48 +-
.../internal/cache/DistTXPrecommitMessage.java | 208 +-
.../internal/cache/DistTXRollbackMessage.java | 161 +-
.../geode/internal/cache/DistTXState.java | 378 +-
.../cache/DistTXStateOnCoordinator.java | 270 +-
.../internal/cache/DistTXStateProxyImpl.java | 24 +-
.../DistTXStateProxyImplOnCoordinator.java | 567 +-
.../cache/DistTXStateProxyImplOnDatanode.java | 56 +-
.../cache/DistributedCacheOperation.java | 595 +-
.../cache/DistributedClearOperation.java | 235 +-
.../cache/DistributedPutAllOperation.java | 649 +-
.../geode/internal/cache/DistributedRegion.java | 2675 ++--
...stributedRegionFunctionStreamingMessage.java | 257 +-
.../cache/DistributedRemoveAllOperation.java | 516 +-
.../cache/DistributedTombstoneOperation.java | 75 +-
.../internal/cache/DummyCachePerfStats.java | 141 +-
.../internal/cache/DynamicRegionAttributes.java | 50 +-
.../cache/DynamicRegionFactoryImpl.java | 47 +-
.../apache/geode/internal/cache/EntriesMap.java | 145 +-
.../apache/geode/internal/cache/EntriesSet.java | 104 +-
.../apache/geode/internal/cache/EntryBits.java | 68 +-
.../geode/internal/cache/EntryEventImpl.java | 1376 +-
.../geode/internal/cache/EntryExpiryTask.java | 173 +-
.../internal/cache/EntryOperationImpl.java | 44 +-
.../geode/internal/cache/EntrySnapshot.java | 441 +-
.../geode/internal/cache/EnumListenerEvent.java | 399 +-
.../apache/geode/internal/cache/EventID.java | 483 +-
.../geode/internal/cache/EventIDHolder.java | 33 +-
.../geode/internal/cache/EventStateHelper.java | 104 +-
.../geode/internal/cache/EventTracker.java | 525 +-
.../internal/cache/EvictionAttributesImpl.java | 162 +-
.../internal/cache/ExpirationScheduler.java | 63 +-
.../apache/geode/internal/cache/ExpiryTask.java | 340 +-
.../geode/internal/cache/ExportDiskRegion.java | 45 +-
.../geode/internal/cache/FilterProfile.java | 1231 +-
.../geode/internal/cache/FilterRoutingInfo.java | 201 +-
.../cache/FindDurableQueueProcessor.java | 153 +-
.../internal/cache/FindRemoteTXMessage.java | 112 +-
.../internal/cache/FindVersionTagOperation.java | 103 +-
.../cache/FixedPartitionAttributesImpl.java | 48 +-
.../internal/cache/ForceReattemptException.java | 63 +-
.../cache/ForceableLinkedBlockingQueue.java | 1542 ++-
.../FunctionStreamingOrderedReplyMessage.java | 30 +-
.../cache/FunctionStreamingReplyMessage.java | 65 +-
.../internal/cache/GatewayEventFilter.java | 26 +-
.../geode/internal/cache/GemFireCacheImpl.java | 2015 +--
.../internal/cache/GemfireCacheHelper.java | 75 +-
.../geode/internal/cache/GridAdvisor.java | 185 +-
.../apache/geode/internal/cache/HARegion.java | 420 +-
.../geode/internal/cache/HasCachePerfStats.java | 25 +-
.../geode/internal/cache/IdentityArrayList.java | 1006 +-
.../apache/geode/internal/cache/ImageState.java | 55 +-
.../cache/InMemoryPersistentMemberView.java | 63 +-
.../internal/cache/IncomingGatewayStatus.java | 39 +-
.../internal/cache/InitialImageFlowControl.java | 135 +-
.../internal/cache/InitialImageOperation.java | 2813 +++--
.../geode/internal/cache/InlineKeyHelper.java | 42 +-
.../geode/internal/cache/InterestEvent.java | 44 +-
.../geode/internal/cache/InterestFilter.java | 22 +-
.../cache/InterestRegistrationEventImpl.java | 74 +-
.../geode/internal/cache/InternalCache.java | 29 +-
.../internal/cache/InternalCacheEvent.java | 46 +-
.../geode/internal/cache/InternalDataView.java | 110 +-
.../internal/cache/InternalRegionArguments.java | 120 +-
.../internal/cache/InvalidateOperation.java | 115 +-
.../InvalidatePartitionedRegionMessage.java | 65 +-
.../cache/InvalidateRegionOperation.java | 80 +-
.../cache/JtaAfterCompletionMessage.java | 70 +-
.../cache/JtaBeforeCompletionMessage.java | 55 +-
.../apache/geode/internal/cache/KeyInfo.java | 49 +-
.../internal/cache/LoaderHelperFactory.java | 41 +-
.../geode/internal/cache/LoaderHelperImpl.java | 123 +-
.../geode/internal/cache/LocalDataSet.java | 218 +-
.../geode/internal/cache/LocalRegion.java | 8056 ++++++------
.../internal/cache/LocalRegionDataView.java | 272 +-
.../cache/MemberFunctionStreamingMessage.java | 185 +-
.../cache/MinimumSystemRequirements.java | 25 +-
.../cache/NetSearchExpirationCalculator.java | 36 +-
.../org/apache/geode/internal/cache/Node.java | 126 +-
.../internal/cache/NonLocalRegionEntry.java | 388 +-
.../cache/NonLocalRegionEntryWithStats.java | 31 +-
.../internal/cache/OffHeapRegionEntry.java | 28 +-
.../cache/OfflineCompactionDiskRegion.java | 83 +-
.../org/apache/geode/internal/cache/OpType.java | 51 +-
.../org/apache/geode/internal/cache/Oplog.java | 2049 +--
.../apache/geode/internal/cache/OplogSet.java | 37 +-
.../internal/cache/OrderedTombstoneMap.java | 75 +-
.../geode/internal/cache/OverflowOplog.java | 1083 +-
.../geode/internal/cache/OverflowOplogSet.java | 125 +-
.../internal/cache/PRContainsValueFunction.java | 32 +-
.../internal/cache/PRHARedundancyProvider.java | 2014 ++-
.../geode/internal/cache/PRQueryProcessor.java | 456 +-
.../internal/cache/PRSystemPropertyGetter.java | 47 +-
.../internal/cache/PartitionAttributesImpl.java | 521 +-
.../internal/cache/PartitionRegionConfig.java | 252 +-
.../cache/PartitionRegionConfigValidator.java | 270 +-
.../geode/internal/cache/PartitionedRegion.java | 6406 +++++-----
.../PartitionedRegionBucketMgmtHelper.java | 37 +-
.../cache/PartitionedRegionDataStore.java | 2369 ++--
.../cache/PartitionedRegionDataView.java | 121 +-
.../cache/PartitionedRegionException.java | 64 +-
.../internal/cache/PartitionedRegionHelper.java | 812 +-
.../cache/PartitionedRegionQueryEvaluator.java | 666 +-
.../internal/cache/PartitionedRegionStats.java | 911 +-
.../internal/cache/PartitionedRegionStatus.java | 34 +-
.../geode/internal/cache/PeerTXStateStub.java | 160 +-
.../internal/cache/PersistentOplogSet.java | 374 +-
.../internal/cache/PlaceHolderDiskRegion.java | 336 +-
.../geode/internal/cache/PoolFactoryImpl.java | 171 +-
.../geode/internal/cache/PoolManagerImpl.java | 196 +-
.../apache/geode/internal/cache/PoolStats.java | 179 +-
.../cache/PreferBytesCachedDeserializable.java | 79 +-
.../internal/cache/PrimaryBucketException.java | 29 +-
.../cache/ProfileExchangeProcessor.java | 36 +-
.../geode/internal/cache/ProxyBucketRegion.java | 405 +-
.../geode/internal/cache/ProxyRegionMap.java | 554 +-
.../cache/PutAllPartialResultException.java | 75 +-
.../geode/internal/cache/QueuedOperation.java | 171 +-
.../internal/cache/RegionClearedException.java | 41 +-
.../geode/internal/cache/RegionEntry.java | 415 +-
.../internal/cache/RegionEntryContext.java | 32 +-
.../internal/cache/RegionEntryFactory.java | 32 +-
.../geode/internal/cache/RegionEventImpl.java | 167 +-
.../geode/internal/cache/RegionEvictorTask.java | 58 +-
.../geode/internal/cache/RegionExpiryTask.java | 76 +-
.../geode/internal/cache/RegionFactoryImpl.java | 31 +-
.../internal/cache/RegionIdleExpiryTask.java | 41 +-
.../geode/internal/cache/RegionListener.java | 45 +-
.../apache/geode/internal/cache/RegionMap.java | 341 +-
.../geode/internal/cache/RegionMapFactory.java | 55 +-
.../geode/internal/cache/RegionQueue.java | 81 +-
.../internal/cache/RegionQueueException.java | 34 +-
.../geode/internal/cache/RegionStatus.java | 35 +-
.../internal/cache/RegionTTLExpiryTask.java | 45 +-
.../internal/cache/ReleaseClearLockMessage.java | 143 +-
.../cache/ReliableDistributionData.java | 43 +-
.../internal/cache/ReliableMessageQueue.java | 52 +-
.../cache/ReliableMessageQueueFactory.java | 39 +-
.../cache/ReliableMessageQueueFactoryImpl.java | 87 +-
.../cache/RemoteContainsKeyValueMessage.java | 215 +-
.../internal/cache/RemoteDestroyMessage.java | 379 +-
.../internal/cache/RemoteFetchEntryMessage.java | 238 +-
.../cache/RemoteFetchVersionMessage.java | 86 +-
.../geode/internal/cache/RemoteGetMessage.java | 324 +-
.../internal/cache/RemoteInvalidateMessage.java | 289 +-
.../cache/RemoteOperationException.java | 58 +-
.../internal/cache/RemoteOperationMessage.java | 392 +-
.../RemoteOperationMessageWithDirectReply.java | 49 +-
.../internal/cache/RemotePutAllMessage.java | 311 +-
.../geode/internal/cache/RemotePutMessage.java | 647 +-
.../internal/cache/RemoteRegionOperation.java | 130 +-
.../internal/cache/RemoteRemoveAllMessage.java | 288 +-
.../geode/internal/cache/RoleEventImpl.java | 53 +-
.../cache/SearchLoadAndWriteProcessor.java | 1674 ++-
.../internal/cache/SendQueueOperation.java | 58 +-
.../internal/cache/SerializationHelper.java | 27 +-
.../geode/internal/cache/ServerPingMessage.java | 89 +-
.../internal/cache/StateFlushOperation.java | 476 +-
.../cache/StoreAllCachedDeserializable.java | 77 +-
.../internal/cache/TXBucketRegionState.java | 28 +-
.../geode/internal/cache/TXCommitMessage.java | 1520 ++-
.../apache/geode/internal/cache/TXEntry.java | 160 +-
.../geode/internal/cache/TXEntryState.java | 2147 ++--
.../internal/cache/TXEntryStateFactory.java | 28 +-
.../internal/cache/TXEntryUserAttrState.java | 37 +-
.../apache/geode/internal/cache/TXEvent.java | 52 +-
.../internal/cache/TXFarSideCMTracker.java | 214 +-
.../org/apache/geode/internal/cache/TXId.java | 69 +-
.../geode/internal/cache/TXLockRequest.java | 56 +-
.../geode/internal/cache/TXManagerImpl.java | 861 +-
.../apache/geode/internal/cache/TXMessage.java | 79 +-
.../internal/cache/TXRegionLockRequestImpl.java | 73 +-
.../geode/internal/cache/TXRegionState.java | 328 +-
.../internal/cache/TXRemoteCommitMessage.java | 161 +-
.../internal/cache/TXRemoteRollbackMessage.java | 51 +-
.../geode/internal/cache/TXReservationMgr.java | 104 +-
.../apache/geode/internal/cache/TXRmtEvent.java | 157 +-
.../apache/geode/internal/cache/TXState.java | 1297 +-
.../geode/internal/cache/TXStateInterface.java | 129 +-
.../geode/internal/cache/TXStateProxy.java | 77 +-
.../geode/internal/cache/TXStateProxyImpl.java | 673 +-
.../geode/internal/cache/TXStateStub.java | 499 +-
.../cache/TXSynchronizationRunnable.java | 59 +-
.../cache/TestHeapThresholdObserver.java | 26 +-
.../cache/TimestampedEntryEventImpl.java | 155 +-
.../org/apache/geode/internal/cache/Token.java | 169 +-
.../geode/internal/cache/TombstoneService.java | 2012 +--
.../internal/cache/TransactionMessage.java | 51 +-
.../geode/internal/cache/TxEntryFactory.java | 38 +-
.../internal/cache/UnsharedImageState.java | 103 +-
.../cache/UpdateAttributesProcessor.java | 193 +-
.../cache/UpdateEntryVersionOperation.java | 88 +-
.../geode/internal/cache/UpdateOperation.java | 276 +-
.../cache/UserSpecifiedDiskStoreAttributes.java | 100 +-
.../cache/UserSpecifiedRegionAttributes.java | 527 +-
.../internal/cache/VMCachedDeserializable.java | 154 +-
.../geode/internal/cache/VMLRURegionMap.java | 39 +-
.../geode/internal/cache/VMRegionMap.java | 30 +-
.../cache/VMStatsDiskLRURegionEntry.java | 33 +-
.../cache/VMStatsDiskLRURegionEntryHeap.java | 39 +-
.../VMStatsDiskLRURegionEntryHeapIntKey.java | 235 +-
.../VMStatsDiskLRURegionEntryHeapLongKey.java | 235 +-
.../VMStatsDiskLRURegionEntryHeapObjectKey.java | 238 +-
...VMStatsDiskLRURegionEntryHeapStringKey1.java | 265 +-
...VMStatsDiskLRURegionEntryHeapStringKey2.java | 267 +-
.../VMStatsDiskLRURegionEntryHeapUUIDKey.java | 240 +-
.../cache/VMStatsDiskLRURegionEntryOffHeap.java | 48 +-
.../VMStatsDiskLRURegionEntryOffHeapIntKey.java | 271 +-
...VMStatsDiskLRURegionEntryOffHeapLongKey.java | 271 +-
...StatsDiskLRURegionEntryOffHeapObjectKey.java | 271 +-
...tatsDiskLRURegionEntryOffHeapStringKey1.java | 298 +-
...tatsDiskLRURegionEntryOffHeapStringKey2.java | 300 +-
...VMStatsDiskLRURegionEntryOffHeapUUIDKey.java | 276 +-
.../internal/cache/VMStatsDiskRegionEntry.java | 32 +-
.../cache/VMStatsDiskRegionEntryHeap.java | 39 +-
.../cache/VMStatsDiskRegionEntryHeapIntKey.java | 175 +-
.../VMStatsDiskRegionEntryHeapLongKey.java | 175 +-
.../VMStatsDiskRegionEntryHeapObjectKey.java | 174 +-
.../VMStatsDiskRegionEntryHeapStringKey1.java | 200 +-
.../VMStatsDiskRegionEntryHeapStringKey2.java | 202 +-
.../VMStatsDiskRegionEntryHeapUUIDKey.java | 180 +-
.../cache/VMStatsDiskRegionEntryOffHeap.java | 42 +-
.../VMStatsDiskRegionEntryOffHeapIntKey.java | 208 +-
.../VMStatsDiskRegionEntryOffHeapLongKey.java | 208 +-
.../VMStatsDiskRegionEntryOffHeapObjectKey.java | 210 +-
...VMStatsDiskRegionEntryOffHeapStringKey1.java | 237 +-
...VMStatsDiskRegionEntryOffHeapStringKey2.java | 239 +-
.../VMStatsDiskRegionEntryOffHeapUUIDKey.java | 213 +-
.../internal/cache/VMStatsLRURegionEntry.java | 33 +-
.../cache/VMStatsLRURegionEntryHeap.java | 37 +-
.../cache/VMStatsLRURegionEntryHeapIntKey.java | 139 +-
.../cache/VMStatsLRURegionEntryHeapLongKey.java | 139 +-
.../VMStatsLRURegionEntryHeapObjectKey.java | 138 +-
.../VMStatsLRURegionEntryHeapStringKey1.java | 166 +-
.../VMStatsLRURegionEntryHeapStringKey2.java | 168 +-
.../cache/VMStatsLRURegionEntryHeapUUIDKey.java | 144 +-
.../cache/VMStatsLRURegionEntryOffHeap.java | 40 +-
.../VMStatsLRURegionEntryOffHeapIntKey.java | 172 +-
.../VMStatsLRURegionEntryOffHeapLongKey.java | 172 +-
.../VMStatsLRURegionEntryOffHeapObjectKey.java | 173 +-
.../VMStatsLRURegionEntryOffHeapStringKey1.java | 201 +-
.../VMStatsLRURegionEntryOffHeapStringKey2.java | 203 +-
.../VMStatsLRURegionEntryOffHeapUUIDKey.java | 177 +-
.../internal/cache/VMStatsRegionEntry.java | 27 +-
.../internal/cache/VMStatsRegionEntryHeap.java | 36 +-
.../cache/VMStatsRegionEntryHeapIntKey.java | 81 +-
.../cache/VMStatsRegionEntryHeapLongKey.java | 81 +-
.../cache/VMStatsRegionEntryHeapObjectKey.java | 80 +-
.../cache/VMStatsRegionEntryHeapStringKey1.java | 108 +-
.../cache/VMStatsRegionEntryHeapStringKey2.java | 110 +-
.../cache/VMStatsRegionEntryHeapUUIDKey.java | 86 +-
.../cache/VMStatsRegionEntryOffHeap.java | 42 +-
.../cache/VMStatsRegionEntryOffHeapIntKey.java | 114 +-
.../cache/VMStatsRegionEntryOffHeapLongKey.java | 114 +-
.../VMStatsRegionEntryOffHeapObjectKey.java | 113 +-
.../VMStatsRegionEntryOffHeapStringKey1.java | 140 +-
.../VMStatsRegionEntryOffHeapStringKey2.java | 142 +-
.../cache/VMStatsRegionEntryOffHeapUUIDKey.java | 119 +-
.../cache/VMThinDiskLRURegionEntry.java | 33 +-
.../cache/VMThinDiskLRURegionEntryHeap.java | 39 +-
.../VMThinDiskLRURegionEntryHeapIntKey.java | 208 +-
.../VMThinDiskLRURegionEntryHeapLongKey.java | 208 +-
.../VMThinDiskLRURegionEntryHeapObjectKey.java | 207 +-
.../VMThinDiskLRURegionEntryHeapStringKey1.java | 236 +-
.../VMThinDiskLRURegionEntryHeapStringKey2.java | 238 +-
.../VMThinDiskLRURegionEntryHeapUUIDKey.java | 213 +-
.../cache/VMThinDiskLRURegionEntryOffHeap.java | 48 +-
.../VMThinDiskLRURegionEntryOffHeapIntKey.java | 242 +-
.../VMThinDiskLRURegionEntryOffHeapLongKey.java | 242 +-
...MThinDiskLRURegionEntryOffHeapObjectKey.java | 242 +-
...ThinDiskLRURegionEntryOffHeapStringKey1.java | 269 +-
...ThinDiskLRURegionEntryOffHeapStringKey2.java | 271 +-
.../VMThinDiskLRURegionEntryOffHeapUUIDKey.java | 247 +-
.../internal/cache/VMThinDiskRegionEntry.java | 36 +-
.../cache/VMThinDiskRegionEntryHeap.java | 39 +-
.../cache/VMThinDiskRegionEntryHeapIntKey.java | 148 +-
.../cache/VMThinDiskRegionEntryHeapLongKey.java | 148 +-
.../VMThinDiskRegionEntryHeapObjectKey.java | 145 +-
.../VMThinDiskRegionEntryHeapStringKey1.java | 175 +-
.../VMThinDiskRegionEntryHeapStringKey2.java | 175 +-
.../cache/VMThinDiskRegionEntryHeapUUIDKey.java | 153 +-
.../cache/VMThinDiskRegionEntryOffHeap.java | 42 +-
.../VMThinDiskRegionEntryOffHeapIntKey.java | 181 +-
.../VMThinDiskRegionEntryOffHeapLongKey.java | 181 +-
.../VMThinDiskRegionEntryOffHeapObjectKey.java | 181 +-
.../VMThinDiskRegionEntryOffHeapStringKey1.java | 206 +-
.../VMThinDiskRegionEntryOffHeapStringKey2.java | 208 +-
.../VMThinDiskRegionEntryOffHeapUUIDKey.java | 186 +-
.../internal/cache/VMThinLRURegionEntry.java | 31 +-
.../cache/VMThinLRURegionEntryHeap.java | 39 +-
.../cache/VMThinLRURegionEntryHeapIntKey.java | 112 +-
.../cache/VMThinLRURegionEntryHeapLongKey.java | 112 +-
.../VMThinLRURegionEntryHeapObjectKey.java | 111 +-
.../VMThinLRURegionEntryHeapStringKey1.java | 139 +-
.../VMThinLRURegionEntryHeapStringKey2.java | 141 +-
.../cache/VMThinLRURegionEntryHeapUUIDKey.java | 117 +-
.../cache/VMThinLRURegionEntryOffHeap.java | 42 +-
.../VMThinLRURegionEntryOffHeapIntKey.java | 145 +-
.../VMThinLRURegionEntryOffHeapLongKey.java | 145 +-
.../VMThinLRURegionEntryOffHeapObjectKey.java | 144 +-
.../VMThinLRURegionEntryOffHeapStringKey1.java | 172 +-
.../VMThinLRURegionEntryOffHeapStringKey2.java | 174 +-
.../VMThinLRURegionEntryOffHeapUUIDKey.java | 150 +-
.../geode/internal/cache/VMThinRegionEntry.java | 27 +-
.../internal/cache/VMThinRegionEntryHeap.java | 35 +-
.../cache/VMThinRegionEntryHeapIntKey.java | 54 +-
.../cache/VMThinRegionEntryHeapLongKey.java | 54 +-
.../cache/VMThinRegionEntryHeapObjectKey.java | 53 +-
.../cache/VMThinRegionEntryHeapStringKey1.java | 81 +-
.../cache/VMThinRegionEntryHeapStringKey2.java | 83 +-
.../cache/VMThinRegionEntryHeapUUIDKey.java | 59 +-
.../cache/VMThinRegionEntryOffHeap.java | 43 +-
.../cache/VMThinRegionEntryOffHeapIntKey.java | 87 +-
.../cache/VMThinRegionEntryOffHeapLongKey.java | 87 +-
.../VMThinRegionEntryOffHeapObjectKey.java | 86 +-
.../VMThinRegionEntryOffHeapStringKey1.java | 113 +-
.../VMThinRegionEntryOffHeapStringKey2.java | 115 +-
.../cache/VMThinRegionEntryOffHeapUUIDKey.java | 92 +-
.../internal/cache/ValidatingDiskRegion.java | 222 +-
.../geode/internal/cache/ValueByteWrapper.java | 47 +-
.../geode/internal/cache/VersionTagHolder.java | 28 +-
.../geode/internal/cache/VersionTimestamp.java | 37 +-
.../cache/VersionedStatsDiskLRURegionEntry.java | 62 +-
.../VersionedStatsDiskLRURegionEntryHeap.java | 49 +-
...sionedStatsDiskLRURegionEntryHeapIntKey.java | 277 +-
...ionedStatsDiskLRURegionEntryHeapLongKey.java | 277 +-
...nedStatsDiskLRURegionEntryHeapObjectKey.java | 276 +-
...edStatsDiskLRURegionEntryHeapStringKey1.java | 303 +-
...edStatsDiskLRURegionEntryHeapStringKey2.java | 305 +-
...ionedStatsDiskLRURegionEntryHeapUUIDKey.java | 282 +-
...VersionedStatsDiskLRURegionEntryOffHeap.java | 52 +-
...nedStatsDiskLRURegionEntryOffHeapIntKey.java | 310 +-
...edStatsDiskLRURegionEntryOffHeapLongKey.java | 310 +-
...StatsDiskLRURegionEntryOffHeapObjectKey.java | 309 +-
...tatsDiskLRURegionEntryOffHeapStringKey1.java | 336 +-
...tatsDiskLRURegionEntryOffHeapStringKey2.java | 338 +-
...edStatsDiskLRURegionEntryOffHeapUUIDKey.java | 315 +-
.../cache/VersionedStatsDiskRegionEntry.java | 62 +-
.../VersionedStatsDiskRegionEntryHeap.java | 48 +-
...VersionedStatsDiskRegionEntryHeapIntKey.java | 214 +-
...ersionedStatsDiskRegionEntryHeapLongKey.java | 214 +-
...sionedStatsDiskRegionEntryHeapObjectKey.java | 213 +-
...ionedStatsDiskRegionEntryHeapStringKey1.java | 240 +-
...ionedStatsDiskRegionEntryHeapStringKey2.java | 242 +-
...ersionedStatsDiskRegionEntryHeapUUIDKey.java | 219 +-
.../VersionedStatsDiskRegionEntryOffHeap.java | 49 +-
...sionedStatsDiskRegionEntryOffHeapIntKey.java | 250 +-
...ionedStatsDiskRegionEntryOffHeapLongKey.java | 250 +-
...nedStatsDiskRegionEntryOffHeapObjectKey.java | 249 +-
...edStatsDiskRegionEntryOffHeapStringKey1.java | 276 +-
...edStatsDiskRegionEntryOffHeapStringKey2.java | 278 +-
...ionedStatsDiskRegionEntryOffHeapUUIDKey.java | 255 +-
.../cache/VersionedStatsLRURegionEntry.java | 64 +-
.../cache/VersionedStatsLRURegionEntryHeap.java | 46 +-
.../VersionedStatsLRURegionEntryHeapIntKey.java | 177 +-
...VersionedStatsLRURegionEntryHeapLongKey.java | 178 +-
...rsionedStatsLRURegionEntryHeapObjectKey.java | 177 +-
...sionedStatsLRURegionEntryHeapStringKey1.java | 204 +-
...sionedStatsLRURegionEntryHeapStringKey2.java | 206 +-
...VersionedStatsLRURegionEntryHeapUUIDKey.java | 183 +-
.../VersionedStatsLRURegionEntryOffHeap.java | 49 +-
...rsionedStatsLRURegionEntryOffHeapIntKey.java | 211 +-
...sionedStatsLRURegionEntryOffHeapLongKey.java | 214 +-
...onedStatsLRURegionEntryOffHeapObjectKey.java | 213 +-
...nedStatsLRURegionEntryOffHeapStringKey1.java | 240 +-
...nedStatsLRURegionEntryOffHeapStringKey2.java | 242 +-
...sionedStatsLRURegionEntryOffHeapUUIDKey.java | 219 +-
.../cache/VersionedStatsRegionEntry.java | 63 +-
.../cache/VersionedStatsRegionEntryHeap.java | 39 +-
.../VersionedStatsRegionEntryHeapIntKey.java | 116 +-
.../VersionedStatsRegionEntryHeapLongKey.java | 116 +-
.../VersionedStatsRegionEntryHeapObjectKey.java | 119 +-
...VersionedStatsRegionEntryHeapStringKey1.java | 146 +-
...VersionedStatsRegionEntryHeapStringKey2.java | 148 +-
.../VersionedStatsRegionEntryHeapUUIDKey.java | 121 +-
.../cache/VersionedStatsRegionEntryOffHeap.java | 48 +-
.../VersionedStatsRegionEntryOffHeapIntKey.java | 152 +-
...VersionedStatsRegionEntryOffHeapLongKey.java | 152 +-
...rsionedStatsRegionEntryOffHeapObjectKey.java | 152 +-
...sionedStatsRegionEntryOffHeapStringKey1.java | 179 +-
...sionedStatsRegionEntryOffHeapStringKey2.java | 181 +-
...VersionedStatsRegionEntryOffHeapUUIDKey.java | 157 +-
.../cache/VersionedThinDiskLRURegionEntry.java | 62 +-
.../VersionedThinDiskLRURegionEntryHeap.java | 48 +-
...rsionedThinDiskLRURegionEntryHeapIntKey.java | 245 +-
...sionedThinDiskLRURegionEntryHeapLongKey.java | 248 +-
...onedThinDiskLRURegionEntryHeapObjectKey.java | 247 +-
...nedThinDiskLRURegionEntryHeapStringKey1.java | 274 +-
...nedThinDiskLRURegionEntryHeapStringKey2.java | 276 +-
...sionedThinDiskLRURegionEntryHeapUUIDKey.java | 253 +-
.../VersionedThinDiskLRURegionEntryOffHeap.java | 49 +-
...onedThinDiskLRURegionEntryOffHeapIntKey.java | 281 +-
...nedThinDiskLRURegionEntryOffHeapLongKey.java | 281 +-
...dThinDiskLRURegionEntryOffHeapObjectKey.java | 280 +-
...ThinDiskLRURegionEntryOffHeapStringKey1.java | 307 +-
...ThinDiskLRURegionEntryOffHeapStringKey2.java | 309 +-
...nedThinDiskLRURegionEntryOffHeapUUIDKey.java | 286 +-
.../cache/VersionedThinDiskRegionEntry.java | 62 +-
.../cache/VersionedThinDiskRegionEntryHeap.java | 48 +-
.../VersionedThinDiskRegionEntryHeapIntKey.java | 182 +-
...VersionedThinDiskRegionEntryHeapLongKey.java | 183 +-
...rsionedThinDiskRegionEntryHeapObjectKey.java | 182 +-
...sionedThinDiskRegionEntryHeapStringKey1.java | 211 +-
...sionedThinDiskRegionEntryHeapStringKey2.java | 213 +-
...VersionedThinDiskRegionEntryHeapUUIDKey.java | 188 +-
.../VersionedThinDiskRegionEntryOffHeap.java | 49 +-
...rsionedThinDiskRegionEntryOffHeapIntKey.java | 218 +-
...sionedThinDiskRegionEntryOffHeapLongKey.java | 221 +-
...onedThinDiskRegionEntryOffHeapObjectKey.java | 220 +-
...nedThinDiskRegionEntryOffHeapStringKey1.java | 247 +-
...nedThinDiskRegionEntryOffHeapStringKey2.java | 249 +-
...sionedThinDiskRegionEntryOffHeapUUIDKey.java | 226 +-
.../cache/VersionedThinLRURegionEntry.java | 72 +-
.../cache/VersionedThinLRURegionEntryHeap.java | 43 +-
.../VersionedThinLRURegionEntryHeapIntKey.java | 148 +-
.../VersionedThinLRURegionEntryHeapLongKey.java | 149 +-
...ersionedThinLRURegionEntryHeapObjectKey.java | 148 +-
...rsionedThinLRURegionEntryHeapStringKey1.java | 175 +-
...rsionedThinLRURegionEntryHeapStringKey2.java | 177 +-
.../VersionedThinLRURegionEntryHeapUUIDKey.java | 154 +-
.../VersionedThinLRURegionEntryOffHeap.java | 48 +-
...ersionedThinLRURegionEntryOffHeapIntKey.java | 182 +-
...rsionedThinLRURegionEntryOffHeapLongKey.java | 182 +-
...ionedThinLRURegionEntryOffHeapObjectKey.java | 184 +-
...onedThinLRURegionEntryOffHeapStringKey1.java | 211 +-
...onedThinLRURegionEntryOffHeapStringKey2.java | 213 +-
...rsionedThinLRURegionEntryOffHeapUUIDKey.java | 187 +-
.../cache/VersionedThinRegionEntry.java | 61 +-
.../cache/VersionedThinRegionEntryHeap.java | 37 +-
.../VersionedThinRegionEntryHeapIntKey.java | 89 +-
.../VersionedThinRegionEntryHeapLongKey.java | 89 +-
.../VersionedThinRegionEntryHeapObjectKey.java | 90 +-
.../VersionedThinRegionEntryHeapStringKey1.java | 117 +-
.../VersionedThinRegionEntryHeapStringKey2.java | 119 +-
.../VersionedThinRegionEntryHeapUUIDKey.java | 94 +-
.../cache/VersionedThinRegionEntryOffHeap.java | 48 +-
.../VersionedThinRegionEntryOffHeapIntKey.java | 123 +-
.../VersionedThinRegionEntryOffHeapLongKey.java | 123 +-
...ersionedThinRegionEntryOffHeapObjectKey.java | 123 +-
...rsionedThinRegionEntryOffHeapStringKey1.java | 150 +-
...rsionedThinRegionEntryOffHeapStringKey2.java | 152 +-
.../VersionedThinRegionEntryOffHeapUUIDKey.java | 128 +-
.../internal/cache/WrappedCallbackArgument.java | 43 +-
.../cache/WrappedRegionMembershipListener.java | 143 +-
.../CompressedCachedDeserializable.java | 82 +-
.../SnappyCompressedCachedDeserializable.java | 46 +-
.../internal/cache/control/FilterByPath.java | 36 +-
.../cache/control/HeapMemoryMonitor.java | 442 +-
.../cache/control/InternalResourceManager.java | 316 +-
.../internal/cache/control/MemoryEvent.java | 54 +-
.../cache/control/MemoryThresholds.java | 155 +-
.../cache/control/OffHeapMemoryMonitor.java | 272 +-
.../control/PartitionRebalanceDetailsImpl.java | 79 +-
.../cache/control/RebalanceOperationImpl.java | 150 +-
.../cache/control/RebalanceResultsImpl.java | 28 +-
.../internal/cache/control/RegionFilter.java | 22 +-
.../internal/cache/control/ResourceAdvisor.java | 239 +-
.../internal/cache/control/ResourceEvent.java | 26 +-
.../cache/control/ResourceListener.java | 34 +-
.../cache/control/ResourceManagerStats.java | 425 +-
.../internal/cache/control/ResourceMonitor.java | 37 +-
.../cache/execute/AbstractExecution.java | 288 +-
.../cache/execute/BucketMovedException.java | 82 +-
.../cache/execute/DefaultResultCollector.java | 81 +-
.../DistributedRegionFunctionExecutor.java | 210 +-
.../DistributedRegionFunctionResultSender.java | 164 +-
.../DistributedRegionFunctionResultWaiter.java | 45 +-
.../cache/execute/FunctionContextImpl.java | 51 +-
.../execute/FunctionExecutionNodePruner.java | 158 +-
.../cache/execute/FunctionRemoteContext.java | 53 +-
.../cache/execute/FunctionServiceStats.java | 285 +-
.../internal/cache/execute/FunctionStats.java | 387 +-
.../FunctionStreamingResultCollector.java | 400 +-
.../cache/execute/InternalExecution.java | 61 +-
.../execute/InternalFunctionException.java | 40 +-
...ternalFunctionInvocationTargetException.java | 56 +-
.../cache/execute/InternalFunctionService.java | 139 +-
.../execute/InternalRegionFunctionContext.java | 59 +-
.../cache/execute/InternalResultSender.java | 24 +-
.../cache/execute/LocalResultCollector.java | 33 +-
.../cache/execute/LocalResultCollectorImpl.java | 99 +-
.../cache/execute/MemberFunctionExecutor.java | 119 +-
.../execute/MemberFunctionResultSender.java | 165 +-
.../execute/MemberFunctionResultWaiter.java | 41 +-
.../cache/execute/MemberMappedArgument.java | 60 +-
.../execute/MultiRegionFunctionContext.java | 34 +-
.../execute/MultiRegionFunctionContextImpl.java | 34 +-
.../execute/MultiRegionFunctionExecutor.java | 156 +-
.../MultiRegionFunctionResultWaiter.java | 48 +-
.../geode/internal/cache/execute/NoResult.java | 48 +-
.../PartitionedRegionFunctionExecutor.java | 188 +-
.../PartitionedRegionFunctionResultSender.java | 282 +-
.../PartitionedRegionFunctionResultWaiter.java | 99 +-
.../execute/RegionFunctionContextImpl.java | 57 +-
.../cache/execute/ServerFunctionExecutor.java | 224 +-
.../execute/ServerRegionFunctionExecutor.java | 293 +-
.../ServerToClientFunctionResultSender.java | 129 +-
.../ServerToClientFunctionResultSender65.java | 142 +-
.../execute/StreamingFunctionOperation.java | 72 +-
.../util/FindRestEnabledServersFunction.java | 61 +-
.../util/SynchronizedResultCollector.java | 32 +-
.../internal/cache/extension/Extensible.java | 27 +-
.../internal/cache/extension/Extension.java | 43 +-
.../cache/extension/ExtensionPoint.java | 31 +-
.../cache/extension/SimpleExtensionPoint.java | 41 +-
.../geode/internal/cache/ha/HAContainerMap.java | 58 +-
.../internal/cache/ha/HAContainerRegion.java | 74 +-
.../internal/cache/ha/HAContainerWrapper.java | 26 +-
.../geode/internal/cache/ha/HARegionQueue.java | 2819 ++---
.../cache/ha/HARegionQueueAttributes.java | 70 +-
.../internal/cache/ha/HARegionQueueStats.java | 183 +-
.../internal/cache/ha/QueueRemovalMessage.java | 178 +-
.../internal/cache/ha/ThreadIdentifier.java | 175 +-
.../cache/locks/TXLessorDepartureHandler.java | 84 +-
.../geode/internal/cache/locks/TXLockBatch.java | 81 +-
.../geode/internal/cache/locks/TXLockId.java | 25 +-
.../internal/cache/locks/TXLockIdImpl.java | 83 +-
.../internal/cache/locks/TXLockService.java | 112 +-
.../internal/cache/locks/TXLockServiceImpl.java | 214 +-
.../geode/internal/cache/locks/TXLockToken.java | 102 +-
.../locks/TXLockUpdateParticipantsMessage.java | 94 +-
.../locks/TXOriginatorRecoveryProcessor.java | 278 +-
.../locks/TXRecoverGrantorMessageProcessor.java | 126 +-
.../cache/locks/TXRegionLockRequest.java | 34 +-
.../geode/internal/cache/lru/EnableLRU.java | 60 +-
.../geode/internal/cache/lru/HeapEvictor.java | 302 +-
.../cache/lru/HeapLRUCapacityController.java | 158 +-
.../internal/cache/lru/HeapLRUStatistics.java | 60 +-
.../geode/internal/cache/lru/LRUAlgorithm.java | 238 +-
.../cache/lru/LRUCapacityController.java | 286 +-
.../geode/internal/cache/lru/LRUClockNode.java | 45 +-
.../geode/internal/cache/lru/LRUEntry.java | 27 +-
.../internal/cache/lru/LRUMapCallbacks.java | 51 +-
.../geode/internal/cache/lru/LRUStatistics.java | 128 +-
.../cache/lru/MemLRUCapacityController.java | 442 +-
.../internal/cache/lru/NewLIFOClockHand.java | 139 +-
.../internal/cache/lru/NewLRUClockHand.java | 326 +-
.../internal/cache/lru/OffHeapEvictor.java | 74 +-
.../geode/internal/cache/lru/Sizeable.java | 78 +-
.../operations/ContainsKeyOperationContext.java | 33 +-
.../AllBucketProfilesUpdateMessage.java | 95 +-
.../partitioned/BecomePrimaryBucketMessage.java | 178 +-
.../internal/cache/partitioned/Bucket.java | 62 +-
.../cache/partitioned/BucketBackupMessage.java | 82 +-
.../cache/partitioned/BucketCountLoadProbe.java | 52 +-
.../partitioned/BucketProfileUpdateMessage.java | 112 +-
.../cache/partitioned/BucketSizeMessage.java | 186 +-
.../partitioned/ColocatedRegionDetails.java | 42 +-
.../partitioned/ContainsKeyValueMessage.java | 197 +-
.../cache/partitioned/CreateBucketMessage.java | 239 +-
.../partitioned/CreateMissingBucketsTask.java | 49 +-
.../partitioned/DeposePrimaryBucketMessage.java | 164 +-
.../cache/partitioned/DestroyMessage.java | 386 +-
.../DestroyRegionOnDataStoreMessage.java | 70 +-
.../partitioned/DumpAllPRConfigMessage.java | 48 +-
.../cache/partitioned/DumpB2NRegion.java | 218 +-
.../cache/partitioned/DumpBucketsMessage.java | 64 +-
.../partitioned/EndBucketCreationMessage.java | 86 +-
.../partitioned/FetchBulkEntriesMessage.java | 263 +-
.../cache/partitioned/FetchEntriesMessage.java | 461 +-
.../cache/partitioned/FetchEntryMessage.java | 234 +-
.../cache/partitioned/FetchKeysMessage.java | 362 +-
.../FetchPartitionDetailsMessage.java | 213 +-
.../cache/partitioned/FlushMessage.java | 105 +-
.../internal/cache/partitioned/GetMessage.java | 397 +-
.../partitioned/IdentityRequestMessage.java | 226 +-
.../partitioned/IdentityUpdateMessage.java | 111 +-
.../cache/partitioned/IndexCreationMsg.java | 298 +-
.../cache/partitioned/InterestEventMessage.java | 155 +-
.../cache/partitioned/InternalPRInfo.java | 32 +-
.../partitioned/InternalPartitionDetails.java | 32 +-
.../cache/partitioned/InvalidateMessage.java | 309 +-
.../internal/cache/partitioned/LoadProbe.java | 31 +-
.../internal/cache/partitioned/LockObject.java | 25 +-
.../partitioned/ManageBackupBucketMessage.java | 279 +-
.../cache/partitioned/ManageBucketMessage.java | 277 +-
.../cache/partitioned/MoveBucketMessage.java | 168 +-
.../cache/partitioned/OfflineMemberDetails.java | 33 +-
.../partitioned/OfflineMemberDetailsImpl.java | 43 +-
.../cache/partitioned/PREntriesIterator.java | 27 +-
.../PRFunctionStreamingResultCollector.java | 380 +-
.../internal/cache/partitioned/PRLoad.java | 75 +-
.../PRLocallyDestroyedException.java | 31 +-
.../cache/partitioned/PRSanityCheckMessage.java | 96 +-
.../cache/partitioned/PRTombstoneMessage.java | 90 +-
.../PRUpdateEntryVersionMessage.java | 94 +-
.../partitioned/PartitionMemberInfoImpl.java | 79 +-
.../cache/partitioned/PartitionMessage.java | 500 +-
.../PartitionMessageWithDirectReply.java | 66 +-
.../partitioned/PartitionRegionInfoImpl.java | 64 +-
...rtitionedRegionFunctionStreamingMessage.java | 132 +-
.../partitioned/PartitionedRegionObserver.java | 36 +-
.../PartitionedRegionObserverAdapter.java | 42 +-
.../PartitionedRegionObserverHolder.java | 44 +-
.../PartitionedRegionRebalanceOp.java | 502 +-
.../partitioned/PrimaryRequestMessage.java | 117 +-
.../cache/partitioned/PutAllPRMessage.java | 684 +-
.../internal/cache/partitioned/PutMessage.java | 879 +-
.../cache/partitioned/QueryMessage.java | 158 +-
.../cache/partitioned/RecoveryRunnable.java | 47 +-
.../RedundancyAlreadyMetException.java | 22 +-
.../cache/partitioned/RedundancyLogger.java | 240 +-
.../cache/partitioned/RegionAdvisor.java | 1048 +-
.../partitioned/RemoteFetchKeysMessage.java | 282 +-
.../cache/partitioned/RemoteSizeMessage.java | 182 +-
.../cache/partitioned/RemoveAllPRMessage.java | 595 +-
.../cache/partitioned/RemoveBucketMessage.java | 163 +-
.../cache/partitioned/RemoveIndexesMessage.java | 358 +-
.../internal/cache/partitioned/SizeMessage.java | 213 +-
.../cache/partitioned/SizedBasedLoadProbe.java | 59 +-
.../StreamingPartitionOperation.java | 308 +-
.../partitioned/rebalance/BucketOperator.java | 91 +-
.../rebalance/BucketOperatorImpl.java | 54 +-
.../rebalance/BucketOperatorWrapper.java | 84 +-
.../rebalance/CompositeDirector.java | 85 +-
.../rebalance/ExplicitMoveDirector.java | 86 +-
.../partitioned/rebalance/FPRDirector.java | 56 +-
.../partitioned/rebalance/MoveBuckets.java | 29 +-
.../partitioned/rebalance/MovePrimaries.java | 31 +-
.../partitioned/rebalance/MovePrimariesFPR.java | 49 +-
.../rebalance/ParallelBucketOperator.java | 137 +-
.../rebalance/PartitionedRegionLoadModel.java | 1042 +-
.../rebalance/PercentageMoveDirector.java | 139 +-
.../rebalance/RebalanceDirector.java | 77 +-
.../rebalance/RebalanceDirectorAdapter.java | 29 +-
.../rebalance/RemoveOverRedundancy.java | 53 +-
.../rebalance/SatisfyRedundancy.java | 58 +-
.../rebalance/SatisfyRedundancyFPR.java | 49 +-
.../rebalance/SimulatedBucketOperator.java | 43 +-
.../cache/persistence/BackupInspector.java | 180 +-
.../cache/persistence/BackupManager.java | 224 +-
.../cache/persistence/BytesAndBits.java | 23 +-
.../cache/persistence/CanonicalIdHolder.java | 58 +-
.../CreatePersistentRegionProcessor.java | 43 +-
.../cache/persistence/DiskExceptionHandler.java | 32 +-
.../persistence/DiskInitFileInterpreter.java | 47 +-
.../cache/persistence/DiskInitFileParser.java | 859 +-
.../cache/persistence/DiskRecoveryStore.java | 50 +-
.../cache/persistence/DiskRegionView.java | 99 +-
.../cache/persistence/DiskStoreFilter.java | 43 +-
.../internal/cache/persistence/DiskStoreID.java | 59 +-
.../persistence/MembershipFlushRequest.java | 67 +-
.../persistence/MembershipViewRequest.java | 139 +-
.../internal/cache/persistence/OplogType.java | 33 +-
.../cache/persistence/PRPersistentConfig.java | 29 +-
.../cache/persistence/PersistenceAdvisor.java | 148 +-
.../persistence/PersistenceAdvisorImpl.java | 1047 +-
.../persistence/PersistenceObserverHolder.java | 87 +-
.../cache/persistence/PersistentMemberID.java | 63 +-
.../persistence/PersistentMemberManager.java | 199 +-
.../persistence/PersistentMemberPattern.java | 118 +-
.../persistence/PersistentMemberState.java | 31 +-
.../cache/persistence/PersistentMemberView.java | 112 +-
.../persistence/PersistentMembershipView.java | 72 +-
.../persistence/PersistentStateListener.java | 42 +-
.../PersistentStateQueryMessage.java | 150 +-
.../PersistentStateQueryResults.java | 50 +-
.../PrepareNewPersistentMemberMessage.java | 83 +-
.../RemovePersistentMemberMessage.java | 93 +-
.../cache/persistence/RestoreScript.java | 136 +-
.../persistence/UninterruptibleFileChannel.java | 25 +-
.../UninterruptibleRandomAccessFile.java | 58 +-
.../persistence/query/CloseableIterator.java | 27 +-
.../persistence/query/IdentityExtractor.java | 22 +-
.../cache/persistence/query/IndexMap.java | 121 +-
.../cache/persistence/query/ResultBag.java | 50 +-
.../cache/persistence/query/ResultList.java | 46 +-
.../cache/persistence/query/ResultMap.java | 82 +-
.../cache/persistence/query/ResultSet.java | 51 +-
.../persistence/query/SortKeyExtractor.java | 22 +-
.../query/TemporaryResultSetFactory.java | 64 +-
.../persistence/query/mock/ByteComparator.java | 55 +-
.../mock/CachedDeserializableComparator.java | 40 +-
.../persistence/query/mock/IndexMapImpl.java | 145 +-
.../persistence/query/mock/ItrAdapter.java | 35 +-
.../query/mock/NaturalComparator.java | 22 +-
.../cache/persistence/query/mock/Pair.java | 30 +-
.../persistence/query/mock/PairComparator.java | 29 +-
.../persistence/query/mock/ResultListImpl.java | 31 +-
.../query/mock/ReverseComparator.java | 22 +-
.../query/mock/SortedResultBagImpl.java | 33 +-
.../query/mock/SortedResultMapImpl.java | 81 +-
.../query/mock/SortedResultSetImpl.java | 31 +-
.../region/entry/RegionEntryFactoryBuilder.java | 160 +-
.../snapshot/CacheSnapshotServiceImpl.java | 72 +-
.../internal/cache/snapshot/ClientExporter.java | 114 +-
.../cache/snapshot/ExportedRegistry.java | 40 +-
.../internal/cache/snapshot/FlowController.java | 131 +-
.../internal/cache/snapshot/GFSnapshot.java | 174 +-
.../internal/cache/snapshot/LocalExporter.java | 32 +-
.../snapshot/RegionSnapshotServiceImpl.java | 224 +-
.../cache/snapshot/SnapshotFileMapper.java | 81 +-
.../cache/snapshot/SnapshotOptionsImpl.java | 70 +-
.../internal/cache/snapshot/SnapshotPacket.java | 85 +-
.../cache/snapshot/WindowedExporter.java | 148 +-
.../geode/internal/cache/tier/Acceptor.java | 82 +-
.../internal/cache/tier/BatchException.java | 40 +-
.../internal/cache/tier/CachedRegionHelper.java | 48 +-
.../internal/cache/tier/ClientHandShake.java | 32 +-
.../geode/internal/cache/tier/Command.java | 22 +-
.../internal/cache/tier/ConnectionProxy.java | 25 +-
.../geode/internal/cache/tier/InterestType.java | 47 +-
.../cache/tier/InternalClientMembership.java | 432 +-
.../geode/internal/cache/tier/MessageType.java | 666 +-
.../cache/tier/sockets/AcceptorImpl.java | 1151 +-
.../cache/tier/sockets/BaseCommand.java | 1018 +-
.../cache/tier/sockets/BaseCommandQuery.java | 292 +-
.../cache/tier/sockets/CacheClientNotifier.java | 1896 ++-
.../tier/sockets/CacheClientNotifierStats.java | 187 +-
.../cache/tier/sockets/CacheClientProxy.java | 2091 ++--
.../tier/sockets/CacheClientProxyStats.java | 193 +-
.../cache/tier/sockets/CacheClientUpdater.java | 1158 +-
.../cache/tier/sockets/CacheServerHelper.java | 135 +-
.../cache/tier/sockets/CacheServerStats.java | 781 +-
.../cache/tier/sockets/ChunkedMessage.java | 399 +-
.../tier/sockets/ClientBlacklistProcessor.java | 85 +-
.../sockets/ClientDataSerializerMessage.java | 135 +-
.../cache/tier/sockets/ClientHealthMonitor.java | 571 +-
.../tier/sockets/ClientInstantiatorMessage.java | 136 +-
.../tier/sockets/ClientInterestMessageImpl.java | 163 +-
.../tier/sockets/ClientMarkerMessageImpl.java | 45 +-
.../cache/tier/sockets/ClientMessage.java | 29 +-
.../tier/sockets/ClientPingMessageImpl.java | 48 +-
.../tier/sockets/ClientProxyMembershipID.java | 339 +-
.../tier/sockets/ClientTombstoneMessage.java | 98 +-
.../cache/tier/sockets/ClientUpdateMessage.java | 102 +-
.../tier/sockets/ClientUpdateMessageImpl.java | 917 +-
.../cache/tier/sockets/ClientUserAuths.java | 217 +-
.../cache/tier/sockets/CommandInitializer.java | 193 +-
.../cache/tier/sockets/ConnectionListener.java | 52 +-
.../tier/sockets/ConnectionListenerAdapter.java | 35 +-
.../cache/tier/sockets/HAEventWrapper.java | 174 +-
.../internal/cache/tier/sockets/HandShake.java | 1170 +-
.../tier/sockets/InterestResultPolicyImpl.java | 27 +-
.../internal/cache/tier/sockets/Message.java | 432 +-
.../cache/tier/sockets/MessageStats.java | 26 +-
.../tier/sockets/MessageTooLargeException.java | 24 +-
.../cache/tier/sockets/ObjectPartList.java | 79 +-
.../cache/tier/sockets/ObjectPartList651.java | 67 +-
.../tier/sockets/OldClientSupportService.java | 28 +-
.../geode/internal/cache/tier/sockets/Part.java | 213 +-
.../RemoveClientFromBlacklistMessage.java | 54 +-
.../tier/sockets/SerializedObjectPartList.java | 64 +-
.../cache/tier/sockets/ServerConnection.java | 1247 +-
.../tier/sockets/ServerHandShakeProcessor.java | 257 +-
.../cache/tier/sockets/ServerQueueStatus.java | 115 +-
.../tier/sockets/ServerResponseMatrix.java | 115 +-
.../tier/sockets/UnregisterAllInterest.java | 32 +-
.../cache/tier/sockets/UserAuthAttributes.java | 70 +-
.../cache/tier/sockets/VersionedObjectList.java | 352 +-
.../cache/tier/sockets/command/AddPdxEnum.java | 30 +-
.../cache/tier/sockets/command/AddPdxType.java | 36 +-
.../cache/tier/sockets/command/ClearRegion.java | 52 +-
.../cache/tier/sockets/command/ClientReady.java | 41 +-
.../tier/sockets/command/CloseConnection.java | 50 +-
.../tier/sockets/command/CommitCommand.java | 79 +-
.../cache/tier/sockets/command/ContainsKey.java | 53 +-
.../tier/sockets/command/ContainsKey66.java | 53 +-
.../tier/sockets/command/CreateRegion.java | 55 +-
.../cache/tier/sockets/command/Default.java | 35 +-
.../cache/tier/sockets/command/Destroy.java | 72 +-
.../cache/tier/sockets/command/Destroy65.java | 130 +-
.../cache/tier/sockets/command/Destroy70.java | 232 +-
.../tier/sockets/command/DestroyRegion.java | 73 +-
.../tier/sockets/command/ExecuteFunction.java | 261 +-
.../tier/sockets/command/ExecuteFunction65.java | 110 +-
.../tier/sockets/command/ExecuteFunction66.java | 170 +-
.../tier/sockets/command/ExecuteFunction70.java | 56 +-
.../sockets/command/ExecuteRegionFunction.java | 105 +-
.../command/ExecuteRegionFunction61.java | 203 +-
.../command/ExecuteRegionFunction65.java | 141 +-
.../command/ExecuteRegionFunction66.java | 141 +-
.../command/ExecuteRegionFunctionSingleHop.java | 129 +-
.../sockets/command/GatewayReceiverCommand.java | 905 +-
.../cache/tier/sockets/command/Get70.java | 245 +-
.../cache/tier/sockets/command/GetAll.java | 82 +-
.../cache/tier/sockets/command/GetAll651.java | 85 +-
.../cache/tier/sockets/command/GetAll70.java | 99 +-
.../cache/tier/sockets/command/GetAllForRI.java | 43 +-
.../sockets/command/GetAllWithCallback.java | 242 +-
.../command/GetClientPRMetadataCommand.java | 74 +-
.../command/GetClientPRMetadataCommand66.java | 69 +-
.../GetClientPartitionAttributesCommand.java | 72 +-
.../GetClientPartitionAttributesCommand66.java | 92 +-
.../cache/tier/sockets/command/GetEntry70.java | 149 +-
.../tier/sockets/command/GetEntryCommand.java | 37 +-
.../sockets/command/GetFunctionAttribute.java | 41 +-
.../tier/sockets/command/GetPDXEnumById.java | 30 +-
.../tier/sockets/command/GetPDXIdForEnum.java | 30 +-
.../tier/sockets/command/GetPDXIdForType.java | 30 +-
.../tier/sockets/command/GetPDXTypeById.java | 30 +-
.../tier/sockets/command/GetPdxEnums70.java | 30 +-
.../tier/sockets/command/GetPdxTypes70.java | 30 +-
.../cache/tier/sockets/command/Invalid.java | 33 +-
.../cache/tier/sockets/command/Invalidate.java | 80 +-
.../tier/sockets/command/Invalidate70.java | 203 +-
.../cache/tier/sockets/command/KeySet.java | 64 +-
.../cache/tier/sockets/command/MakePrimary.java | 40 +-
.../tier/sockets/command/ManagementCommand.java | 22 +-
.../cache/tier/sockets/command/PeriodicAck.java | 38 +-
.../cache/tier/sockets/command/Ping.java | 34 +-
.../cache/tier/sockets/command/Put.java | 76 +-
.../cache/tier/sockets/command/Put61.java | 51 +-
.../cache/tier/sockets/command/Put65.java | 162 +-
.../cache/tier/sockets/command/Put70.java | 52 +-
.../cache/tier/sockets/command/PutAll.java | 151 +-
.../cache/tier/sockets/command/PutAll70.java | 232 +-
.../cache/tier/sockets/command/PutAll80.java | 897 +-
.../sockets/command/PutAllWithCallback.java | 35 +-
.../sockets/command/PutUserCredentials.java | 43 +-
.../cache/tier/sockets/command/Query.java | 53 +-
.../cache/tier/sockets/command/Query651.java | 69 +-
.../command/RegisterDataSerializers.java | 55 +-
.../sockets/command/RegisterInstantiators.java | 81 +-
.../tier/sockets/command/RegisterInterest.java | 102 +-
.../sockets/command/RegisterInterest61.java | 118 +-
.../sockets/command/RegisterInterestList.java | 242 +-
.../sockets/command/RegisterInterestList61.java | 143 +-
.../sockets/command/RegisterInterestList66.java | 261 +-
.../cache/tier/sockets/command/RemoveAll.java | 242 +-
.../tier/sockets/command/RemoveUserAuth.java | 51 +-
.../cache/tier/sockets/command/Request.java | 165 +-
.../tier/sockets/command/RequestEventValue.java | 82 +-
.../tier/sockets/command/RollbackCommand.java | 45 +-
.../cache/tier/sockets/command/Size.java | 45 +-
.../tier/sockets/command/TXFailoverCommand.java | 54 +-
.../command/TXSynchronizationCommand.java | 216 +-
.../sockets/command/UnregisterInterest.java | 85 +-
.../sockets/command/UnregisterInterestList.java | 79 +-
.../command/UpdateClientNotification.java | 69 +-
.../cache/tx/AbstractPeerTXRegionStub.java | 35 +-
.../internal/cache/tx/ClientTXRegionStub.java | 118 +-
.../internal/cache/tx/ClientTXStateStub.java | 126 +-
.../cache/tx/DistClientTXStateStub.java | 53 +-
.../internal/cache/tx/DistTxEntryEvent.java | 113 +-
.../geode/internal/cache/tx/DistTxKeyInfo.java | 32 +-
.../cache/tx/DistributedTXRegionStub.java | 296 +-
.../cache/tx/PartitionedTXRegionStub.java | 538 +-
.../geode/internal/cache/tx/TXRegionStub.java | 36 +-
.../cache/tx/TransactionalOperation.java | 197 +-
.../cache/versions/CompactVersionHolder.java | 47 +-
.../ConcurrentCacheModificationException.java | 75 +-
.../cache/versions/DiskRegionVersionVector.java | 55 +-
.../internal/cache/versions/DiskVersionTag.java | 47 +-
.../internal/cache/versions/RVVException.java | 147 +-
.../internal/cache/versions/RVVExceptionB.java | 566 +-
.../internal/cache/versions/RVVExceptionT.java | 504 +-
.../cache/versions/RegionVersionHolder.java | 427 +-
.../cache/versions/RegionVersionVector.java | 995 +-
.../cache/versions/VMRegionVersionVector.java | 68 +-
.../internal/cache/versions/VMVersionTag.java | 35 +-
.../internal/cache/versions/VersionHolder.java | 38 +-
.../internal/cache/versions/VersionSource.java | 34 +-
.../internal/cache/versions/VersionStamp.java | 184 +-
.../internal/cache/versions/VersionTag.java | 139 +-
.../internal/cache/vmotion/VMotionObserver.java | 25 +-
.../cache/vmotion/VMotionObserverAdapter.java | 35 +-
.../cache/vmotion/VMotionObserverHolder.java | 109 +-
.../cache/wan/AbstractGatewaySender.java | 663 +-
.../AbstractGatewaySenderEventProcessor.java | 648 +-
.../AsyncEventQueueConfigurationException.java | 49 +-
.../internal/cache/wan/BatchException70.java | 41 +-
.../cache/wan/DistributedSystemListener.java | 30 +-
.../cache/wan/GatewayEventFilterImpl.java | 22 +-
.../cache/wan/GatewayReceiverException.java | 47 +-
.../cache/wan/GatewayReceiverStats.java | 113 +-
.../cache/wan/GatewaySenderAdvisor.java | 451 +-
.../cache/wan/GatewaySenderAttributes.java | 58 +-
.../GatewaySenderConfigurationException.java | 26 +-
.../wan/GatewaySenderEventCallbackArgument.java | 108 +-
.../GatewaySenderEventCallbackDispatcher.java | 87 +-
.../cache/wan/GatewaySenderEventDispatcher.java | 31 +-
.../cache/wan/GatewaySenderEventImpl.java | 526 +-
.../cache/wan/GatewaySenderException.java | 49 +-
.../internal/cache/wan/GatewaySenderStats.java | 1410 ++-
.../cache/wan/InternalGatewaySenderFactory.java | 22 +-
.../cache/wan/TransportFilterServerSocket.java | 29 +-
.../cache/wan/TransportFilterSocket.java | 26 +-
.../cache/wan/TransportFilterSocketFactory.java | 31 +-
.../internal/cache/wan/WANServiceProvider.java | 45 +-
.../BucketRegionQueueUnavailableException.java | 35 +-
...rentParallelGatewaySenderEventProcessor.java | 228 +-
.../ConcurrentParallelGatewaySenderQueue.java | 178 +-
.../ParallelGatewaySenderEventProcessor.java | 164 +-
.../parallel/ParallelGatewaySenderQueue.java | 1140 +-
.../ParallelQueueBatchRemovalMessage.java | 128 +-
.../parallel/ParallelQueueRemovalMessage.java | 199 +-
.../cache/wan/parallel/RREventIDResolver.java | 45 +-
.../cache/wan/serial/BatchDestroyOperation.java | 126 +-
...urrentSerialGatewaySenderEventProcessor.java | 240 +-
.../SerialGatewaySenderEventProcessor.java | 416 +-
.../wan/serial/SerialGatewaySenderQueue.java | 575 +-
.../serial/SerialSecondaryGatewayListener.java | 129 +-
.../internal/cache/wan/spi/WANFactory.java | 22 +-
.../cache/xmlcache/AbstractXmlParser.java | 27 +-
.../cache/xmlcache/AsyncEventQueueCreation.java | 83 +-
.../cache/xmlcache/BindingCreation.java | 33 +-
.../internal/cache/xmlcache/CacheCreation.java | 690 +-
.../cache/xmlcache/CacheServerCreation.java | 123 +-
.../CacheTransactionManagerCreation.java | 104 +-
.../geode/internal/cache/xmlcache/CacheXml.java | 351 +-
.../cache/xmlcache/CacheXmlGenerator.java | 1843 ++-
.../internal/cache/xmlcache/CacheXmlParser.java | 2288 ++--
.../xmlcache/CacheXmlPropertyResolver.java | 87 +-
.../CacheXmlPropertyResolverHelper.java | 102 +-
.../cache/xmlcache/CacheXmlVersion.java | 94 +-
.../cache/xmlcache/ClientCacheCreation.java | 119 +-
.../cache/xmlcache/ClientHaQueueCreation.java | 81 +-
.../internal/cache/xmlcache/Declarable2.java | 29 +-
.../cache/xmlcache/DefaultEntityResolver2.java | 37 +-
.../xmlcache/DiskStoreAttributesCreation.java | 213 +-
.../cache/xmlcache/FunctionServiceCreation.java | 27 +-
.../cache/xmlcache/GatewayReceiverCreation.java | 75 +-
.../cache/xmlcache/GeodeEntityResolver.java | 33 +-
.../cache/xmlcache/IndexCreationData.java | 34 +-
.../ParallelAsyncEventQueueCreation.java | 48 +-
.../xmlcache/ParallelGatewaySenderCreation.java | 52 +-
.../cache/xmlcache/PivotalEntityResolver.java | 33 +-
.../cache/xmlcache/PropertyResolver.java | 35 +-
.../xmlcache/RegionAttributesCreation.java | 534 +-
.../internal/cache/xmlcache/RegionCreation.java | 455 +-
.../cache/xmlcache/ResourceManagerCreation.java | 90 +-
.../xmlcache/SerialAsyncEventQueueCreation.java | 50 +-
.../xmlcache/SerialGatewaySenderCreation.java | 50 +-
.../cache/xmlcache/SerializerCreation.java | 73 +-
.../internal/cache/xmlcache/XmlGenerator.java | 30 +-
.../cache/xmlcache/XmlGeneratorUtils.java | 147 +-
.../internal/cache/xmlcache/XmlParser.java | 30 +-
.../apache/geode/internal/concurrent/AL.java | 57 +-
.../geode/internal/concurrent/AtomicLong5.java | 33 +-
.../geode/internal/concurrent/Atomics.java | 49 +-
.../concurrent/CompactConcurrentHashSet2.java | 4833 ++++---
.../internal/concurrent/ConcurrentHashSet.java | 67 +-
.../apache/geode/internal/concurrent/LI.java | 45 +-
.../geode/internal/concurrent/MapCallback.java | 294 +-
.../internal/concurrent/MapCallbackAdapter.java | 67 +-
.../geode/internal/concurrent/MapResult.java | 36 +-
.../internal/datasource/AbstractDataSource.java | 82 +-
.../internal/datasource/AbstractPoolCache.java | 284 +-
.../ClientConnectionFactoryWrapper.java | 30 +-
.../internal/datasource/ConfigProperty.java | 31 +-
.../ConfiguredDataSourceProperties.java | 57 +-
.../ConnectionEventListenerAdaptor.java | 60 +-
.../datasource/ConnectionPoolCache.java | 30 +-
.../datasource/ConnectionPoolCacheImpl.java | 67 +-
.../internal/datasource/ConnectionProvider.java | 25 +-
.../datasource/ConnectionProviderException.java | 33 +-
.../datasource/DataSourceCreateException.java | 33 +-
.../internal/datasource/DataSourceFactory.java | 297 +-
.../datasource/DataSourceResources.java | 31 +-
.../FacetsJCAConnectionManagerImpl.java | 116 +-
.../datasource/GemFireBasicDataSource.java | 95 +-
.../datasource/GemFireConnPooledDataSource.java | 132 +-
.../GemFireConnectionPoolManager.java | 51 +-
.../GemFireTransactionDataSource.java | 155 +-
.../datasource/JCAConnectionManagerImpl.java | 112 +-
.../datasource/ManagedPoolCacheImpl.java | 49 +-
.../internal/datasource/PoolException.java | 37 +-
.../internal/datasource/TranxPoolCacheImpl.java | 65 +-
.../org/apache/geode/internal/hll/Bits.java | 51 +-
.../internal/hll/CardinalityMergeException.java | 20 +-
.../apache/geode/internal/hll/HyperLogLog.java | 121 +-
.../geode/internal/hll/HyperLogLogPlus.java | 1359 +-
.../org/apache/geode/internal/hll/IBuilder.java | 18 +-
.../apache/geode/internal/hll/ICardinality.java | 102 +-
.../apache/geode/internal/hll/MurmurHash.java | 397 +-
.../apache/geode/internal/hll/RegisterSet.java | 170 +-
.../i18n/AbstractStringIdResourceBundle.java | 118 +-
.../geode/internal/i18n/LocalizedStrings.java | 11118 +++++++++++------
.../apache/geode/internal/i18n/StringId.java | 48 +-
.../internal/io/CompositeOutputStream.java | 84 +-
.../geode/internal/io/CompositePrintStream.java | 39 +-
.../geode/internal/io/TeeOutputStream.java | 38 +-
.../geode/internal/io/TeePrintStream.java | 28 +-
.../apache/geode/internal/jndi/ContextImpl.java | 462 +-
.../jndi/InitialContextFactoryImpl.java | 68 +-
.../apache/geode/internal/jndi/JNDIInvoker.java | 310 +-
.../geode/internal/jndi/NameParserImpl.java | 30 +-
.../geode/internal/jta/GlobalTransaction.java | 474 +-
.../geode/internal/jta/TransactionImpl.java | 180 +-
.../internal/jta/TransactionManagerImpl.java | 610 +-
.../geode/internal/jta/TransactionUtils.java | 30 +-
.../geode/internal/jta/UserTransactionImpl.java | 52 +-
.../org/apache/geode/internal/jta/XidImpl.java | 30 +-
.../apache/geode/internal/lang/ClassUtils.java | 76 +-
.../org/apache/geode/internal/lang/Filter.java | 26 +-
.../geode/internal/lang/InOutParameter.java | 47 +-
.../apache/geode/internal/lang/Initable.java | 34 +-
.../apache/geode/internal/lang/Initializer.java | 32 +-
.../internal/lang/MutableIdentifiable.java | 31 +-
.../apache/geode/internal/lang/ObjectUtils.java | 116 +-
.../apache/geode/internal/lang/Orderable.java | 40 +-
.../org/apache/geode/internal/lang/Ordered.java | 31 +-
.../apache/geode/internal/lang/StringUtils.java | 216 +-
.../apache/geode/internal/lang/SystemUtils.java | 122 +-
.../apache/geode/internal/lang/ThreadUtils.java | 78 +-
.../geode/internal/lang/ThrowableUtils.java | 52 +-
.../geode/internal/logging/DateFormatter.java | 44 +-
.../geode/internal/logging/DebugLogWriter.java | 94 +-
.../internal/logging/GemFireFormatter.java | 59 +-
.../geode/internal/logging/GemFireHandler.java | 39 +-
.../geode/internal/logging/GemFireLevel.java | 97 +-
.../internal/logging/InternalLogWriter.java | 153 +-
.../geode/internal/logging/LocalLogWriter.java | 150 +-
.../geode/internal/logging/LogConfig.java | 56 +-
.../geode/internal/logging/LogFileParser.java | 335 +-
.../geode/internal/logging/LogService.java | 94 +-
.../internal/logging/LogWriterFactory.java | 67 +-
.../geode/internal/logging/LogWriterImpl.java | 1741 +--
.../internal/logging/LoggingThreadGroup.java | 229 +-
.../internal/logging/ManagerLogWriter.java | 1007 +-
.../geode/internal/logging/MergeLogFiles.java | 605 +-
.../geode/internal/logging/PureLogWriter.java | 455 +-
.../logging/SecurityLocalLogWriter.java | 67 +-
.../internal/logging/SecurityLogConfig.java | 26 +-
.../internal/logging/SecurityLogWriter.java | 52 +-
.../logging/SecurityManagerLogWriter.java | 51 +-
.../geode/internal/logging/SortLogFile.java | 95 +-
.../internal/logging/StandardErrorPrinter.java | 24 +-
.../internal/logging/StandardOutputPrinter.java | 26 +-
.../internal/logging/log4j/AlertAppender.java | 168 +-
.../internal/logging/log4j/AppenderContext.java | 54 +-
.../internal/logging/log4j/ConfigLocator.java | 44 +-
.../internal/logging/log4j/Configurator.java | 46 +-
.../internal/logging/log4j/FastLogger.java | 39 +-
.../internal/logging/log4j/GemFireLogger.java | 646 +-
.../logging/log4j/LocalizedMessage.java | 40 +-
.../geode/internal/logging/log4j/LogMarker.java | 126 +-
.../logging/log4j/LogWriterAppender.java | 100 +-
.../logging/log4j/LogWriterAppenders.java | 167 +-
.../internal/logging/log4j/LogWriterLogger.java | 818 +-
.../logging/log4j/ThreadIdPatternConverter.java | 36 +-
.../message/GemFireParameterizedMessage.java | 685 +-
.../GemFireParameterizedMessageFactory.java | 67 +-
.../geode/internal/memcached/Command.java | 206 +-
.../internal/memcached/CommandProcessor.java | 31 +-
.../internal/memcached/ConnectionHandler.java | 47 +-
.../geode/internal/memcached/KeyWrapper.java | 34 +-
.../apache/geode/internal/memcached/Reply.java | 52 +-
.../geode/internal/memcached/RequestReader.java | 75 +-
.../internal/memcached/ResponseStatus.java | 24 +-
.../geode/internal/memcached/ValueWrapper.java | 70 +-
.../memcached/commands/AbstractCommand.java | 70 +-
.../internal/memcached/commands/AddCommand.java | 40 +-
.../memcached/commands/AddQCommand.java | 22 +-
.../memcached/commands/AppendCommand.java | 26 +-
.../memcached/commands/AppendQCommand.java | 22 +-
.../internal/memcached/commands/CASCommand.java | 36 +-
.../memcached/commands/ClientError.java | 30 +-
.../memcached/commands/DecrementCommand.java | 56 +-
.../memcached/commands/DecrementQCommand.java | 22 +-
.../memcached/commands/DeleteCommand.java | 33 +-
.../memcached/commands/DeleteQCommand.java | 22 +-
.../memcached/commands/FlushAllCommand.java | 42 +-
.../memcached/commands/FlushAllQCommand.java | 22 +-
.../internal/memcached/commands/GATCommand.java | 22 +-
.../memcached/commands/GATQCommand.java | 22 +-
.../internal/memcached/commands/GetCommand.java | 62 +-
.../memcached/commands/GetKCommand.java | 24 +-
.../memcached/commands/GetKQCommand.java | 22 +-
.../memcached/commands/GetQCommand.java | 22 +-
.../memcached/commands/IncrementCommand.java | 62 +-
.../memcached/commands/IncrementQCommand.java | 22 +-
.../memcached/commands/NoOpCommand.java | 25 +-
.../memcached/commands/NotSupportedCommand.java | 25 +-
.../memcached/commands/PrependCommand.java | 26 +-
.../memcached/commands/PrependQCommand.java | 22 +-
.../memcached/commands/QuitCommand.java | 31 +-
.../memcached/commands/QuitQCommand.java | 22 +-
.../memcached/commands/ReplaceCommand.java | 39 +-
.../memcached/commands/ReplaceQCommand.java | 22 +-
.../internal/memcached/commands/SetCommand.java | 35 +-
.../memcached/commands/SetQCommand.java | 22 +-
.../memcached/commands/StatsCommand.java | 30 +-
.../memcached/commands/StorageCommand.java | 119 +-
.../memcached/commands/TouchCommand.java | 31 +-
.../memcached/commands/VerbosityCommand.java | 29 +-
.../memcached/commands/VersionCommand.java | 24 +-
.../modules/util/RegionConfiguration.java | 123 +-
.../internal/net/SSLConfigurationFactory.java | 95 +-
.../apache/geode/internal/net/SocketCloser.java | 147 +-
.../geode/internal/net/SocketCreator.java | 381 +-
.../internal/net/SocketCreatorFactory.java | 69 +-
.../apache/geode/internal/net/SocketUtils.java | 45 +-
.../internal/offheap/AbstractStoredObject.java | 44 +-
.../offheap/AddressableMemoryManager.java | 108 +-
.../apache/geode/internal/offheap/DataType.java | 420 +-
...DisconnectingOutOfOffHeapMemoryListener.java | 59 +-
.../apache/geode/internal/offheap/Fragment.java | 52 +-
.../geode/internal/offheap/FreeListManager.java | 401 +-
.../internal/offheap/LifecycleListener.java | 59 +-
.../geode/internal/offheap/MemoryAllocator.java | 57 +-
.../internal/offheap/MemoryAllocatorImpl.java | 286 +-
.../geode/internal/offheap/MemoryBlock.java | 50 +-
.../geode/internal/offheap/MemoryBlockNode.java | 61 +-
.../geode/internal/offheap/MemoryInspector.java | 30 +-
.../internal/offheap/MemoryInspectorImpl.java | 26 +-
.../internal/offheap/MemoryUsageListener.java | 22 +-
.../geode/internal/offheap/OffHeapHelper.java | 59 +-
.../internal/offheap/OffHeapMemoryStats.java | 47 +-
.../offheap/OffHeapRegionEntryHelper.java | 252 +-
.../geode/internal/offheap/OffHeapStorage.java | 183 +-
.../internal/offheap/OffHeapStoredObject.java | 1308 +-
.../OffHeapStoredObjectAddressStack.java | 56 +-
.../offheap/OffHeapStoredObjectSlice.java | 33 +-
.../OffHeapStoredObjectWithHeapForm.java | 33 +-
.../offheap/OutOfOffHeapMemoryListener.java | 29 +-
.../internal/offheap/RefCountChangeInfo.java | 62 +-
.../internal/offheap/ReferenceCountHelper.java | 86 +-
.../offheap/ReferenceCountHelperImpl.java | 146 +-
.../geode/internal/offheap/Releasable.java | 26 +-
.../org/apache/geode/internal/offheap/Slab.java | 37 +-
.../geode/internal/offheap/SlabFactory.java | 26 +-
.../apache/geode/internal/offheap/SlabImpl.java | 35 +-
.../geode/internal/offheap/StoredObject.java | 149 +-
.../internal/offheap/TinyStoredObject.java | 81 +-
.../offheap/annotations/OffHeapIdentifier.java | 57 +-
.../internal/offheap/annotations/Released.java | 40 +-
.../internal/offheap/annotations/Retained.java | 53 +-
.../offheap/annotations/Unretained.java | 49 +-
.../internal/process/AttachProcessUtils.java | 26 +-
.../process/BlockingProcessStreamReader.java | 26 +-
...usterConfigurationNotAvailableException.java | 27 +-
.../process/ConnectionFailedException.java | 28 +-
.../internal/process/ControlFileWatchdog.java | 50 +-
.../process/ControlNotificationHandler.java | 29 +-
.../internal/process/ControllableProcess.java | 59 +-
.../process/FileAlreadyExistsException.java | 33 +-
.../process/FileControllerParameters.java | 29 +-
.../internal/process/FileProcessController.java | 75 +-
.../process/LocalProcessController.java | 217 +-
.../internal/process/LocalProcessLauncher.java | 53 +-
.../process/MBeanControllerParameters.java | 33 +-
.../process/MBeanInvocationFailedException.java | 28 +-
.../process/MBeanProcessController.java | 220 +-
.../internal/process/NativeProcessUtils.java | 32 +-
.../process/NonBlockingProcessStreamReader.java | 44 +-
.../apache/geode/internal/process/PidFile.java | 59 +-
.../process/PidUnavailableException.java | 32 +-
.../internal/process/ProcessController.java | 43 +-
.../process/ProcessControllerFactory.java | 59 +-
.../process/ProcessControllerParameters.java | 30 +-
.../process/ProcessLauncherContext.java | 63 +-
.../internal/process/ProcessStreamReader.java | 76 +-
.../ProcessTerminatedAbnormallyException.java | 54 +-
.../geode/internal/process/ProcessType.java | 62 +-
.../geode/internal/process/ProcessUtils.java | 80 +-
.../geode/internal/process/StartupStatus.java | 39 +-
.../internal/process/StartupStatusListener.java | 30 +-
.../UnableToControlProcessException.java | 32 +-
.../AbstractSignalNotificationHandler.java | 62 +-
.../geode/internal/process/signal/Signal.java | 143 +-
.../internal/process/signal/SignalEvent.java | 23 +-
.../internal/process/signal/SignalListener.java | 23 +-
.../internal/process/signal/SignalType.java | 33 +-
.../internal/security/AuthorizeRequest.java | 665 +-
.../internal/security/AuthorizeRequestPP.java | 160 +-
.../security/FilterPostAuthorization.java | 104 +-
.../security/FilterPreAuthorization.java | 78 +-
.../security/IntegratedSecurityService.java | 126 +-
.../internal/security/ObjectWithAuthz.java | 24 +-
.../security/SecurableCommunicationChannel.java | 41 +-
.../internal/security/SecurityService.java | 114 +-
.../security/shiro/CustomAuthRealm.java | 36 +-
.../shiro/GeodeAuthenticationToken.java | 32 +-
.../security/shiro/GeodePermissionResolver.java | 22 +-
.../security/shiro/JMXShiroAuthenticator.java | 35 +-
.../internal/security/shiro/ShiroPrincipal.java | 26 +-
.../geode/internal/sequencelog/EntryLogger.java | 127 +-
.../geode/internal/sequencelog/GraphType.java | 43 +-
.../internal/sequencelog/MembershipLogger.java | 30 +-
.../internal/sequencelog/MessageLogger.java | 36 +-
.../internal/sequencelog/RegionLogger.java | 78 +-
.../internal/sequencelog/SequenceLogger.java | 63 +-
.../sequencelog/SequenceLoggerImpl.java | 67 +-
.../geode/internal/sequencelog/Transition.java | 32 +-
.../geode/internal/sequencelog/io/Filter.java | 29 +-
.../sequencelog/io/GemfireLogConverter.java | 286 +-
.../internal/sequencelog/io/GraphReader.java | 63 +-
.../sequencelog/io/InputStreamReader.java | 63 +-
.../sequencelog/io/OutputStreamAppender.java | 59 +-
.../geode/internal/sequencelog/model/Edge.java | 36 +-
.../geode/internal/sequencelog/model/Graph.java | 75 +-
.../internal/sequencelog/model/GraphID.java | 44 +-
.../sequencelog/model/GraphReaderCallback.java | 34 +-
.../internal/sequencelog/model/GraphSet.java | 100 +-
.../internal/sequencelog/model/Vertex.java | 46 +-
.../visualization/text/TextDisplay.java | 66 +-
.../geode/internal/shared/NativeCalls.java | 284 +-
.../internal/shared/NativeCallsJNAImpl.java | 446 +-
.../internal/shared/NativeErrorException.java | 27 +-
.../apache/geode/internal/shared/OSType.java | 32 +-
.../internal/shared/StringPrintWriter.java | 61 +-
.../geode/internal/shared/TCPSocketOptions.java | 38 +-
.../internal/size/CachingSingleObjectSizer.java | 30 +-
.../size/InstrumentationSingleObjectSizer.java | 37 +-
.../geode/internal/size/ObjectGraphSizer.java | 140 +-
.../geode/internal/size/ObjectTraverser.java | 143 +-
.../internal/size/ReflectionObjectSizer.java | 69 +-
.../size/ReflectionSingleObjectSizer.java | 103 +-
.../geode/internal/size/SingleObjectSizer.java | 29 +-
.../internal/size/SizeClassOnceObjectSizer.java | 80 +-
.../apache/geode/internal/size/SizeOfUtil0.java | 28 +-
.../internal/size/WellKnownClassSizer.java | 48 +-
.../statistics/AbstractStatisticsFactory.java | 156 +-
.../internal/statistics/ArchiveSplitter.java | 326 +-
.../internal/statistics/CallbackSampler.java | 39 +-
.../internal/statistics/CounterMonitor.java | 30 +-
.../statistics/DummyStatisticsFactory.java | 116 +-
.../statistics/DummyStatisticsImpl.java | 129 +-
.../geode/internal/statistics/GaugeMonitor.java | 26 +-
.../internal/statistics/GemFireStatSampler.java | 241 +-
.../internal/statistics/HostStatHelper.java | 245 +-
.../internal/statistics/HostStatSampler.java | 234 +-
.../statistics/IgnoreResourceException.java | 37 +-
.../internal/statistics/LocalStatListener.java | 33 +-
.../statistics/LocalStatisticsFactory.java | 50 +-
.../statistics/LocalStatisticsImpl.java | 102 +-
.../MapBasedStatisticsNotification.java | 33 +-
.../internal/statistics/ResourceInstance.java | 53 +-
.../geode/internal/statistics/ResourceType.java | 43 +-
.../internal/statistics/SampleCollector.java | 366 +-
.../internal/statistics/SampleHandler.java | 73 +-
.../internal/statistics/SimpleStatSampler.java | 66 +-
.../internal/statistics/SimpleStatisticId.java | 34 +-
.../statistics/StatArchiveDescriptor.java | 62 +-
.../internal/statistics/StatArchiveFormat.java | 125 +-
.../internal/statistics/StatArchiveHandler.java | 321 +-
.../statistics/StatArchiveHandlerConfig.java | 34 +-
.../internal/statistics/StatArchiveReader.java | 1602 +--
.../internal/statistics/StatArchiveWriter.java | 544 +-
.../internal/statistics/StatMonitorHandler.java | 115 +-
.../internal/statistics/StatSamplerStats.java | 93 +-
.../statistics/StatisticDescriptorImpl.java | 265 +-
.../geode/internal/statistics/StatisticId.java | 28 +-
.../statistics/StatisticNotFoundException.java | 38 +-
.../internal/statistics/StatisticsImpl.java | 240 +-
.../internal/statistics/StatisticsListener.java | 26 +-
.../internal/statistics/StatisticsManager.java | 38 +-
.../internal/statistics/StatisticsMonitor.java | 64 +-
.../statistics/StatisticsNotification.java | 39 +-
.../internal/statistics/StatisticsSampler.java | 32 +-
.../statistics/StatisticsTypeFactoryImpl.java | 106 +-
.../internal/statistics/StatisticsTypeImpl.java | 140 +-
.../internal/statistics/StatisticsTypeXml.java | 183 +-
.../geode/internal/statistics/VMStats.java | 69 +-
.../internal/statistics/VMStatsContract.java | 33 +-
.../statistics/VMStatsContractFactory.java | 36 +-
.../geode/internal/statistics/ValueMonitor.java | 71 +-
.../platform/LinuxProcFsStatistics.java | 548 +-
.../statistics/platform/LinuxProcessStats.java | 67 +-
.../statistics/platform/LinuxSystemStats.java | 321 +-
.../statistics/platform/OSXProcessStats.java | 82 +-
.../statistics/platform/OSXSystemStats.java | 407 +-
.../platform/OsStatisticsFactory.java | 37 +-
.../statistics/platform/ProcessStats.java | 36 +-
.../platform/SolarisProcessStats.java | 219 +-
.../statistics/platform/SolarisSystemStats.java | 467 +-
.../platform/WindowsProcessStats.java | 155 +-
.../statistics/platform/WindowsSystemStats.java | 289 +-
.../stats50/Atomic50StatisticsImpl.java | 184 +-
.../geode/internal/stats50/VMStats50.java | 442 +-
.../geode/internal/tcp/BaseMsgStreamer.java | 46 +-
.../org/apache/geode/internal/tcp/Buffers.java | 64 +-
.../internal/tcp/ByteBufferInputStream.java | 400 +-
.../geode/internal/tcp/ConnectExceptions.java | 41 +-
.../apache/geode/internal/tcp/Connection.java | 2540 ++--
.../geode/internal/tcp/ConnectionException.java | 35 +-
.../geode/internal/tcp/ConnectionTable.java | 864 +-
.../geode/internal/tcp/DirectReplySender.java | 67 +-
.../tcp/ImmutableByteBufferInputStream.java | 62 +-
.../internal/tcp/MemberShunnedException.java | 36 +-
.../geode/internal/tcp/MsgDestreamer.java | 314 +-
.../geode/internal/tcp/MsgIdGenerator.java | 44 +-
.../geode/internal/tcp/MsgOutputStream.java | 517 +-
.../apache/geode/internal/tcp/MsgReader.java | 77 +-
.../apache/geode/internal/tcp/MsgStreamer.java | 720 +-
.../geode/internal/tcp/MsgStreamerList.java | 44 +-
.../apache/geode/internal/tcp/NIOMsgReader.java | 59 +-
.../apache/geode/internal/tcp/OioMsgReader.java | 25 +-
.../internal/tcp/ReenteredConnectException.java | 32 +-
.../geode/internal/tcp/ServerDelegate.java | 49 +-
.../apache/geode/internal/tcp/TCPConduit.java | 400 +-
.../tcp/VersionedByteBufferInputStream.java | 43 +-
.../internal/tcp/VersionedMsgStreamer.java | 32 +-
.../internal/util/AbortableTaskService.java | 74 +-
.../apache/geode/internal/util/ArrayUtils.java | 121 +-
.../apache/geode/internal/util/BlobHelper.java | 67 +-
.../apache/geode/internal/util/Breadcrumbs.java | 512 +-
.../org/apache/geode/internal/util/Bytes.java | 208 +-
.../geode/internal/util/CollectionUtils.java | 91 +-
.../geode/internal/util/DebuggerSupport.java | 42 +-
.../geode/internal/util/DelayedAction.java | 41 +-
.../org/apache/geode/internal/util/Hex.java | 31 +-
.../apache/geode/internal/util/HostName.java | 24 +-
.../org/apache/geode/internal/util/IOUtils.java | 141 +-
.../geode/internal/util/JavaCommandBuilder.java | 43 +-
.../geode/internal/util/LogFileUtils.java | 172 +-
.../geode/internal/util/ObjectIntProcedure.java | 55 +-
.../geode/internal/util/PasswordUtil.java | 59 +-
.../apache/geode/internal/util/PluckStacks.java | 1083 +-
.../geode/internal/util/SingletonCallable.java | 36 +-
.../geode/internal/util/SingletonValue.java | 207 +-
.../internal/util/StackTraceCollector.java | 94 +-
.../apache/geode/internal/util/StopWatch.java | 43 +-
.../internal/util/SunAPINotFoundException.java | 31 +-
.../geode/internal/util/TransformUtils.java | 167 +-
.../apache/geode/internal/util/Transformer.java | 25 +-
.../apache/geode/internal/util/Versionable.java | 30 +-
.../geode/internal/util/VersionedArrayList.java | 229 +-
.../util/concurrent/CopyOnWriteHashMap.java | 50 +-
.../util/concurrent/CopyOnWriteWeakHashMap.java | 34 +-
.../CustomEntryConcurrentHashMap.java | 1386 +-
.../internal/util/concurrent/FutureResult.java | 69 +-
.../util/concurrent/ReentrantSemaphore.java | 85 +-
.../util/concurrent/SemaphoreReadWriteLock.java | 55 +-
.../util/concurrent/StoppableCondition.java | 79 +-
.../concurrent/StoppableCountDownLatch.java | 51 +-
.../concurrent/StoppableCountDownOrUpLatch.java | 328 +-
.../concurrent/StoppableNonReentrantLock.java | 40 +-
.../util/concurrent/StoppableReadWriteLock.java | 26 +-
.../util/concurrent/StoppableReentrantLock.java | 46 +-
.../StoppableReentrantReadWriteLock.java | 98 +-
.../geode/lang/AttachAPINotFoundException.java | 45 +-
.../org/apache/geode/lang/Identifiable.java | 28 +-
.../management/AlreadyRunningException.java | 28 +-
.../geode/management/AsyncEventQueueMXBean.java | 48 +-
.../geode/management/CacheServerMXBean.java | 178 +-
.../geode/management/ClientHealthStatus.java | 150 +-
.../geode/management/ClientQueueDetail.java | 41 +-
.../DependenciesNotFoundException.java | 43 +-
.../geode/management/DiskBackupResult.java | 36 +-
.../geode/management/DiskBackupStatus.java | 43 +-
.../apache/geode/management/DiskMetrics.java | 28 +-
.../geode/management/DiskStoreMXBean.java | 126 +-
.../DistributedLockServiceMXBean.java | 26 +-
.../management/DistributedRegionMXBean.java | 100 +-
.../management/DistributedSystemMXBean.java | 392 +-
.../management/EvictionAttributesData.java | 50 +-
.../FixedPartitionAttributesData.java | 38 +-
.../geode/management/GatewayReceiverMXBean.java | 60 +-
.../geode/management/GatewaySenderMXBean.java | 89 +-
.../geode/management/GemFireProperties.java | 652 +-
.../geode/management/JMXNotificationType.java | 162 +-
.../management/JMXNotificationUserData.java | 50 +-
.../org/apache/geode/management/JVMMetrics.java | 60 +-
.../apache/geode/management/LocatorMXBean.java | 36 +-
.../geode/management/LockServiceMXBean.java | 32 +-
.../geode/management/ManagementException.java | 67 +-
.../geode/management/ManagementService.java | 312 +-
.../apache/geode/management/ManagerMXBean.java | 40 +-
.../apache/geode/management/MemberMXBean.java | 262 +-
.../management/MembershipAttributesData.java | 93 +-
.../apache/geode/management/NetworkMetrics.java | 24 +-
.../org/apache/geode/management/OSMetrics.java | 91 +-
.../management/PartitionAttributesData.java | 47 +-
.../management/PersistentMemberDetails.java | 38 +-
.../geode/management/RegionAttributesData.java | 323 +-
.../apache/geode/management/RegionMXBean.java | 183 +-
.../apache/geode/management/ServerLoadData.java | 52 +-
.../geode/management/cli/CliMetaData.java | 70 +-
.../cli/CommandProcessingException.java | 58 +-
.../geode/management/cli/CommandService.java | 197 +-
.../management/cli/CommandServiceException.java | 53 +-
.../geode/management/cli/CommandStatement.java | 40 +-
.../geode/management/cli/ConverterHint.java | 64 +-
.../org/apache/geode/management/cli/Result.java | 75 +-
.../geode/management/internal/AgentUtil.java | 68 +-
.../geode/management/internal/AlertDetails.java | 38 +-
.../management/internal/ArrayConverter.java | 40 +-
.../internal/BaseManagementService.java | 84 +-
.../internal/CollectionConverter.java | 46 +-
.../management/internal/CompositeConverter.java | 59 +-
.../management/internal/EnumConverter.java | 25 +-
.../management/internal/FederatingManager.java | 285 +-
.../internal/FederationComponent.java | 125 +-
.../geode/management/internal/FilterChain.java | 80 +-
.../geode/management/internal/FilterParam.java | 92 +-
.../management/internal/IdentityConverter.java | 27 +-
.../geode/management/internal/JettyHelper.java | 67 +-
.../management/internal/JmxManagerAdvisee.java | 31 +-
.../management/internal/JmxManagerAdvisor.java | 115 +-
.../management/internal/JmxManagerLocator.java | 77 +-
.../internal/JmxManagerLocatorRequest.java | 81 +-
.../internal/JmxManagerLocatorResponse.java | 39 +-
.../management/internal/LocalFilterChain.java | 71 +-
.../geode/management/internal/LocalManager.java | 174 +-
.../management/internal/MBeanJMXAdapter.java | 279 +-
.../management/internal/MBeanProxyFactory.java | 163 +-
.../internal/MBeanProxyInfoRepository.java | 66 +-
.../internal/MBeanProxyInvocationHandler.java | 284 +-
.../internal/MXBeanProxyInvocationHandler.java | 81 +-
.../management/internal/ManagementAgent.java | 183 +-
.../internal/ManagementCacheListener.java | 51 +-
.../internal/ManagementConstants.java | 206 +-
.../management/internal/ManagementFunction.java | 58 +-
.../internal/ManagementMembershipListener.java | 40 +-
.../internal/ManagementResourceRepo.java | 104 +-
.../management/internal/ManagementStrings.java | 188 +-
.../geode/management/internal/Manager.java | 57 +-
.../internal/ManagerStartupMessage.java | 35 +-
.../management/internal/MemberMessenger.java | 47 +-
.../internal/MonitoringRegionCacheListener.java | 91 +-
.../internal/NotificationBroadCasterProxy.java | 33 +-
.../internal/NotificationCacheListener.java | 134 +-
.../management/internal/NotificationHub.java | 70 +-
.../internal/NotificationHubClient.java | 74 +-
.../management/internal/NotificationKey.java | 26 +-
.../geode/management/internal/OpenMethod.java | 45 +-
.../management/internal/OpenTypeConverter.java | 287 +-
.../geode/management/internal/OpenTypeUtil.java | 33 +-
.../geode/management/internal/ProxyInfo.java | 106 +-
.../management/internal/ProxyInterface.java | 54 +-
.../management/internal/ProxyListener.java | 134 +-
.../management/internal/RemoteFilterChain.java | 146 +-
.../geode/management/internal/RestAgent.java | 69 +-
.../geode/management/internal/SSLUtil.java | 44 +-
.../management/internal/StringBasedFilter.java | 194 +-
.../internal/SystemManagementService.java | 218 +-
.../management/internal/TableConverter.java | 38 +-
.../internal/beans/AggregateHandler.java | 84 +-
.../internal/beans/AsyncEventQueueMBean.java | 36 +-
.../beans/AsyncEventQueueMBeanBridge.java | 61 +-
.../internal/beans/BeanUtilFuncs.java | 155 +-
.../internal/beans/CacheServerBridge.java | 269 +-
.../internal/beans/CacheServerMBean.java | 50 +-
.../internal/beans/CacheServiceMBeanBase.java | 22 +-
.../internal/beans/DiskRegionBridge.java | 37 +-
.../internal/beans/DiskStoreMBean.java | 46 +-
.../internal/beans/DiskStoreMBeanBridge.java | 142 +-
.../beans/DistributedLockServiceBridge.java | 68 +-
.../beans/DistributedLockServiceMBean.java | 25 +-
.../internal/beans/DistributedRegionBridge.java | 172 +-
.../internal/beans/DistributedRegionMBean.java | 30 +-
.../internal/beans/DistributedSystemBridge.java | 673 +-
.../internal/beans/DistributedSystemMBean.java | 72 +-
.../internal/beans/GatewayReceiverMBean.java | 38 +-
.../beans/GatewayReceiverMBeanBridge.java | 105 +-
.../internal/beans/GatewaySenderMBean.java | 34 +-
.../beans/GatewaySenderMBeanBridge.java | 97 +-
.../management/internal/beans/LocatorMBean.java | 33 +-
.../internal/beans/LocatorMBeanBridge.java | 64 +-
.../internal/beans/LockServiceMBean.java | 27 +-
.../internal/beans/LockServiceMBeanBridge.java | 28 +-
.../internal/beans/MBeanAggregator.java | 136 +-
.../internal/beans/ManagementAdapter.java | 717 +-
.../internal/beans/ManagementListener.java | 106 +-
.../management/internal/beans/ManagerMBean.java | 32 +-
.../internal/beans/ManagerMBeanBridge.java | 28 +-
.../management/internal/beans/MemberMBean.java | 54 +-
.../internal/beans/MemberMBeanBridge.java | 871 +-
.../internal/beans/MetricsCalculator.java | 48 +-
.../internal/beans/PartitionedRegionBridge.java | 145 +-
.../internal/beans/QueryDataFunction.java | 156 +-
.../management/internal/beans/RegionMBean.java | 42 +-
.../internal/beans/RegionMBeanBridge.java | 171 +-
.../beans/RegionMBeanCompositeDataFactory.java | 77 +-
.../internal/beans/SequenceNumber.java | 28 +-
.../management/internal/beans/ServerBridge.java | 98 +-
.../stats/AggregateRegionStatsMonitor.java | 110 +-
.../internal/beans/stats/GCStatsMonitor.java | 28 +-
.../GatewayReceiverClusterStatsMonitor.java | 26 +-
.../stats/GatewaySenderClusterStatsMonitor.java | 28 +-
.../stats/IntegerStatsDeltaAggregator.java | 28 +-
.../beans/stats/LongStatsDeltaAggregator.java | 28 +-
.../internal/beans/stats/MBeanStatsMonitor.java | 33 +-
.../beans/stats/MemberClusterStatsMonitor.java | 75 +-
.../beans/stats/MemberLevelDiskMonitor.java | 70 +-
.../beans/stats/RegionClusterStatsMonitor.java | 48 +-
.../beans/stats/ServerClusterStatsMonitor.java | 25 +-
.../internal/beans/stats/StatType.java | 27 +-
.../internal/beans/stats/StatsAggregator.java | 50 +-
.../beans/stats/StatsAverageLatency.java | 26 +-
.../internal/beans/stats/StatsKey.java | 272 +-
.../internal/beans/stats/StatsLatency.java | 30 +-
.../internal/beans/stats/StatsRate.java | 60 +-
.../internal/beans/stats/VMStatsMonitor.java | 52 +-
.../cli/AbstractCliAroundInterceptor.java | 26 +-
.../internal/cli/CliAroundInterceptor.java | 30 +-
.../geode/management/internal/cli/CliUtil.java | 286 +-
.../management/internal/cli/CommandManager.java | 263 +-
.../management/internal/cli/CommandRequest.java | 37 +-
.../internal/cli/CommandResponse.java | 307 +-
.../internal/cli/CommandResponseBuilder.java | 58 +-
.../internal/cli/CommandResponseWriter.java | 43 +-
.../internal/cli/GfshParseResult.java | 59 +-
.../management/internal/cli/GfshParser.java | 501 +-
.../geode/management/internal/cli/Launcher.java | 148 +-
.../management/internal/cli/LogWrapper.java | 102 +-
.../internal/cli/MultipleValueAdapter.java | 32 +-
.../internal/cli/MultipleValueConverter.java | 36 +-
.../internal/cli/annotation/CliArgument.java | 112 +-
.../cli/commands/AbstractCommandsSupport.java | 51 +-
.../internal/cli/commands/ClientCommands.java | 366 +-
.../internal/cli/commands/ConfigCommands.java | 343 +-
.../CreateAlterDestroyRegionCommands.java | 995 +-
.../internal/cli/commands/DataCommands.java | 1061 +-
.../internal/cli/commands/DeployCommands.java | 175 +-
.../cli/commands/DiskStoreCommands.java | 1061 +-
.../cli/commands/DurableClientCommands.java | 757 +-
...ExportImportSharedConfigurationCommands.java | 141 +-
.../internal/cli/commands/FunctionCommands.java | 467 +-
.../internal/cli/commands/GfshHelpCommands.java | 63 +-
.../internal/cli/commands/IndexCommands.java | 374 +-
.../cli/commands/LauncherLifecycleCommands.java | 1540 +--
.../internal/cli/commands/MemberCommands.java | 160 +-
.../cli/commands/MiscellaneousCommands.java | 1367 +-
.../internal/cli/commands/PDXCommands.java | 172 +-
.../internal/cli/commands/QueueCommands.java | 195 +-
.../internal/cli/commands/RegionCommands.java | 215 +-
.../internal/cli/commands/ShellCommands.java | 705 +-
.../internal/cli/commands/StatusCommands.java | 45 +-
.../internal/cli/commands/WanCommands.java | 1032 +-
.../cli/commands/dto/RegionAttributesInfo.java | 64 +-
.../cli/commands/dto/RegionDetails.java | 122 +-
.../cli/commands/dto/RegionMemberDetails.java | 86 +-
.../cli/converters/BooleanConverter.java | 61 +-
.../ClusterMemberIdNameConverter.java | 33 +-
.../converters/ConnectionEndpointConverter.java | 100 +-
.../internal/cli/converters/DirConverter.java | 93 +-
.../cli/converters/DirPathConverter.java | 57 +-
.../cli/converters/DiskStoreNameConverter.java | 37 +-
.../internal/cli/converters/EnumConverter.java | 70 +-
.../cli/converters/FilePathConverter.java | 58 +-
.../cli/converters/FilePathStringConverter.java | 58 +-
.../converters/GatewayReceiverIdsConverter.java | 36 +-
.../converters/GatewaySenderIdConverter.java | 41 +-
.../internal/cli/converters/HelpConverter.java | 34 +-
.../cli/converters/HintTopicConverter.java | 38 +-
.../cli/converters/IndexTypeConverter.java | 34 +-
.../LocatorDiscoveryConfigConverter.java | 39 +-
.../cli/converters/LocatorIdNameConverter.java | 36 +-
.../cli/converters/LogLevelConverter.java | 32 +-
.../cli/converters/MemberGroupConverter.java | 41 +-
.../cli/converters/MemberIdNameConverter.java | 36 +-
.../cli/converters/RegionPathConverter.java | 40 +-
.../cli/converters/StringArrayConverter.java | 35 +-
.../cli/converters/StringListConverter.java | 33 +-
.../cli/domain/AsyncEventQueueDetails.java | 33 +-
.../internal/cli/domain/CacheServerInfo.java | 34 +-
.../cli/domain/ConnectToLocatorResult.java | 33 +-
.../internal/cli/domain/DataCommandRequest.java | 99 +-
.../internal/cli/domain/DataCommandResult.java | 706 +-
.../internal/cli/domain/DiskStoreDetails.java | 101 +-
.../cli/domain/DurableCqNamesResult.java | 54 +-
.../cli/domain/EvictionAttributesInfo.java | 157 +-
.../domain/FixedPartitionAttributesInfo.java | 92 +-
.../internal/cli/domain/IndexDetails.java | 62 +-
.../internal/cli/domain/IndexInfo.java | 40 +-
.../cli/domain/MemberConfigurationInfo.java | 36 +-
.../internal/cli/domain/MemberInformation.java | 335 +-
.../internal/cli/domain/MemberResult.java | 27 +-
.../cli/domain/PartitionAttributesInfo.java | 77 +-
.../cli/domain/RegionAttributesInfo.java | 898 +-
.../internal/cli/domain/RegionDescription.java | 146 +-
.../cli/domain/RegionDescriptionPerMember.java | 74 +-
.../internal/cli/domain/RegionInformation.java | 273 +-
.../cli/domain/StackTracesPerMember.java | 34 +-
.../cli/domain/SubscriptionQueueSizeResult.java | 24 +-
.../cli/exceptions/CliCommandException.java | 25 +-
.../exceptions/CliCommandInvalidException.java | 25 +-
.../CliCommandMultiModeOptionException.java | 32 +-
.../CliCommandNotAvailableException.java | 28 +-
.../exceptions/CliCommandOptionException.java | 31 +-
...CommandOptionHasMultipleValuesException.java | 31 +-
.../CliCommandOptionInvalidException.java | 28 +-
.../CliCommandOptionMissingException.java | 28 +-
.../CliCommandOptionNotApplicableException.java | 31 +-
...liCommandOptionValueConversionException.java | 31 +-
.../CliCommandOptionValueException.java | 31 +-
.../CliCommandOptionValueMissingException.java | 31 +-
.../internal/cli/exceptions/CliException.java | 22 +-
.../exceptions/CreateSubregionException.java | 22 +-
.../cli/exceptions/ExceptionGenerator.java | 25 +-
.../cli/exceptions/ExceptionHandler.java | 66 +-
.../cli/exceptions/IndexNotFoundException.java | 26 +-
.../functions/AlterRuntimeConfigFunction.java | 48 +-
.../functions/AsyncEventQueueFunctionArgs.java | 34 +-
.../cli/functions/ChangeLogLevelFunction.java | 40 +-
.../cli/functions/CliFunctionResult.java | 106 +-
.../functions/CloseDurableClientFunction.java | 39 +-
.../cli/functions/CloseDurableCqFunction.java | 39 +-
.../cli/functions/ContunuousQueryFunction.java | 138 +-
.../CreateAsyncEventQueueFunction.java | 84 +-
.../functions/CreateDefinedIndexesFunction.java | 51 +-
.../cli/functions/CreateDiskStoreFunction.java | 37 +-
.../cli/functions/CreateIndexFunction.java | 57 +-
.../cli/functions/DataCommandFunction.java | 890 +-
.../internal/cli/functions/DeployFunction.java | 40 +-
.../functions/DescribeDiskStoreFunction.java | 124 +-
.../cli/functions/DestroyDiskStoreFunction.java | 33 +-
.../cli/functions/DestroyIndexFunction.java | 51 +-
.../cli/functions/ExportConfigFunction.java | 53 +-
.../cli/functions/ExportDataFunction.java | 43 +-
.../ExportSharedConfigurationFunction.java | 38 +-
.../FetchRegionAttributesFunction.java | 41 +-
.../FetchSharedConfigurationStatusFunction.java | 32 +-
.../functions/GarbageCollectionFunction.java | 80 +-
.../GatewayReceiverCreateFunction.java | 134 +-
.../functions/GatewayReceiverFunctionArgs.java | 42 +-
.../functions/GatewaySenderCreateFunction.java | 131 +-
.../functions/GatewaySenderFunctionArgs.java | 77 +-
.../GetMemberConfigInformationFunction.java | 157 +-
.../functions/GetMemberInformationFunction.java | 44 +-
.../functions/GetRegionDescriptionFunction.java | 86 +-
.../cli/functions/GetRegionsFunction.java | 22 +-
.../cli/functions/GetStackTracesFunction.java | 32 +-
.../GetSubscriptionQueueSizeFunction.java | 51 +-
.../cli/functions/ImportDataFunction.java | 43 +-
...ortSharedConfigurationArtifactsFunction.java | 44 +-
.../functions/ListAsyncEventQueuesFunction.java | 40 +-
.../cli/functions/ListDeployedFunction.java | 35 +-
.../cli/functions/ListDiskStoresFunction.java | 38 +-
.../functions/ListDurableCqNamesFunction.java | 35 +-
.../cli/functions/ListFunctionFunction.java | 32 +-
.../cli/functions/ListIndexFunction.java | 30 +-
.../LoadSharedConfigurationFunction.java | 36 +-
.../internal/cli/functions/LogFileFunction.java | 250 +-
.../cli/functions/MemberRegionFunction.java | 54 +-
.../cli/functions/MembersForRegionFunction.java | 72 +-
.../internal/cli/functions/NetstatFunction.java | 102 +-
.../cli/functions/RebalanceFunction.java | 92 +-
.../cli/functions/RegionAlterFunction.java | 145 +-
.../cli/functions/RegionCreateFunction.java | 159 +-
.../cli/functions/RegionDestroyFunction.java | 34 +-
.../cli/functions/RegionFunctionArgs.java | 180 +-
.../ShowMissingDiskStoresFunction.java | 36 +-
.../cli/functions/ShutDownFunction.java | 26 +-
.../cli/functions/UndeployFunction.java | 35 +-
.../cli/functions/UnregisterFunction.java | 34 +-
.../cli/functions/UserFunctionExecution.java | 138 +-
.../management/internal/cli/help/CliTopic.java | 78 +-
.../internal/cli/help/format/Block.java | 26 +-
.../internal/cli/help/format/DataNode.java | 26 +-
.../internal/cli/help/format/Help.java | 30 +-
.../internal/cli/help/format/NewHelp.java | 28 +-
.../internal/cli/help/format/Row.java | 22 +-
.../internal/cli/help/utils/FormatOutput.java | 46 +-
.../internal/cli/help/utils/HelpUtils.java | 254 +-
.../internal/cli/i18n/CliStrings.java | 3129 +++--
.../internal/cli/json/GfJsonArray.java | 76 +-
.../internal/cli/json/GfJsonException.java | 23 +-
.../internal/cli/json/GfJsonObject.java | 154 +-
.../management/internal/cli/json/TypedJson.java | 290 +-
.../internal/cli/modes/CommandModes.java | 63 +-
.../cli/multistep/CLIMultiStepHelper.java | 160 +-
.../internal/cli/multistep/CLIRemoteStep.java | 32 +-
.../internal/cli/multistep/CLIStep.java | 26 +-
.../cli/multistep/CLIStepExecption.java | 36 +-
.../cli/multistep/MultiStepCommand.java | 22 +-
.../internal/cli/parser/Argument.java | 36 +-
.../internal/cli/parser/AvailabilityTarget.java | 28 +-
.../internal/cli/parser/CommandTarget.java | 71 +-
.../internal/cli/parser/GfshMethodTarget.java | 54 +-
.../internal/cli/parser/GfshOptionParser.java | 34 +-
.../internal/cli/parser/MethodParameter.java | 22 +-
.../management/internal/cli/parser/Option.java | 55 +-
.../internal/cli/parser/OptionSet.java | 31 +-
.../internal/cli/parser/Parameter.java | 22 +-
.../internal/cli/parser/ParserUtils.java | 31 +-
.../internal/cli/parser/SyntaxConstants.java | 40 +-
.../cli/parser/jopt/JoptOptionParser.java | 86 +-
.../preprocessor/EnclosingCharacters.java | 22 +-
.../cli/parser/preprocessor/Preprocessor.java | 72 +-
.../parser/preprocessor/PreprocessorUtils.java | 66 +-
.../internal/cli/parser/preprocessor/Stack.java | 26 +-
.../cli/parser/preprocessor/TrimmedInput.java | 22 +-
.../cli/remote/CommandExecutionContext.java | 45 +-
.../internal/cli/remote/CommandProcessor.java | 89 +-
.../cli/remote/CommandStatementImpl.java | 56 +-
.../cli/remote/MemberCommandService.java | 50 +-
.../cli/remote/RemoteExecutionStrategy.java | 101 +-
.../internal/cli/remote/WrapperThreadLocal.java | 29 +-
.../internal/cli/result/AbstractResultData.java | 157 +-
.../cli/result/CliJsonSerializable.java | 42 +-
.../cli/result/CliJsonSerializableFactory.java | 58 +-
.../cli/result/CliJsonSerializableIds.java | 28 +-
.../internal/cli/result/CommandResult.java | 290 +-
.../cli/result/CommandResultException.java | 22 +-
.../cli/result/CompositeResultData.java | 180 +-
.../internal/cli/result/ErrorResultData.java | 58 +-
.../internal/cli/result/FileResult.java | 27 +-
.../internal/cli/result/InfoResultData.java | 45 +-
.../internal/cli/result/ObjectResultData.java | 43 +-
.../internal/cli/result/ResultBuilder.java | 345 +-
.../internal/cli/result/ResultData.java | 52 +-
.../cli/result/ResultDataException.java | 22 +-
.../internal/cli/result/TableBuilder.java | 158 +-
.../internal/cli/result/TableBuilderHelper.java | 108 +-
.../internal/cli/result/TabularResultData.java | 53 +-
.../management/internal/cli/shell/Gfsh.java | 497 +-
.../internal/cli/shell/GfshConfig.java | 117 +-
.../cli/shell/GfshExecutionStrategy.java | 211 +-
.../cli/shell/JMXConnectionException.java | 30 +-
.../cli/shell/JMXInvocationException.java | 27 +-
.../internal/cli/shell/JmxOperationInvoker.java | 149 +-
.../internal/cli/shell/MultiCommandHelper.java | 52 +-
.../internal/cli/shell/OperationInvoker.java | 76 +-
.../internal/cli/shell/jline/ANSIBuffer.java | 694 +-
.../internal/cli/shell/jline/ANSIHandler.java | 120 +-
.../cli/shell/jline/CygwinMinttyTerminal.java | 39 +-
.../internal/cli/shell/jline/GfshHistory.java | 27 +-
.../shell/jline/GfshUnsupportedTerminal.java | 25 +-
.../cli/shell/unsafe/GfshSignalHandler.java | 46 +-
.../internal/cli/util/CLIConsoleBufferUtil.java | 34 +-
.../internal/cli/util/CauseFinder.java | 206 +-
.../cli/util/ClasspathScanLoadHelper.java | 131 +-
.../internal/cli/util/CommandStringBuilder.java | 48 +-
.../internal/cli/util/CommentSkipHelper.java | 36 +-
.../internal/cli/util/ConnectionEndpoint.java | 37 +-
.../internal/cli/util/DiskStoreCompacter.java | 88 +-
.../cli/util/DiskStoreNotFoundException.java | 32 +-
.../internal/cli/util/DiskStoreUpgrader.java | 92 +-
.../internal/cli/util/DiskStoreValidater.java | 40 +-
.../cli/util/EvictionAttributesInfo.java | 92 +-
.../cli/util/FixedPartitionAttributesInfo.java | 94 +-
.../internal/cli/util/GfshConsoleReader.java | 60 +-
.../internal/cli/util/HyphenFormatter.java | 24 +-
.../cli/util/JConsoleNotFoundException.java | 31 +-
.../management/internal/cli/util/JsonUtil.java | 336 +-
.../internal/cli/util/MemberInformation.java | 313 +-
.../cli/util/MemberNotFoundException.java | 30 +-
.../management/internal/cli/util/MergeLogs.java | 72 +-
.../internal/cli/util/ReadWriteFile.java | 79 +-
.../cli/util/RegionAttributesDefault.java | 127 +-
.../cli/util/RegionAttributesNames.java | 144 +-
.../internal/cli/util/RegionPath.java | 63 +-
.../cli/util/VisualVmNotFoundException.java | 30 +-
.../SharedConfigurationWriter.java | 125 +-
.../callbacks/ConfigurationChangeListener.java | 38 +-
.../configuration/domain/CacheElement.java | 169 +-
.../configuration/domain/Configuration.java | 88 +-
.../domain/ConfigurationChangeResult.java | 61 +-
.../domain/SharedConfigurationStatus.java | 24 +-
.../configuration/domain/XmlEntity.java | 223 +-
.../configuration/functions/AddJarFunction.java | 34 +-
.../functions/AddXmlEntityFunction.java | 30 +-
.../functions/DeleteJarFunction.java | 33 +-
.../functions/DeleteXmlEntityFunction.java | 32 +-
.../functions/GetAllJarsFunction.java | 38 +-
.../functions/ModifyPropertiesFunction.java | 32 +-
.../handlers/ConfigurationRequestHandler.java | 51 +-
...SharedConfigurationStatusRequestHandler.java | 31 +-
.../messages/ConfigurationRequest.java | 52 +-
.../messages/ConfigurationResponse.java | 69 +-
.../SharedConfigurationStatusRequest.java | 22 +-
.../SharedConfigurationStatusResponse.java | 45 +-
.../configuration/utils/DtdResolver.java | 40 +-
.../configuration/utils/XmlConstants.java | 26 +-
.../internal/configuration/utils/XmlUtils.java | 517 +-
.../internal/configuration/utils/ZipUtils.java | 30 +-
.../internal/messages/CompactRequest.java | 65 +-
.../internal/messages/CompactResponse.java | 41 +-
.../internal/security/AccessControlMBean.java | 29 +-
.../internal/security/AccessControlMXBean.java | 25 +-
.../internal/security/MBeanServerWrapper.java | 170 +-
.../internal/security/ResourceConstants.java | 56 +-
.../internal/security/ResourceOperation.java | 22 +-
.../unsafe/ReadOpFileAccessController.java | 57 +-
.../controllers/AbstractCommandsController.java | 333 +-
.../AbstractMultiPartCommandsController.java | 32 +-
.../controllers/ClientCommandsController.java | 25 +-
.../controllers/ClusterCommandsController.java | 26 +-
.../controllers/ConfigCommandsController.java | 146 +-
.../web/controllers/DataCommandsController.java | 122 +-
.../controllers/DeployCommandsController.java | 62 +-
.../DiskStoreCommandsController.java | 115 +-
.../DurableClientCommandsController.java | 119 +-
.../controllers/FunctionCommandsController.java | 76 +-
.../controllers/IndexCommandsController.java | 84 +-
.../LauncherLifecycleCommandsController.java | 26 +-
.../controllers/MemberCommandsController.java | 46 +-
.../MiscellaneousCommandsController.java | 143 +-
.../web/controllers/PdxCommandsController.java | 80 +-
.../controllers/QueueCommandsController.java | 116 +-
.../controllers/RegionCommandsController.java | 292 +-
.../controllers/ShellCommandsController.java | 335 +-
.../web/controllers/WanCommandsController.java | 314 +-
.../support/LoginHandlerInterceptor.java | 77 +-
.../management/internal/web/domain/Link.java | 50 +-
.../internal/web/domain/LinkIndex.java | 23 +-
.../web/domain/QueryParameterSource.java | 26 +-
.../internal/web/http/ClientHttpRequest.java | 224 +-
.../internal/web/http/HttpHeader.java | 106 +-
.../internal/web/http/HttpMethod.java | 32 +-
.../SerializableObjectHttpMessageConverter.java | 70 +-
.../web/http/support/SimpleHttpRequester.java | 97 +-
.../internal/web/io/MultipartFileAdapter.java | 27 +-
.../web/io/MultipartFileResourceAdapter.java | 31 +-
.../web/shell/AbstractHttpOperationInvoker.java | 393 +-
.../web/shell/HttpOperationInvoker.java | 23 +-
.../web/shell/MBeanAccessException.java | 30 +-
.../RestApiCallForCommandNotFoundException.java | 26 +-
.../web/shell/RestHttpOperationInvoker.java | 247 +-
.../web/shell/SimpleHttpOperationInvoker.java | 96 +-
.../shell/support/HttpInvocationHandler.java | 42 +-
.../shell/support/HttpMBeanProxyFactory.java | 31 +-
.../internal/web/util/ConvertUtils.java | 62 +-
.../management/internal/web/util/UriUtils.java | 140 +-
.../management/membership/ClientMembership.java | 50 +-
.../membership/ClientMembershipEvent.java | 31 +-
.../membership/ClientMembershipListener.java | 38 +-
.../ClientMembershipListenerAdapter.java | 48 +-
.../management/membership/MembershipEvent.java | 27 +-
.../membership/MembershipListener.java | 41 +-
.../UniversalMembershipListenerAdapter.java | 226 +-
.../geode/memcached/GemFireMemcachedServer.java | 106 +-
.../java/org/apache/geode/pdx/FieldType.java | 112 +-
.../org/apache/geode/pdx/JSONFormatter.java | 1296 +-
.../geode/pdx/JSONFormatterException.java | 94 +-
.../geode/pdx/NonPortableClassException.java | 26 +-
.../geode/pdx/PdxConfigurationException.java | 24 +-
.../pdx/PdxFieldAlreadyExistsException.java | 34 +-
.../pdx/PdxFieldDoesNotExistException.java | 28 +-
.../pdx/PdxFieldTypeMismatchException.java | 37 +-
.../geode/pdx/PdxInitializationException.java | 29 +-
.../java/org/apache/geode/pdx/PdxInstance.java | 233 +-
.../apache/geode/pdx/PdxInstanceFactory.java | 369 +-
.../java/org/apache/geode/pdx/PdxReader.java | 182 +-
.../geode/pdx/PdxRegistryMismatchException.java | 28 +-
.../org/apache/geode/pdx/PdxSerializable.java | 81 +-
.../geode/pdx/PdxSerializationException.java | 29 +-
.../org/apache/geode/pdx/PdxSerializer.java | 134 +-
.../org/apache/geode/pdx/PdxUnreadFields.java | 47 +-
.../java/org/apache/geode/pdx/PdxWriter.java | 380 +-
.../pdx/ReflectionBasedAutoSerializer.java | 490 +-
.../apache/geode/pdx/WritablePdxInstance.java | 41 +-
.../pdx/internal/AutoSerializableManager.java | 857 +-
.../pdx/internal/CheckTypeRegistryState.java | 44 +-
.../pdx/internal/ClientTypeRegistration.java | 65 +-
.../geode/pdx/internal/ComparableEnum.java | 24 +-
.../geode/pdx/internal/ConvertableToBytes.java | 22 +-
.../org/apache/geode/pdx/internal/DataSize.java | 41 +-
.../geode/pdx/internal/DefaultPdxField.java | 26 +-
.../org/apache/geode/pdx/internal/EnumId.java | 35 +-
.../org/apache/geode/pdx/internal/EnumInfo.java | 79 +-
.../pdx/internal/FieldNotFoundInPdxVersion.java | 52 +-
.../geode/pdx/internal/InternalPdxReader.java | 76 +-
.../pdx/internal/LonerTypeRegistration.java | 72 +-
.../pdx/internal/NullTypeRegistration.java | 41 +-
.../org/apache/geode/pdx/internal/PdxField.java | 103 +-
.../geode/pdx/internal/PdxInputStream.java | 106 +-
.../geode/pdx/internal/PdxInstanceEnum.java | 53 +-
.../pdx/internal/PdxInstanceFactoryImpl.java | 63 +-
.../geode/pdx/internal/PdxInstanceImpl.java | 431 +-
.../pdx/internal/PdxInstanceInputStream.java | 29 +-
.../geode/pdx/internal/PdxOutputStream.java | 27 +-
.../geode/pdx/internal/PdxReaderImpl.java | 283 +-
.../apache/geode/pdx/internal/PdxString.java | 416 +-
.../org/apache/geode/pdx/internal/PdxType.java | 158 +-
.../geode/pdx/internal/PdxUnreadData.java | 63 +-
.../geode/pdx/internal/PdxWriterImpl.java | 386 +-
.../pdx/internal/PeerTypeRegistration.java | 366 +-
.../pdx/internal/TrackingPdxReaderImpl.java | 119 +-
.../geode/pdx/internal/TypeRegistration.java | 42 +-
.../apache/geode/pdx/internal/TypeRegistry.java | 206 +-
.../geode/pdx/internal/UnreadPdxType.java | 42 +-
.../internal/WeakConcurrentIdentityHashMap.java | 199 +-
.../pdx/internal/WritablePdxInstanceImpl.java | 366 +-
.../geode/pdx/internal/json/JsonHelper.java | 186 +-
.../pdx/internal/json/PdxInstanceHelper.java | 345 +-
.../geode/pdx/internal/json/PdxListHelper.java | 335 +-
.../geode/pdx/internal/json/PdxToJSON.java | 570 +-
.../pdx/internal/unsafe/UnsafeWrapper.java | 53 +-
.../java/org/apache/geode/ra/GFConnection.java | 25 +-
.../apache/geode/ra/GFConnectionFactory.java | 25 +-
.../apache/geode/redis/GeodeRedisServer.java | 322 +-
.../geode/redis/internal/ByteArrayWrapper.java | 54 +-
.../redis/internal/ByteToCommandDecoder.java | 82 +-
.../org/apache/geode/redis/internal/Coder.java | 69 +-
.../apache/geode/redis/internal/Command.java | 50 +-
.../geode/redis/internal/DoubleWrapper.java | 26 +-
.../redis/internal/ExecutionHandlerContext.java | 105 +-
.../apache/geode/redis/internal/Executor.java | 29 +-
.../apache/geode/redis/internal/Extendable.java | 25 +-
.../internal/RedisCommandParserException.java | 22 +-
.../geode/redis/internal/RedisCommandType.java | 994 +-
.../geode/redis/internal/RedisConstants.java | 376 +-
.../geode/redis/internal/RedisDataType.java | 38 +-
.../RedisDataTypeMismatchException.java | 29 +-
.../redis/internal/RegionCreationException.java | 29 +-
.../geode/redis/internal/RegionProvider.java | 135 +-
.../internal/executor/AbstractExecutor.java | 66 +-
.../internal/executor/AbstractScanExecutor.java | 28 +-
.../redis/internal/executor/AuthExecutor.java | 28 +-
.../redis/internal/executor/DBSizeExecutor.java | 22 +-
.../redis/internal/executor/DelExecutor.java | 24 +-
.../redis/internal/executor/EchoExecutor.java | 24 +-
.../redis/internal/executor/ExistsExecutor.java | 22 +-
.../internal/executor/ExpirationExecutor.java | 22 +-
.../internal/executor/ExpireAtExecutor.java | 27 +-
.../redis/internal/executor/ExpireExecutor.java | 29 +-
.../internal/executor/FlushAllExecutor.java | 24 +-
.../redis/internal/executor/KeysExecutor.java | 41 +-
.../redis/internal/executor/ListQuery.java | 61 +-
.../internal/executor/PExpireAtExecutor.java | 26 +-
.../internal/executor/PExpireExecutor.java | 26 +-
.../redis/internal/executor/PTTLExecutor.java | 26 +-
.../internal/executor/PersistExecutor.java | 33 +-
.../redis/internal/executor/PingExecutor.java | 27 +-
.../redis/internal/executor/QuitExecutor.java | 27 +-
.../redis/internal/executor/ScanExecutor.java | 34 +-
.../internal/executor/ShutDownExecutor.java | 25 +-
.../redis/internal/executor/SortedSetQuery.java | 265 +-
.../redis/internal/executor/TTLExecutor.java | 30 +-
.../redis/internal/executor/TimeExecutor.java | 24 +-
.../redis/internal/executor/TypeExecutor.java | 27 +-
.../redis/internal/executor/UnkownExecutor.java | 27 +-
.../internal/executor/hash/HDelExecutor.java | 26 +-
.../internal/executor/hash/HExistsExecutor.java | 26 +-
.../internal/executor/hash/HGetAllExecutor.java | 37 +-
.../internal/executor/hash/HGetExecutor.java | 25 +-
.../internal/executor/hash/HIncrByExecutor.java | 36 +-
.../executor/hash/HIncrByFloatExecutor.java | 43 +-
.../internal/executor/hash/HKeysExecutor.java | 40 +-
.../internal/executor/hash/HLenExecutor.java | 22 +-
.../internal/executor/hash/HMGetExecutor.java | 25 +-
.../internal/executor/hash/HMSetExecutor.java | 33 +-
.../internal/executor/hash/HScanExecutor.java | 39 +-
.../internal/executor/hash/HSetExecutor.java | 25 +-
.../internal/executor/hash/HSetNXExecutor.java | 22 +-
.../internal/executor/hash/HValsExecutor.java | 24 +-
.../internal/executor/hash/HashExecutor.java | 39 +-
.../internal/executor/hll/HllExecutor.java | 29 +-
.../internal/executor/hll/PFAddExecutor.java | 25 +-
.../internal/executor/hll/PFCountExecutor.java | 25 +-
.../internal/executor/hll/PFMergeExecutor.java | 25 +-
.../redis/internal/executor/hll/Varint.java | 417 +-
.../internal/executor/list/LIndexExecutor.java | 38 +-
.../internal/executor/list/LInsertExecutor.java | 25 +-
.../internal/executor/list/LLenExecutor.java | 30 +-
.../internal/executor/list/LPopExecutor.java | 22 +-
.../internal/executor/list/LPushExecutor.java | 24 +-
.../internal/executor/list/LPushXExecutor.java | 24 +-
.../internal/executor/list/LRangeExecutor.java | 34 +-
.../internal/executor/list/LRemExecutor.java | 41 +-
.../internal/executor/list/LSetExecutor.java | 30 +-
.../internal/executor/list/LTrimExecutor.java | 38 +-
.../internal/executor/list/ListExecutor.java | 100 +-
.../internal/executor/list/PopExecutor.java | 94 +-
.../internal/executor/list/PushExecutor.java | 28 +-
.../internal/executor/list/PushXExecutor.java | 24 +-
.../internal/executor/list/RPopExecutor.java | 24 +-
.../internal/executor/list/RPushExecutor.java | 24 +-
.../internal/executor/list/RPushXExecutor.java | 24 +-
.../internal/executor/set/SAddExecutor.java | 28 +-
.../internal/executor/set/SCardExecutor.java | 25 +-
.../internal/executor/set/SDiffExecutor.java | 27 +-
.../executor/set/SDiffStoreExecutor.java | 22 +-
.../internal/executor/set/SInterExecutor.java | 29 +-
.../executor/set/SInterStoreExecutor.java | 26 +-
.../executor/set/SIsMemberExecutor.java | 30 +-
.../internal/executor/set/SMembersExecutor.java | 31 +-
.../internal/executor/set/SMoveExecutor.java | 32 +-
.../internal/executor/set/SPopExecutor.java | 35 +-
.../executor/set/SRandMemberExecutor.java | 45 +-
.../internal/executor/set/SRemExecutor.java | 35 +-
.../internal/executor/set/SScanExecutor.java | 37 +-
.../internal/executor/set/SUnionExecutor.java | 27 +-
.../executor/set/SUnionStoreExecutor.java | 26 +-
.../internal/executor/set/SetExecutor.java | 22 +-
.../internal/executor/set/SetOpExecutor.java | 47 +-
.../executor/sortedset/SortedSetExecutor.java | 38 +-
.../executor/sortedset/ZAddExecutor.java | 34 +-
.../executor/sortedset/ZCardExecutor.java | 25 +-
.../executor/sortedset/ZCountExecutor.java | 35 +-
.../executor/sortedset/ZIncrByExecutor.java | 25 +-
.../executor/sortedset/ZLexCountExecutor.java | 49 +-
.../executor/sortedset/ZRangeByLexExecutor.java | 72 +-
.../sortedset/ZRangeByScoreExecutor.java | 49 +-
.../executor/sortedset/ZRangeExecutor.java | 25 +-
.../executor/sortedset/ZRankExecutor.java | 25 +-
.../executor/sortedset/ZRemExecutor.java | 24 +-
.../sortedset/ZRemRangeByLexExecutor.java | 58 +-
.../sortedset/ZRemRangeByRankExecutor.java | 32 +-
.../sortedset/ZRemRangeByScoreExecutor.java | 38 +-
.../sortedset/ZRevRangeByScoreExecutor.java | 22 +-
.../executor/sortedset/ZRevRangeExecutor.java | 22 +-
.../executor/sortedset/ZRevRankExecutor.java | 22 +-
.../executor/sortedset/ZScanExecutor.java | 39 +-
.../executor/sortedset/ZScoreExecutor.java | 27 +-
.../executor/string/AppendExecutor.java | 31 +-
.../executor/string/BitCountExecutor.java | 28 +-
.../internal/executor/string/BitOpExecutor.java | 37 +-
.../executor/string/BitPosExecutor.java | 52 +-
.../executor/string/DecrByExecutor.java | 41 +-
.../internal/executor/string/DecrExecutor.java | 28 +-
.../executor/string/GetBitExecutor.java | 28 +-
.../internal/executor/string/GetExecutor.java | 30 +-
.../executor/string/GetRangeExecutor.java | 30 +-
.../executor/string/GetSetExecutor.java | 25 +-
.../executor/string/IncrByExecutor.java | 33 +-
.../executor/string/IncrByFloatExecutor.java | 52 +-
.../internal/executor/string/IncrExecutor.java | 28 +-
.../internal/executor/string/MGetExecutor.java | 32 +-
.../internal/executor/string/MSetExecutor.java | 22 +-
.../executor/string/MSetNXExecutor.java | 22 +-
.../executor/string/PSetEXExecutor.java | 24 +-
.../executor/string/SetBitExecutor.java | 38 +-
.../internal/executor/string/SetEXExecutor.java | 31 +-
.../internal/executor/string/SetExecutor.java | 30 +-
.../internal/executor/string/SetNXExecutor.java | 22 +-
.../executor/string/SetRangeExecutor.java | 28 +-
.../executor/string/StringExecutor.java | 34 +-
.../executor/string/StrlenExecutor.java | 28 +-
.../executor/transactions/DiscardExecutor.java | 22 +-
.../executor/transactions/ExecExecutor.java | 31 +-
.../executor/transactions/MultiExecutor.java | 22 +-
.../transactions/TransactionExecutor.java | 22 +-
.../executor/transactions/UnwatchExecutor.java | 25 +-
.../executor/transactions/WatchExecutor.java | 25 +-
.../org/apache/hadoop/fs/GlobPattern.java | 149 +-
.../apache/geode/security/AccessControl.java | 102 +-
.../apache/geode/security/AuthInitialize.java | 102 +-
.../security/AuthenticationFailedException.java | 39 +-
.../AuthenticationRequiredException.java | 43 +-
.../apache/geode/security/Authenticator.java | 86 +-
.../security/GemFireSecurityException.java | 71 +-
.../geode/security/NotAuthorizedException.java | 88 +-
.../apache/geode/security/PostProcessor.java | 43 +-
.../geode/security/ResourcePermission.java | 71 +-
.../SecurableCommunicationChannels.java | 44 +-
.../apache/geode/security/SecurityManager.java | 52 +-
.../security/templates/SamplePostProcessor.java | 51 +-
.../templates/SampleSecurityManager.java | 79 +-
.../templates/SimpleSecurityManager.java | 51 +-
.../batterytest/greplogs/ExpectedStrings.java | 96 +-
.../java/batterytest/greplogs/LogConsumer.java | 233 +-
.../src/test/java/com/company/app/Customer.java | 22 +-
.../src/test/java/com/company/app/DBLoader.java | 43 +-
.../com/company/app/OrdersCacheListener.java | 30 +-
.../java/com/company/data/DatabaseLoader.java | 25 +-
.../java/com/company/data/MyDeclarable.java | 22 +-
.../src/test/java/com/company/data/MySizer.java | 27 +-
.../com/company/data/MyTransactionListener.java | 24 +-
.../src/test/java/com/examples/LinkNode.java | 32 +-
.../src/test/java/com/examples/SuperClass.java | 25 +-
.../src/test/java/com/examples/TestObject.java | 38 +-
.../src/test/java/com/examples/ds/Address.java | 22 +-
.../src/test/java/com/examples/ds/Company.java | 22 +-
.../java/com/examples/ds/CompanySerializer.java | 35 +-
.../src/test/java/com/examples/ds/Employee.java | 28 +-
.../com/examples/ds/PutDataSerializables.java | 35 +-
.../src/test/java/com/examples/ds/User.java | 36 +-
.../com/examples/snapshot/MyDataSerializer.java | 36 +-
.../java/com/examples/snapshot/MyObject.java | 37 +-
.../snapshot/MyObjectDataSerializable.java | 30 +-
.../java/com/examples/snapshot/MyObjectPdx.java | 29 +-
.../snapshot/MyObjectPdxSerializable.java | 25 +-
.../com/examples/snapshot/MyPdxSerializer.java | 38 +-
.../com/main/MyDistributedSystemListener.java | 94 +-
.../com/main/WANBootStrapping_Site1_Add.java | 67 +-
.../com/main/WANBootStrapping_Site1_Remove.java | 60 +-
.../com/main/WANBootStrapping_Site2_Add.java | 84 +-
.../com/main/WANBootStrapping_Site2_Remove.java | 51 +-
.../src/test/java/hydra/MethExecutor.java | 261 +-
.../src/test/java/hydra/MethExecutorResult.java | 130 +-
.../src/test/java/hydra/SchedulingOrder.java | 42 +-
.../test/java/org/apache/geode/AppObject.java | 25 +-
.../java/org/apache/geode/CopyJUnitTest.java | 166 +-
.../java/org/apache/geode/DeltaTestImpl.java | 139 +-
.../geode/DiskInstantiatorsJUnitTest.java | 72 +-
.../geode/JtaNoninvolvementJUnitTest.java | 43 +-
.../java/org/apache/geode/LonerDMJUnitTest.java | 60 +-
.../apache/geode/SystemFailureJUnitTest.java | 30 +-
.../org/apache/geode/TXExpiryJUnitTest.java | 143 +-
.../test/java/org/apache/geode/TXJUnitTest.java | 2810 +++--
.../org/apache/geode/TXWriterJUnitTest.java | 95 +-
.../org/apache/geode/TXWriterOOMEJUnitTest.java | 42 +-
.../java/org/apache/geode/TXWriterTestCase.java | 115 +-
.../org/apache/geode/TestDataSerializer.java | 58 +-
.../java/org/apache/geode/UnitTestDoclet.java | 81 +-
.../org/apache/geode/admin/AdminTestHelper.java | 24 +-
.../apache/geode/admin/AlertLevelJUnitTest.java | 29 +-
.../BindDistributedSystemJUnitTest.java | 53 +-
.../internal/CacheHealthEvaluatorJUnitTest.java | 104 +-
.../internal/DistributedSystemTestCase.java | 25 +-
.../admin/internal/HealthEvaluatorTestCase.java | 33 +-
.../MemberHealthEvaluatorJUnitTest.java | 41 +-
.../geode/cache/AttributesFactoryJUnitTest.java | 123 +-
.../geode/cache/CacheListenerJUnitTest.java | 194 +-
.../cache/CacheRegionClearStatsDUnitTest.java | 125 +-
.../org/apache/geode/cache/ClientHelper.java | 52 +-
.../cache/ClientServerTimeSyncDUnitTest.java | 410 +-
.../cache/ConnectionPoolAndLoaderDUnitTest.java | 168 +-
.../cache/ConnectionPoolAutoDUnitTest.java | 26 +-
.../geode/cache/ConnectionPoolDUnitTest.java | 6509 +++++-----
.../cache/ConnectionPoolFactoryJUnitTest.java | 223 +-
...alStaticArrayShouldNotCauseSegFaultTest.java | 36 +-
...MembershipAttributesAreSerializableTest.java | 34 +-
.../apache/geode/cache/OperationJUnitTest.java | 22 +-
.../geode/cache/PoolManagerJUnitTest.java | 43 +-
.../org/apache/geode/cache/ProxyJUnitTest.java | 398 +-
.../geode/cache/RegionFactoryJUnitTest.java | 318 +-
.../geode/cache/RoleExceptionJUnitTest.java | 55 +-
...ventQueueEvictionAndExpirationJUnitTest.java | 298 +-
.../SerialAsyncEventQueueImplJUnitTest.java | 32 +-
.../client/ClientCacheFactoryJUnitTest.java | 157 +-
.../client/ClientRegionFactoryJUnitTest.java | 97 +-
.../ClientServerRegisterInterestsDUnitTest.java | 86 +-
.../internal/AutoConnectionSourceDUnitTest.java | 170 +-
.../AutoConnectionSourceImplJUnitTest.java | 299 +-
.../CacheServerSSLConnectionDUnitTest.java | 136 +-
.../internal/ConnectionPoolImplJUnitTest.java | 121 +-
.../internal/LocatorLoadBalancingDUnitTest.java | 208 +-
.../cache/client/internal/LocatorTestBase.java | 143 +-
.../internal/OpExecutorImplJUnitTest.java | 292 +-
.../client/internal/QueueManagerJUnitTest.java | 292 +-
.../internal/SSLNoClientAuthDUnitTest.java | 162 +-
.../internal/ServerBlackListJUnitTest.java | 58 +-
.../locator/LocatorStatusResponseJUnitTest.java | 31 +-
.../pooling/ConnectionManagerJUnitTest.java | 643 +-
.../cache/execute/FunctionAdapterJUnitTest.java | 25 +-
.../management/MXMemoryPoolListenerExample.java | 90 +-
.../management/MemoryThresholdsDUnitTest.java | 1483 +--
.../MemoryThresholdsOffHeapDUnitTest.java | 1282 +-
.../management/ResourceManagerDUnitTest.java | 1706 ++-
.../ExceptionHandlingJUnitTest.java | 52 +-
.../mapInterface/MapFunctionalJUnitTest.java | 81 +-
.../mapInterface/PutAllGlobalLockJUnitTest.java | 133 +-
.../PutOperationContextJUnitTest.java | 100 +-
.../GetOperationContextImplJUnitTest.java | 49 +-
.../PartitionRegionHelperDUnitTest.java | 534 +-
.../BaseLineAndCompareQueryPerfJUnitTest.java | 901 +-
.../query/Bug32947ValueConstraintJUnitTest.java | 61 +-
.../apache/geode/cache/query/BugJUnitTest.java | 405 +-
.../apache/geode/cache/query/CacheUtils.java | 339 +-
.../geode/cache/query/MultithreadedTester.java | 42 +-
.../cache/query/PdxStringQueryJUnitTest.java | 224 +-
.../org/apache/geode/cache/query/PerfQuery.java | 146 +-
.../geode/cache/query/QueryJUnitTest.java | 193 +-
.../cache/query/QueryServiceJUnitTest.java | 259 +-
.../geode/cache/query/QueryTestUtils.java | 2420 ++--
.../cache/query/QueryTestUtilsJUnitTest.java | 126 +-
...QueryWithBucketParameterIntegrationTest.java | 84 +-
.../geode/cache/query/RegionJUnitTest.java | 187 +-
.../cache/query/TypedIteratorJUnitTest.java | 98 +-
.../org/apache/geode/cache/query/Utils.java | 45 +-
.../query/cq/dunit/CqQueryTestListener.java | 209 +-
.../apache/geode/cache/query/data/Address.java | 61 +-
.../org/apache/geode/cache/query/data/City.java | 75 +-
.../cache/query/data/CollectionHolder.java | 117 +-
.../cache/query/data/ComparableWrapper.java | 99 +-
.../apache/geode/cache/query/data/Country.java | 155 +-
.../org/apache/geode/cache/query/data/Data.java | 41 +-
.../apache/geode/cache/query/data/District.java | 87 +-
.../apache/geode/cache/query/data/Employee.java | 123 +-
.../geode/cache/query/data/Inventory.java | 226 +-
.../apache/geode/cache/query/data/Keywords.java | 28 +-
.../apache/geode/cache/query/data/Manager.java | 26 +-
.../apache/geode/cache/query/data/Numbers.java | 64 +-
.../apache/geode/cache/query/data/PhoneNo.java | 49 +-
.../geode/cache/query/data/Portfolio.java | 179 +-
.../geode/cache/query/data/PortfolioData.java | 88 +-
.../geode/cache/query/data/PortfolioNoDS.java | 139 +-
.../geode/cache/query/data/PortfolioPdx.java | 180 +-
.../apache/geode/cache/query/data/Position.java | 107 +-
.../geode/cache/query/data/PositionNoDS.java | 108 +-
.../geode/cache/query/data/PositionPdx.java | 114 +-
.../query/data/ProhibitedSecurityQuote.java | 103 +-
.../apache/geode/cache/query/data/Quote.java | 189 +-
.../geode/cache/query/data/Restricted.java | 119 +-
.../geode/cache/query/data/SecurityMaster.java | 496 +-
.../apache/geode/cache/query/data/State.java | 118 +-
.../apache/geode/cache/query/data/Street.java | 39 +-
.../apache/geode/cache/query/data/Student.java | 46 +-
.../apache/geode/cache/query/data/TestData.java | 40 +-
.../apache/geode/cache/query/data/Vehicle.java | 41 +-
.../apache/geode/cache/query/data/Village.java | 74 +-
.../query/dunit/CloseCacheAuthorization.java | 30 +-
.../query/dunit/CompactRangeIndexDUnitTest.java | 464 +-
.../cache/query/dunit/CompiledInDUnitTest.java | 208 +-
.../cache/query/dunit/CqTimeTestListener.java | 107 +-
.../cache/query/dunit/GroupByDUnitImpl.java | 61 +-
.../dunit/GroupByPartitionedQueryDUnitTest.java | 32 +-
.../query/dunit/GroupByQueryDUnitTest.java | 39 +-
.../cache/query/dunit/HashIndexDUnitTest.java | 96 +-
.../geode/cache/query/dunit/HelperTestCase.java | 121 +-
.../dunit/NonDistinctOrderByDUnitImpl.java | 65 +-
.../NonDistinctOrderByPartitionedDUnitTest.java | 74 +-
...itionedRegionCompactRangeIndexDUnitTest.java | 61 +-
.../query/dunit/PdxStringQueryDUnitTest.java | 4115 +++---
.../dunit/QueryAPITestPartitionResolver.java | 28 +-
.../cache/query/dunit/QueryAuthorization.java | 34 +-
.../dunit/QueryDataInconsistencyDUnitTest.java | 408 +-
.../dunit/QueryIndexUsingXMLDUnitTest.java | 655 +-
.../QueryParamsAuthorizationDUnitTest.java | 43 +-
.../QueryUsingFunctionContextDUnitTest.java | 896 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 449 +-
.../cache/query/dunit/RemoteQueryDUnitTest.java | 2048 ++-
...esourceManagerWithQueryMonitorDUnitTest.java | 881 +-
.../query/dunit/SelectStarQueryDUnitTest.java | 3172 +++--
.../geode/cache/query/facets/lang/Address.java | 93 +-
.../geode/cache/query/facets/lang/Course.java | 114 +-
.../cache/query/facets/lang/Department.java | 121 +-
.../query/facets/lang/DerivedEmployee.java | 38 +-
.../geode/cache/query/facets/lang/Employee.java | 77 +-
.../geode/cache/query/facets/lang/Faculty.java | 94 +-
.../cache/query/facets/lang/G_Student.java | 79 +-
.../geode/cache/query/facets/lang/Person.java | 156 +-
.../geode/cache/query/facets/lang/Student.java | 160 +-
.../cache/query/facets/lang/UG_Student.java | 79 +-
.../geode/cache/query/facets/lang/Utils.java | 133 +-
.../ComparisonOperatorsJUnitTest.java | 218 +-
.../query/functional/ConstantsJUnitTest.java | 81 +-
.../query/functional/CountStarJUnitTest.java | 490 +-
.../CustomerOptimizationsJUnitTest.java | 1852 ++-
.../DistinctAndNonDistinctQueryJUnitTest.java | 101 +-
...ctResultsWithDupValuesInRegionJUnitTest.java | 44 +-
.../query/functional/FunctionJUnitTest.java | 222 +-
.../functional/GroupByPartitionedJUnitTest.java | 30 +-
.../functional/GroupByReplicatedJUnitTest.java | 22 +-
.../cache/query/functional/GroupByTestImpl.java | 154 +-
.../query/functional/GroupByTestInterface.java | 66 +-
.../query/functional/INOperatorJUnitTest.java | 361 +-
.../functional/IUM6Bug32345ReJUnitTest.java | 185 +-
.../cache/query/functional/IUMJUnitTest.java | 178 +-
.../IUMRCompositeIteratorJUnitTest.java | 122 +-
.../IUMRMultiIndexesMultiRegionJUnitTest.java | 927 +-
.../IUMRShuffleIteratorsJUnitTest.java | 247 +-
.../functional/IUMRSingleRegionJUnitTest.java | 200 +-
...ependentOperandsInWhereClause2JUnitTest.java | 316 +-
.../IndexCreationDeadLockJUnitTest.java | 99 +-
.../functional/IndexCreationJUnitTest.java | 396 +-
.../IndexMaintenanceAsynchJUnitTest.java | 72 +-
.../functional/IndexOnEntrySetJUnitTest.java | 142 +-
.../functional/IndexOperatorJUnitTest.java | 170 +-
.../IndexPrimaryKeyUsageJUnitTest.java | 159 +-
.../IndexUsageInNestedQueryJUnitTest.java | 79 +-
...IndexUsageWithAliasAsProjAtrbtJUnitTest.java | 71 +-
.../IndexUseMultFrmSnglCondJUnitTest.java | 127 +-
...ndexWithSngleFrmAndMultCondQryJUnitTest.java | 1139 +-
.../functional/IteratorTypeDefEmpJUnitTest.java | 29 +-
.../functional/IteratorTypeDefJUnitTest.java | 87 +-
.../IteratorTypeDefaultTypesJUnitTest.java | 413 +-
.../functional/IumMultConditionJUnitTest.java | 108 +-
.../functional/JavaSerializationJUnitTest.java | 28 +-
.../functional/LikePredicateJUnitTest.java | 1572 ++-
.../query/functional/LimitClauseJUnitTest.java | 1331 +-
.../functional/LogicalOperatorsJUnitTest.java | 186 +-
.../cache/query/functional/MiscJUnitTest.java | 347 +-
.../functional/MultiIndexCreationJUnitTest.java | 318 +-
.../MultiRegionIndexUsageJUnitTest.java | 242 +-
.../functional/MultipleRegionsJUnitTest.java | 60 +-
.../NegativeNumberQueriesJUnitTest.java | 37 +-
.../query/functional/NestedQueryJUnitTest.java | 326 +-
.../NonDistinctOrderByPartitionedJUnitTest.java | 70 +-
.../NonDistinctOrderByReplicatedJUnitTest.java | 130 +-
.../NonDistinctOrderByTestImplementation.java | 337 +-
.../query/functional/NumericQueryJUnitTest.java | 180 +-
.../functional/OrderByPartitionedJUnitTest.java | 253 +-
.../functional/OrderByReplicatedJUnitTest.java | 142 +-
.../functional/OrderByTestImplementation.java | 614 +-
.../functional/ParameterBindingJUnitTest.java | 67 +-
.../PdxGroupByPartitionedJUnitTest.java | 22 +-
.../PdxGroupByReplicatedJUnitTest.java | 24 +-
.../query/functional/PdxGroupByTestImpl.java | 119 +-
.../query/functional/PdxOrderByJUnitTest.java | 198 +-
.../functional/QRegionInterfaceJUnitTest.java | 175 +-
.../QueryREUpdateInProgressJUnitTest.java | 441 +-
.../functional/QueryUndefinedJUnitTest.java | 138 +-
.../functional/ReservedKeywordsJUnitTest.java | 44 +-
.../ResultsDataSerializabilityJUnitTest.java | 90 +-
.../query/functional/SelectToDateJUnitTest.java | 87 +-
.../functional/StructMemberAccessJUnitTest.java | 123 +-
.../query/functional/StructSetOrResultsSet.java | 210 +-
.../TestNewFunctionSSorRSIntegrationTest.java | 32 +-
.../CompiledAggregateFunctionJUnitTest.java | 137 +-
.../CompiledGroupBySelectJUnitTest.java | 45 +-
.../query/internal/CompiledInJUnitTest.java | 99 +-
.../CompiledJunctionInternalsJUnitTest.java | 3649 +++---
.../internal/CopyOnReadQueryJUnitTest.java | 353 +-
.../internal/ExecutionContextJUnitTest.java | 327 +-
.../query/internal/IndexManagerJUnitTest.java | 130 +-
.../internal/NWayMergeResultsJUnitTest.java | 120 +-
.../internal/OrderByComparatorJUnitTest.java | 42 +-
.../internal/ProjectionAttributeJUnitTest.java | 295 +-
.../query/internal/QCompilerJUnitTest.java | 397 +-
.../QueryExecutionContextJUnitTest.java | 30 +-
...ueryFromClauseCanonicalizationJUnitTest.java | 251 +-
.../QueryObjectSerializationJUnitTest.java | 108 +-
.../QueryObserverCallbackJUnitTest.java | 340 +-
.../query/internal/QueryTraceJUnitTest.java | 314 +-
.../query/internal/QueryUtilsJUnitTest.java | 268 +-
.../query/internal/ResultsBagJUnitTest.java | 128 +-
.../ResultsBagLimitBehaviourJUnitTest.java | 86 +-
.../ResultsCollectionWrapperLimitJUnitTest.java | 116 +-
.../SelectResultsComparatorJUnitTest.java | 47 +-
.../StructBagLimitBehaviourJUnitTest.java | 55 +-
.../query/internal/StructSetJUnitTest.java | 39 +-
.../internal/aggregate/AggregatorJUnitTest.java | 118 +-
.../internal/cq/CqAttributesImplJUnitTest.java | 26 +-
...AbstractIndexMaintenanceIntegrationTest.java | 36 +-
...syncIndexUpdaterThreadShutdownJUnitTest.java | 69 +-
.../index/AsynchIndexMaintenanceJUnitTest.java | 158 +-
.../CompactRangeIndexIndexMapJUnitTest.java | 110 +-
.../index/CompactRangeIndexJUnitTest.java | 333 +-
...actRangeIndexMaintenanceIntegrationTest.java | 32 +-
.../CompactRangeIndexQueryIntegrationTest.java | 40 +-
...rrentIndexInitOnOverflowRegionDUnitTest.java | 475 +-
...ndexOperationsOnOverflowRegionDUnitTest.java | 1091 +-
...pdateWithInplaceObjectModFalseDUnitTest.java | 614 +-
...ConcurrentIndexUpdateWithoutWLDUnitTest.java | 728 +-
.../index/CopyOnReadIndexDUnitTest.java | 444 +-
.../index/CopyOnReadIndexJUnitTest.java | 359 +-
.../DeclarativeIndexCreationJUnitTest.java | 34 +-
.../internal/index/EquiJoinIntegrationTest.java | 376 +-
.../HashIndexMaintenanceIntegrationTest.java | 41 +-
.../index/HashIndexQueryIntegrationTest.java | 984 +-
.../internal/index/HashIndexSetJUnitTest.java | 266 +-
.../index/IndexCreationInternalsJUnitTest.java | 189 +-
.../internal/index/IndexElemArrayJUnitTest.java | 65 +-
.../internal/index/IndexHintJUnitTest.java | 466 +-
.../query/internal/index/IndexJUnitTest.java | 57 +-
.../index/IndexMaintainceJUnitTest.java | 323 +-
.../index/IndexMaintenanceJUnitTest.java | 988 +-
.../index/IndexStatisticsJUnitTest.java | 580 +-
.../IndexTrackingQueryObserverDUnitTest.java | 130 +-
.../IndexTrackingQueryObserverJUnitTest.java | 106 +-
.../query/internal/index/IndexUseJUnitTest.java | 1536 ++-
.../IndexedMergeEquiJoinScenariosJUnitTest.java | 869 +-
...itializeIndexEntryDestroyQueryDUnitTest.java | 414 +-
.../internal/index/MapIndexStoreJUnitTest.java | 129 +-
.../MapRangeIndexMaintenanceJUnitTest.java | 486 +-
.../index/MemoryIndexStoreJUnitTest.java | 82 +-
...exStoreWithInplaceModificationJUnitTest.java | 22 +-
.../index/MultiIndexCreationDUnitTest.java | 98 +-
.../NewDeclarativeIndexCreationJUnitTest.java | 93 +-
...artitionedRegionEquiJoinIntegrationTest.java | 68 +-
.../index/PdxCopyOnReadQueryJUnitTest.java | 44 +-
...gRegionCreationIndexUpdateTypeJUnitTest.java | 79 +-
.../index/PutAllWithIndexPerfDUnitTest.java | 144 +-
.../internal/index/RangeIndexAPIJUnitTest.java | 417 +-
.../RangeIndexMaintenanceIntegrationTest.java | 29 +-
.../query/internal/types/TypeUtilTest.java | 30 +-
.../PRBasicIndexCreationDUnitTest.java | 1191 +-
.../PRBasicIndexCreationDeadlockDUnitTest.java | 104 +-
.../PRBasicMultiIndexCreationDUnitTest.java | 1137 +-
.../partitioned/PRBasicQueryDUnitTest.java | 449 +-
.../PRBasicRemoveIndexDUnitTest.java | 116 +-
.../PRColocatedEquiJoinDUnitTest.java | 1602 ++-
.../partitioned/PRIndexStatisticsJUnitTest.java | 517 +-
.../partitioned/PRInvalidQueryDUnitTest.java | 103 +-
.../partitioned/PRInvalidQueryJUnitTest.java | 82 +-
.../partitioned/PRQueryCacheCloseDUnitTest.java | 295 +-
.../PRQueryCacheClosedJUnitTest.java | 162 +-
.../query/partitioned/PRQueryDUnitHelper.java | 2299 ++--
.../query/partitioned/PRQueryDUnitTest.java | 1169 +-
.../query/partitioned/PRQueryJUnitTest.java | 117 +-
.../partitioned/PRQueryNumThreadsJUnitTest.java | 79 +-
.../PRQueryRegionCloseDUnitTest.java | 158 +-
.../PRQueryRegionClosedJUnitTest.java | 186 +-
.../PRQueryRegionDestroyedDUnitTest.java | 189 +-
.../PRQueryRegionDestroyedJUnitTest.java | 169 +-
.../PRQueryRemoteNodeExceptionDUnitTest.java | 1027 +-
.../geode/cache/query/transaction/Person.java | 30 +-
.../query/transaction/QueryAndJtaJUnitTest.java | 66 +-
.../internal/ConnectionCountProbeJUnitTest.java | 32 +-
.../cache/snapshot/CacheSnapshotJUnitTest.java | 48 +-
.../snapshot/ParallelSnapshotDUnitTest.java | 83 +-
.../geode/cache/snapshot/RegionGenerator.java | 141 +-
.../cache/snapshot/RegionSnapshotJUnitTest.java | 109 +-
.../snapshot/SnapshotByteArrayDUnitTest.java | 62 +-
.../geode/cache/snapshot/SnapshotDUnitTest.java | 118 +-
.../snapshot/SnapshotPerformanceDUnitTest.java | 84 +-
.../geode/cache/snapshot/SnapshotTestCase.java | 40 +-
.../cache/snapshot/WanSnapshotJUnitTest.java | 43 +-
.../geode/cache/util/PasswordUtilJUnitTest.java | 30 +-
.../apache/geode/cache30/Bug34387DUnitTest.java | 131 +-
.../apache/geode/cache30/Bug34948DUnitTest.java | 113 +-
.../apache/geode/cache30/Bug35214DUnitTest.java | 178 +-
.../apache/geode/cache30/Bug38013DUnitTest.java | 119 +-
.../apache/geode/cache30/Bug38741DUnitTest.java | 208 +-
.../apache/geode/cache30/Bug40255JUnitTest.java | 53 +-
.../apache/geode/cache30/Bug40662JUnitTest.java | 37 +-
.../apache/geode/cache30/Bug44418JUnitTest.java | 82 +-
.../geode/cache30/CacheCloseDUnitTest.java | 53 +-
.../geode/cache30/CacheListenerTestCase.java | 332 +-
.../geode/cache30/CacheLoaderTestCase.java | 367 +-
.../geode/cache30/CacheLogRollDUnitTest.java | 413 +-
.../geode/cache30/CacheMapTxnDUnitTest.java | 973 +-
...cheRegionsReliablityStatsCheckDUnitTest.java | 55 +-
.../cache30/CacheSerializableRunnable.java | 64 +-
.../geode/cache30/CacheStatisticsDUnitTest.java | 456 +-
.../org/apache/geode/cache30/CacheTestCase.java | 25 +-
.../geode/cache30/CacheWriterTestCase.java | 359 +-
.../cache30/CacheXMLPartitionResolver.java | 35 +-
.../geode/cache30/CacheXml66DUnitTest.java | 2143 ++--
.../geode/cache30/CacheXml70DUnitTest.java | 205 +-
.../geode/cache30/CacheXml80DUnitTest.java | 149 +-
.../geode/cache30/CacheXml81DUnitTest.java | 52 +-
.../geode/cache30/CacheXmlGeode10DUnitTest.java | 123 +-
.../apache/geode/cache30/CacheXmlTestCase.java | 58 +-
.../geode/cache30/CachedAllEventsDUnitTest.java | 56 +-
.../geode/cache30/CallbackArgDUnitTest.java | 158 +-
.../cache30/CertifiableTestCacheListener.java | 80 +-
.../cache30/ClearMultiVmCallBkDUnitTest.java | 348 +-
.../geode/cache30/ClearMultiVmDUnitTest.java | 809 +-
.../cache30/ClientMembershipDUnitTest.java | 412 +-
.../ClientMembershipSelectorDUnitTest.java | 22 +-
.../ClientRegisterInterestDUnitTest.java | 199 +-
...ClientRegisterInterestSelectorDUnitTest.java | 22 +-
.../geode/cache30/ClientServerCCEDUnitTest.java | 289 +-
.../geode/cache30/ClientServerTestCase.java | 303 +-
.../ConcurrentLeaveDuringGIIDUnitTest.java | 463 +-
...ibutedNoAckAsyncOverflowRegionDUnitTest.java | 43 +-
...iskDistributedNoAckAsyncRegionDUnitTest.java | 38 +-
.../DiskDistributedNoAckRegionTestCase.java | 28 +-
...ributedNoAckSyncOverflowRegionDUnitTest.java | 43 +-
.../geode/cache30/DiskRegionDUnitTest.java | 1298 +-
.../geode/cache30/DiskRegionTestImpl.java | 158 +-
.../cache30/DistAckMapMethodsDUnitTest.java | 1321 +-
...istributedAckOverflowRegionCCEDUnitTest.java | 42 +-
...tedAckOverflowRegionCCEOffHeapDUnitTest.java | 41 +-
...tributedAckPersistentRegionCCEDUnitTest.java | 404 +-
...dAckPersistentRegionCCEOffHeapDUnitTest.java | 41 +-
.../DistributedAckRegionCCEDUnitTest.java | 1361 +-
...DistributedAckRegionCCEOffHeapDUnitTest.java | 36 +-
...istributedAckRegionCompressionDUnitTest.java | 34 +-
.../cache30/DistributedAckRegionDUnitTest.java | 102 +-
.../DistributedAckRegionOffHeapDUnitTest.java | 36 +-
.../DistributedMulticastRegionDUnitTest.java | 101 +-
...MulticastRegionWithUDPSecurityDUnitTest.java | 37 +-
.../DistributedNoAckRegionCCEDUnitTest.java | 1206 +-
...stributedNoAckRegionCCEOffHeapDUnitTest.java | 36 +-
.../DistributedNoAckRegionDUnitTest.java | 240 +-
.../DistributedNoAckRegionOffHeapDUnitTest.java | 38 +-
.../geode/cache30/DynamicRegionDUnitTest.java | 203 +-
.../geode/cache30/GlobalLockingDUnitTest.java | 74 +-
.../geode/cache30/GlobalRegionCCEDUnitTest.java | 81 +-
.../GlobalRegionCCEOffHeapDUnitTest.java | 36 +-
.../geode/cache30/GlobalRegionDUnitTest.java | 459 +-
.../cache30/GlobalRegionOffHeapDUnitTest.java | 34 +-
.../cache30/LRUEvictionControllerDUnitTest.java | 274 +-
.../geode/cache30/LocalRegionDUnitTest.java | 167 +-
.../MemLRUEvictionControllerDUnitTest.java | 126 +-
.../geode/cache30/MultiVMRegionTestCase.java | 8831 +++++++------
.../geode/cache30/MyGatewayEventFilter1.java | 32 +-
.../geode/cache30/MyGatewayEventFilter2.java | 40 +-
.../cache30/MyGatewayTransportFilter1.java | 27 +-
.../cache30/MyGatewayTransportFilter2.java | 27 +-
.../OffHeapLRUEvictionControllerDUnitTest.java | 41 +-
.../PRBucketSynchronizationDUnitTest.java | 652 +-
.../PartitionedRegionCompressionDUnitTest.java | 35 +-
.../cache30/PartitionedRegionDUnitTest.java | 337 +-
...tionedRegionMembershipListenerDUnitTest.java | 73 +-
.../PartitionedRegionOffHeapDUnitTest.java | 34 +-
.../geode/cache30/PreloadedRegionTestCase.java | 38 +-
.../apache/geode/cache30/ProxyDUnitTest.java | 564 +-
.../cache30/PutAllCallBkRemoteVMDUnitTest.java | 671 +-
.../cache30/PutAllCallBkSingleVMDUnitTest.java | 523 +-
.../geode/cache30/PutAllMultiVmDUnitTest.java | 628 +-
.../apache/geode/cache30/QueueMsgDUnitTest.java | 334 +-
.../cache30/RRSynchronizationDUnitTest.java | 527 +-
.../geode/cache30/ReconnectDUnitTest.java | 806 +-
.../ReconnectWithUDPSecurityDUnitTest.java | 27 +-
.../ReconnectedCacheServerDUnitTest.java | 200 +-
.../geode/cache30/RegionAttributesTestCase.java | 144 +-
.../cache30/RegionExpirationDUnitTest.java | 228 +-
.../RegionMembershipListenerDUnitTest.java | 233 +-
.../RegionReliabilityDistAckDUnitTest.java | 29 +-
.../RegionReliabilityDistNoAckDUnitTest.java | 29 +-
.../RegionReliabilityGlobalDUnitTest.java | 29 +-
.../RegionReliabilityListenerDUnitTest.java | 84 +-
.../cache30/RegionReliabilityTestCase.java | 564 +-
.../apache/geode/cache30/RegionTestCase.java | 2587 ++--
.../geode/cache30/ReliabilityTestCase.java | 25 +-
.../cache30/RemoveAllMultiVmDUnitTest.java | 504 +-
.../geode/cache30/RequiredRolesDUnitTest.java | 204 +-
.../geode/cache30/SearchAndLoadDUnitTest.java | 647 +-
.../apache/geode/cache30/SlowRecDUnitTest.java | 828 +-
.../geode/cache30/TXDistributedDUnitTest.java | 1850 +--
.../apache/geode/cache30/TXOrderDUnitTest.java | 189 +-
.../geode/cache30/TXRestrictionsDUnitTest.java | 57 +-
.../apache/geode/cache30/TestCacheCallback.java | 50 +-
.../apache/geode/cache30/TestCacheListener.java | 94 +-
.../apache/geode/cache30/TestCacheLoader.java | 34 +-
.../apache/geode/cache30/TestCacheWriter.java | 74 +-
.../apache/geode/cache30/TestDiskRegion.java | 156 +-
.../org/apache/geode/cache30/TestHeapLRU.java | 86 +-
.../apache/geode/cache30/TestPdxSerializer.java | 33 +-
.../geode/cache30/TestTransactionListener.java | 47 +-
.../geode/cache30/TestTransactionWriter.java | 29 +-
.../AnalyzeSerializablesJUnitTest.java | 135 +-
.../codeAnalysis/ClassAndMethodDetails.java | 299 +-
.../geode/codeAnalysis/ClassAndMethods.java | 89 +-
.../codeAnalysis/ClassAndVariableDetails.java | 201 +-
.../geode/codeAnalysis/ClassAndVariables.java | 118 +-
.../geode/codeAnalysis/CompiledClassUtils.java | 818 +-
.../codeAnalysis/decode/CompiledAttribute.java | 61 +-
.../codeAnalysis/decode/CompiledClass.java | 447 +-
.../geode/codeAnalysis/decode/CompiledCode.java | 130 +-
.../codeAnalysis/decode/CompiledField.java | 183 +-
.../codeAnalysis/decode/CompiledMethod.java | 253 +-
.../apache/geode/codeAnalysis/decode/cp/Cp.java | 127 +-
.../geode/codeAnalysis/decode/cp/CpClass.java | 59 +-
.../geode/codeAnalysis/decode/cp/CpDouble.java | 62 +-
.../codeAnalysis/decode/cp/CpFieldref.java | 43 +-
.../geode/codeAnalysis/decode/cp/CpFloat.java | 44 +-
.../geode/codeAnalysis/decode/cp/CpInteger.java | 44 +-
.../decode/cp/CpInterfaceMethodref.java | 29 +-
.../codeAnalysis/decode/cp/CpInvokeDynamic.java | 67 +-
.../geode/codeAnalysis/decode/cp/CpLong.java | 62 +-
.../codeAnalysis/decode/cp/CpMethodHandle.java | 67 +-
.../codeAnalysis/decode/cp/CpMethodType.java | 63 +-
.../codeAnalysis/decode/cp/CpMethodref.java | 29 +-
.../codeAnalysis/decode/cp/CpNameAndType.java | 36 +-
.../geode/codeAnalysis/decode/cp/CpString.java | 32 +-
.../geode/codeAnalysis/decode/cp/CpUtf8.java | 217 +-
.../AbstractLauncherIntegrationTest.java | 39 +-
.../AbstractLauncherIntegrationTestCase.java | 113 +-
.../AbstractLauncherServiceStatusTest.java | 109 +-
.../geode/distributed/AbstractLauncherTest.java | 115 +-
...tractLocatorLauncherIntegrationTestCase.java | 87 +-
...ocatorLauncherRemoteIntegrationTestCase.java | 28 +-
...stractServerLauncherIntegrationTestCase.java | 77 +-
...ServerLauncherRemoteIntegrationTestCase.java | 70 +-
.../geode/distributed/AuthInitializer.java | 76 +-
.../distributed/DistributedLockBlackboard.java | 22 +-
.../DistributedLockBlackboardImpl.java | 61 +-
.../DistributedLockServiceDUnitTest.java | 1951 ++-
.../distributed/DistributedMemberDUnitTest.java | 152 +-
.../DistributedSystemConnectPerf.java | 54 +-
.../distributed/DistributedSystemDUnitTest.java | 157 +-
.../DistributedSystemIntegrationJUnitTest.java | 49 +-
.../distributed/DistributedSystemJUnitTest.java | 156 +-
.../distributed/HostedLocatorsDUnitTest.java | 173 +-
.../LauncherMemberMXBeanIntegrationTest.java | 73 +-
.../geode/distributed/LocatorDUnitTest.java | 549 +-
.../geode/distributed/LocatorJUnitTest.java | 72 +-
.../LocatorLauncherIntegrationTest.java | 122 +-
...LocatorLauncherLocalFileIntegrationTest.java | 35 +-
.../LocatorLauncherLocalIntegrationTest.java | 540 +-
...ocatorLauncherRemoteFileIntegrationTest.java | 98 +-
.../LocatorLauncherRemoteIntegrationTest.java | 549 +-
...rRemoteWithCustomLoggingIntegrationTest.java | 51 +-
.../geode/distributed/LocatorLauncherTest.java | 139 +-
.../geode/distributed/LocatorStateTest.java | 68 +-
.../LocatorUDPSecurityDUnitTest.java | 46 +-
.../MockServerLauncherCacheProvider.java | 22 +-
.../geode/distributed/MyAuthenticator.java | 93 +-
.../apache/geode/distributed/MyPrincipal.java | 56 +-
.../apache/geode/distributed/RoleDUnitTest.java | 80 +-
.../ServerLauncherIntegrationTest.java | 158 +-
.../ServerLauncherLocalFileIntegrationTest.java | 35 +-
.../ServerLauncherLocalIntegrationTest.java | 623 +-
...ServerLauncherRemoteFileIntegrationTest.java | 99 +-
.../ServerLauncherRemoteIntegrationTest.java | 900 +-
...rRemoteWithCustomLoggingIntegrationTest.java | 50 +-
.../geode/distributed/ServerLauncherTest.java | 400 +-
...rverLauncherWithProviderIntegrationTest.java | 45 +-
.../geode/distributed/SystemAdminDUnitTest.java | 74 +-
.../AtomicLongWithTerminalStateJUnitTest.java | 22 +-
.../distributed/internal/Bug40751DUnitTest.java | 71 +-
.../ConsoleDistributionManagerDUnitTest.java | 213 +-
.../geode/distributed/internal/DateMessage.java | 36 +-
.../internal/DistributionAdvisorDUnitTest.java | 93 +-
.../internal/DistributionConfigJUnitTest.java | 43 +-
.../internal/DistributionManagerDUnitTest.java | 288 +-
.../InternalDistributedSystemJUnitTest.java | 124 +-
.../apache/geode/distributed/internal/LDM.java | 31 +-
.../LocatorLoadSnapshotIntegrationTest.java | 70 +-
.../internal/LocatorLoadSnapshotJUnitTest.java | 211 +-
.../internal/ProduceDateMessages.java | 28 +-
.../internal/ProductUseLogDUnitTest.java | 286 +-
.../internal/ProductUseLogJUnitTest.java | 34 +-
.../internal/ServerLocatorJUnitTest.java | 31 +-
.../internal/SharedConfigurationJUnitTest.java | 31 +-
.../internal/StartupMessageDataJUnitTest.java | 112 +-
.../DeadlockDetectorIntegrationTest.java | 54 +-
.../internal/deadlock/DeadlockDetectorTest.java | 44 +-
.../deadlock/DependencyGraphJUnitTest.java | 30 +-
.../GemFireDeadlockDetectorDUnitTest.java | 97 +-
.../deadlock/UnsafeThreadLocalJUnitTest.java | 22 +-
.../internal/locks/CollaborationJUnitTest.java | 221 +-
.../internal/locks/DLockGrantorHelper.java | 99 +-
.../locks/DLockReentrantLockJUnitTest.java | 22 +-
.../membership/InternalRoleJUnitTest.java | 36 +-
.../membership/MembershipJUnitTest.java | 192 +-
.../internal/membership/NetViewJUnitTest.java | 518 +-
.../membership/gms/GMSMemberJUnitTest.java | 73 +-
.../membership/gms/MembershipManagerHelper.java | 138 +-
.../auth/AbstractGMSAuthenticatorTestCase.java | 94 +-
.../GMSAuthenticatorWithAuthenticatorTest.java | 64 +-
...GMSAuthenticatorWithSecurityManagerTest.java | 48 +-
.../gms/fd/GMSHealthMonitorJUnitTest.java | 250 +-
.../locator/GMSLocatorRecoveryJUnitTest.java | 61 +-
.../gms/membership/GMSJoinLeaveJUnitTest.java | 801 +-
.../gms/membership/GMSJoinLeaveTestHelper.java | 30 +-
.../gms/membership/StatRecorderJUnitTest.java | 522 +-
.../gms/messenger/GMSEncryptJUnitTest.java | 516 +-
.../messenger/GMSQuorumCheckerJUnitTest.java | 97 +-
.../membership/gms/messenger/InterceptUDP.java | 216 +-
.../messenger/JGroupsMessengerJUnitTest.java | 2223 ++--
.../gms/mgr/GMSMembershipManagerJUnitTest.java | 830 +-
.../StreamingOperationManyDUnitTest.java | 123 +-
.../StreamingOperationOneDUnitTest.java | 64 +-
.../TcpServerBackwardCompatDUnitTest.java | 164 +-
.../internal/tcpserver/TcpServerJUnitTest.java | 124 +-
.../support/DistributedSystemAdapter.java | 91 +-
.../geode/disttx/CacheMapDistTXDUnitTest.java | 30 +-
.../geode/disttx/DistTXDebugDUnitTest.java | 311 +-
.../geode/disttx/DistTXExpiryJUnitTest.java | 36 +-
.../apache/geode/disttx/DistTXJUnitTest.java | 43 +-
.../disttx/DistTXManagerImplJUnitTest.java | 30 +-
.../geode/disttx/DistTXOrderDUnitTest.java | 30 +-
.../disttx/DistTXPersistentDebugDUnitTest.java | 90 +-
.../DistTXReleasesOffHeapOnCloseJUnitTest.java | 32 +-
.../disttx/DistTXRestrictionsDUnitTest.java | 26 +-
.../geode/disttx/DistTXWithDeltaDUnitTest.java | 24 +-
.../geode/disttx/DistTXWriterJUnitTest.java | 35 +-
.../geode/disttx/DistTXWriterOOMEJUnitTest.java | 34 +-
.../disttx/DistributedTransactionDUnitTest.java | 974 +-
.../apache/geode/disttx/PRDistTXDUnitTest.java | 47 +-
.../apache/geode/disttx/PRDistTXJUnitTest.java | 34 +-
.../disttx/PRDistTXWithVersionsDUnitTest.java | 47 +-
...entPartitionedRegionWithDistTXDUnitTest.java | 28 +-
.../geode/internal/AbstractConfigJUnitTest.java | 27 +-
.../geode/internal/AvailablePortHelper.java | 76 +-
.../geode/internal/AvailablePortJUnitTest.java | 52 +-
...wardCompatibilitySerializationDUnitTest.java | 134 +-
.../geode/internal/Bug49856JUnitTest.java | 27 +-
.../geode/internal/Bug51616JUnitTest.java | 33 +-
.../apache/geode/internal/ByteArrayData.java | 31 +-
.../org/apache/geode/internal/ClassBuilder.java | 156 +-
.../ClassNotFoundExceptionDUnitTest.java | 145 +-
.../ClassPathLoaderIntegrationTest.java | 74 +-
.../geode/internal/ClassPathLoaderTest.java | 125 +-
.../geode/internal/ConfigSourceJUnitTest.java | 22 +-
.../internal/CopyOnWriteHashSetJUnitTest.java | 49 +-
.../internal/DataSerializableJUnitTest.java | 916 +-
.../geode/internal/FileUtilJUnitTest.java | 28 +-
.../GemFireVersionIntegrationJUnitTest.java | 27 +-
.../geode/internal/GemFireVersionJUnitTest.java | 41 +-
.../internal/HeapDataOutputStreamJUnitTest.java | 85 +-
.../geode/internal/InlineKeyJUnitTest.java | 100 +-
.../geode/internal/JarClassLoaderJUnitTest.java | 181 +-
.../geode/internal/JarDeployerDUnitTest.java | 144 +-
.../org/apache/geode/internal/JavaExec.java | 101 +-
.../geode/internal/LineWrapUnitJUnitTest.java | 32 +-
.../org/apache/geode/internal/LongBuffer.java | 146 +-
.../geode/internal/NanoTimerJUnitTest.java | 53 +-
.../geode/internal/ObjIdMapJUnitTest.java | 80 +-
.../internal/OneTaskOnlyDecoratorJUnitTest.java | 79 +-
.../geode/internal/PdxDeleteFieldDUnitTest.java | 87 +-
.../geode/internal/PdxDeleteFieldJUnitTest.java | 56 +-
.../geode/internal/PdxRenameDUnitTest.java | 105 +-
.../geode/internal/PdxRenameJUnitTest.java | 74 +-
.../PutAllOperationContextJUnitTest.java | 36 +-
...lityShouldUseArrayEqualsIntegrationTest.java | 113 +-
.../internal/SSLConfigIntegrationJUnitTest.java | 22 +-
.../geode/internal/SSLConfigJUnitTest.java | 964 +-
...hreadPoolExecutorWithKeepAliveJUnitTest.java | 192 +-
.../internal/UniqueIdGeneratorJUnitTest.java | 29 +-
.../apache/geode/internal/VersionJUnitTest.java | 24 +-
.../remote/DistributionLocatorIdJUnitTest.java | 38 +-
.../internal/cache/ARMLockTestHookAdapter.java | 28 +-
.../AbstractDistributedRegionJUnitTest.java | 332 +-
.../internal/cache/AbstractRegionJUnitTest.java | 73 +-
.../internal/cache/AbstractRegionMapTest.java | 34 +-
.../geode/internal/cache/BackupDUnitTest.java | 549 +-
.../geode/internal/cache/BackupJUnitTest.java | 196 +-
.../internal/cache/BucketRegionJUnitTest.java | 248 +-
.../geode/internal/cache/Bug33359DUnitTest.java | 227 +-
.../geode/internal/cache/Bug33726DUnitTest.java | 92 +-
.../geode/internal/cache/Bug33726JUnitTest.java | 95 +-
.../Bug34179TooManyFilesOpenJUnitTest.java | 45 +-
.../geode/internal/cache/Bug34583JUnitTest.java | 51 +-
.../geode/internal/cache/Bug37241DUnitTest.java | 144 +-
.../geode/internal/cache/Bug37244JUnitTest.java | 114 +-
.../geode/internal/cache/Bug37377DUnitTest.java | 122 +-
.../geode/internal/cache/Bug37500JUnitTest.java | 130 +-
.../geode/internal/cache/Bug39079DUnitTest.java | 132 +-
.../geode/internal/cache/Bug40299DUnitTest.java | 243 +-
.../geode/internal/cache/Bug40632DUnitTest.java | 36 +-
.../geode/internal/cache/Bug41091DUnitTest.java | 165 +-
.../geode/internal/cache/Bug41733DUnitTest.java | 134 +-
.../geode/internal/cache/Bug41957DUnitTest.java | 51 +-
.../geode/internal/cache/Bug42055DUnitTest.java | 52 +-
.../geode/internal/cache/Bug45164DUnitTest.java | 37 +-
.../geode/internal/cache/Bug45934DUnitTest.java | 36 +-
.../geode/internal/cache/Bug47667DUnitTest.java | 40 +-
.../geode/internal/cache/Bug48182JUnitTest.java | 118 +-
.../internal/cache/CacheAdvisorDUnitTest.java | 175 +-
.../cache/CacheLifecycleListenerJUnitTest.java | 139 +-
.../cache/CacheServerLauncherJUnitTest.java | 36 +-
.../internal/cache/CacheServiceJUnitTest.java | 28 +-
.../internal/cache/ClearDAckDUnitTest.java | 465 +-
.../internal/cache/ClearGlobalDUnitTest.java | 185 +-
.../cache/ClearRvvLockingDUnitTest.java | 228 +-
...ssagesRegionCreationAndDestroyJUnitTest.java | 101 +-
.../cache/ClientServerGetAllDUnitTest.java | 425 +-
...ServerInvalidAndDestroyedEntryDUnitTest.java | 327 +-
.../ClientServerTransactionCCEDUnitTest.java | 30 +-
.../cache/ClientServerTransactionDUnitTest.java | 2417 ++--
.../internal/cache/ColocationHelperTest.java | 47 +-
.../geode/internal/cache/CommitFunction.java | 62 +-
.../cache/ComplexDiskRegionJUnitTest.java | 48 +-
.../ConcurrentDestroySubRegionDUnitTest.java | 42 +-
...entFlushingAndRegionOperationsJUnitTest.java | 301 +-
.../cache/ConcurrentMapLocalJUnitTest.java | 128 +-
.../cache/ConcurrentMapOpsDUnitTest.java | 297 +-
.../ConcurrentRegionOperationsJUnitTest.java | 365 +-
...rentRollingAndRegionOperationsJUnitTest.java | 453 +-
.../internal/cache/ConflationJUnitTest.java | 116 +-
.../cache/ConnectDisconnectDUnitTest.java | 131 +-
.../cache/CustomerIDPartitionResolver.java | 39 +-
.../internal/cache/DeltaFaultInDUnitTest.java | 90 +-
.../cache/DeltaPropagationDUnitTest.java | 836 +-
.../cache/DeltaPropagationStatsDUnitTest.java | 231 +-
.../internal/cache/DeltaSizingDUnitTest.java | 177 +-
.../geode/internal/cache/DiskIFJUnitTest.java | 217 +-
.../geode/internal/cache/DiskIdJUnitTest.java | 130 +-
.../internal/cache/DiskInitFileJUnitTest.java | 98 +-
.../cache/DiskOfflineCompactionJUnitTest.java | 357 +-
.../internal/cache/DiskOldAPIsJUnitTest.java | 109 +-
...iskRandomOperationsAndRecoveryJUnitTest.java | 794 +-
.../cache/DiskRegByteArrayDUnitTest.java | 421 +-
.../cache/DiskRegCacheXmlJUnitTest.java | 120 +-
.../DiskRegCachexmlGeneratorJUnitTest.java | 77 +-
.../internal/cache/DiskRegCbkChkJUnitTest.java | 71 +-
.../DiskRegOplogSwtchingAndRollerJUnitTest.java | 402 +-
.../cache/DiskRegRecoveryJUnitTest.java | 760 +-
.../cache/DiskRegionAsyncRecoveryJUnitTest.java | 403 +-
...RegionChangingRegionAttributesJUnitTest.java | 72 +-
.../cache/DiskRegionClearJUnitTest.java | 96 +-
.../internal/cache/DiskRegionHelperFactory.java | 114 +-
.../DiskRegionIllegalArguementsJUnitTest.java | 82 +-
...iskRegionIllegalCacheXMLvaluesJUnitTest.java | 54 +-
.../internal/cache/DiskRegionJUnitTest.java | 1553 ++-
.../internal/cache/DiskRegionProperties.java | 132 +-
.../internal/cache/DiskRegionTestingBase.java | 128 +-
.../cache/DiskStoreFactoryJUnitTest.java | 173 +-
.../cache/DiskWriteAttributesJUnitTest.java | 132 +-
...DistrbutedRegionProfileOffHeapDUnitTest.java | 67 +-
.../cache/DistributedCacheTestCase.java | 280 +-
.../cache/DistributedRegionJUnitTest.java | 204 +-
.../internal/cache/EntryEventImplTest.java | 299 +-
.../cache/EnumListenerEventJUnitTest.java | 55 +-
.../internal/cache/EventTrackerDUnitTest.java | 147 +-
.../geode/internal/cache/EvictionDUnitTest.java | 188 +-
.../cache/EvictionObjectSizerDUnitTest.java | 220 +-
.../internal/cache/EvictionStatsDUnitTest.java | 417 +-
.../geode/internal/cache/EvictionTestBase.java | 353 +-
.../internal/cache/FaultingInJUnitTest.java | 77 +-
.../cache/FixedPRSinglehopDUnitTest.java | 442 +-
.../geode/internal/cache/GIIDeltaDUnitTest.java | 1204 +-
.../internal/cache/GIIFlowControlDUnitTest.java | 165 +-
.../internal/cache/GemFireCacheImplTest.java | 31 +-
.../internal/cache/GridAdvisorDUnitTest.java | 629 +-
.../HAOverflowMemObjectSizerDUnitTest.java | 122 +-
.../cache/IncrementalBackupDUnitTest.java | 647 +-
.../cache/InterruptClientServerDUnitTest.java | 121 +-
.../internal/cache/InterruptDiskJUnitTest.java | 58 +-
...InterruptsConserveSocketsFalseDUnitTest.java | 22 +-
.../internal/cache/InterruptsDUnitTest.java | 119 +-
.../geode/internal/cache/IteratorDUnitTest.java | 39 +-
.../LIFOEvictionAlgoEnabledRegionJUnitTest.java | 183 +-
...victionAlgoMemoryEnabledRegionJUnitTest.java | 345 +-
.../geode/internal/cache/LocalDataSetTest.java | 30 +-
.../internal/cache/MapClearGIIDUnitTest.java | 110 +-
.../internal/cache/MapInterface2JUnitTest.java | 196 +-
.../internal/cache/MapInterfaceJUnitTest.java | 95 +-
.../geode/internal/cache/MockCacheService.java | 24 +-
.../internal/cache/MockCacheServiceImpl.java | 24 +-
.../MultipleOplogsRollingFeatureJUnitTest.java | 71 +-
.../cache/NestedTransactionFunction.java | 43 +-
.../cache/NetSearchMessagingDUnitTest.java | 218 +-
.../cache/OffHeapEvictionDUnitTest.java | 66 +-
.../cache/OffHeapEvictionStatsDUnitTest.java | 37 +-
.../geode/internal/cache/OffHeapTestUtil.java | 35 +-
.../cache/OffHeapValueWrapperJUnitTest.java | 69 +-
.../cache/OfflineSnapshotJUnitTest.java | 80 +-
.../geode/internal/cache/OldVLJUnitTest.java | 22 +-
.../cache/OldValueImporterTestBase.java | 89 +-
.../cache/OplogEntryIdMapJUnitTest.java | 46 +-
.../cache/OplogEntryIdSetJUnitTest.java | 36 +-
.../geode/internal/cache/OplogJUnitTest.java | 4604 ++++---
.../geode/internal/cache/OplogRVVJUnitTest.java | 170 +-
.../cache/OrderedTombstoneMapJUnitTest.java | 30 +-
.../cache/P2PDeltaPropagationDUnitTest.java | 474 +-
.../internal/cache/PRBadToDataDUnitTest.java | 90 +-
.../cache/PRConcurrentMapOpsJUnitTest.java | 163 +-
.../cache/PRDataStoreMemoryJUnitTest.java | 65 +-
.../PRDataStoreMemoryOffHeapJUnitTest.java | 30 +-
.../geode/internal/cache/PRTXJUnitTest.java | 109 +-
.../cache/PartitionAttributesImplJUnitTest.java | 258 +-
.../cache/PartitionListenerDUnitTest.java | 108 +-
...dRegionAPIConserveSocketsFalseDUnitTest.java | 27 +-
.../cache/PartitionedRegionAPIDUnitTest.java | 2388 ++--
.../PartitionedRegionAsSubRegionDUnitTest.java | 298 +-
...gionBucketCreationDistributionDUnitTest.java | 1391 +--
.../PartitionedRegionCacheCloseDUnitTest.java | 325 +-
...rtitionedRegionCacheLoaderForRootRegion.java | 52 +-
...artitionedRegionCacheLoaderForSubRegion.java | 62 +-
...rtitionedRegionCacheXMLExampleDUnitTest.java | 200 +-
.../PartitionedRegionCreationDUnitTest.java | 671 +-
.../PartitionedRegionCreationJUnitTest.java | 319 +-
.../cache/PartitionedRegionDUnitTestCase.java | 503 +-
.../PartitionedRegionDataStoreJUnitTest.java | 144 +-
...rtitionedRegionDelayedRecoveryDUnitTest.java | 165 +-
.../PartitionedRegionDestroyDUnitTest.java | 298 +-
.../PartitionedRegionEntryCountDUnitTest.java | 115 +-
.../PartitionedRegionEvictionDUnitTest.java | 2068 ++-
.../cache/PartitionedRegionHADUnitTest.java | 453 +-
...onedRegionHAFailureAndRecoveryDUnitTest.java | 377 +-
.../cache/PartitionedRegionHelperJUnitTest.java | 26 +-
.../PartitionedRegionInvalidateDUnitTest.java | 86 +-
...artitionedRegionLocalMaxMemoryDUnitTest.java | 195 +-
...nedRegionLocalMaxMemoryOffHeapDUnitTest.java | 40 +-
.../PartitionedRegionMultipleDUnitTest.java | 675 +-
...rtitionedRegionOffHeapEvictionDUnitTest.java | 43 +-
.../cache/PartitionedRegionPRIDDUnitTest.java | 159 +-
.../cache/PartitionedRegionQueryDUnitTest.java | 699 +-
...onedRegionQueryEvaluatorIntegrationTest.java | 188 +-
.../PartitionedRegionQueryEvaluatorTest.java | 264 +-
...artitionedRegionRedundancyZoneDUnitTest.java | 77 +-
...tionedRegionSerializableObjectJUnitTest.java | 84 +-
.../PartitionedRegionSingleHopDUnitTest.java | 1053 +-
...RegionSingleHopWithServerGroupDUnitTest.java | 1177 +-
...onedRegionSingleNodeOperationsJUnitTest.java | 1287 +-
.../cache/PartitionedRegionSizeDUnitTest.java | 375 +-
.../cache/PartitionedRegionStatsDUnitTest.java | 593 +-
.../cache/PartitionedRegionStatsJUnitTest.java | 348 +-
.../cache/PartitionedRegionTestHelper.java | 248 +-
.../PartitionedRegionTestUtilsDUnitTest.java | 481 +-
.../PartitionedRegionWithSameNameDUnitTest.java | 710 +-
.../PersistentPartitionedRegionJUnitTest.java | 99 +-
.../internal/cache/PutAllDAckDUnitTest.java | 352 +-
.../internal/cache/PutAllGlobalDUnitTest.java | 460 +-
.../cache/RegionEntryFlagsJUnitTest.java | 31 +-
.../internal/cache/RegionListenerJUnitTest.java | 30 +-
.../cache/RemoteOperationMessageTest.java | 51 +-
.../cache/RemotePutReplyMessageJUnitTest.java | 31 +-
.../cache/RemoteTransactionCCEDUnitTest.java | 22 +-
.../cache/RemoteTransactionDUnitTest.java | 1912 +--
.../internal/cache/RemoveAllDAckDUnitTest.java | 250 +-
.../internal/cache/RemoveDAckDUnitTest.java | 282 +-
.../internal/cache/RemoveGlobalDUnitTest.java | 402 +-
.../cache/ReplaceWithOverflowJUnitTest.java | 38 +-
.../geode/internal/cache/RollbackFunction.java | 62 +-
.../cache/SearchLoadAndWriteProcessorTest.java | 37 +-
.../cache/SimpleDiskRegionJUnitTest.java | 216 +-
.../internal/cache/SingleHopStatsDUnitTest.java | 196 +-
.../internal/cache/SizingFlagDUnitTest.java | 450 +-
.../geode/internal/cache/SnapshotTestUtil.java | 26 +-
.../internal/cache/SystemFailureDUnitTest.java | 632 +-
.../internal/cache/TXManagerImplJUnitTest.java | 61 +-
.../geode/internal/cache/TXManagerImplTest.java | 154 +-
.../cache/TXReservationMgrJUnitTest.java | 71 +-
.../apache/geode/internal/cache/TestDelta.java | 46 +-
.../internal/cache/TestHelperForHydraTests.java | 34 +-
.../internal/cache/TestNonSizerObject.java | 24 +-
.../internal/cache/TestObjectSizerImpl.java | 63 +-
.../apache/geode/internal/cache/TestUtils.java | 26 +-
.../cache/TombstoneCreationJUnitTest.java | 203 +-
.../cache/TransactionsWithDeltaDUnitTest.java | 103 +-
.../internal/cache/UnitTestValueHolder.java | 29 +-
.../apache/geode/internal/cache/UnzipUtil.java | 53 +-
.../internal/cache/UpdateVersionJUnitTest.java | 242 +-
.../geode/internal/cache/VLJUnitTest.java | 29 +-
.../cache/control/FilterByPathJUnitTest.java | 34 +-
.../cache/control/MemoryMonitorJUnitTest.java | 501 +-
.../control/MemoryMonitorOffHeapJUnitTest.java | 161 +-
.../control/MemoryThresholdsJUnitTest.java | 123 +-
.../control/RebalanceOperationDUnitTest.java | 2375 ++--
.../control/TestMemoryThresholdListener.java | 121 +-
...skRegOverflowAsyncGetInMemPerfJUnitTest.java | 61 +-
...iskRegOverflowAsyncJUnitPerformanceTest.java | 73 +-
...lowSyncGetInMemPerfJUnitPerformanceTest.java | 51 +-
...DiskRegOverflowSyncJUnitPerformanceTest.java | 73 +-
...egionOverflowAsyncRollingOpLogJUnitTest.java | 137 +-
...RegionOverflowSyncRollingOpLogJUnitTest.java | 145 +-
.../DiskRegionPerfJUnitPerformanceTest.java | 278 +-
.../DiskRegionPersistOnlySyncJUnitTest.java | 101 +-
...DiskRegionRollOpLogJUnitPerformanceTest.java | 261 +-
...ltiThreadedOplogPerJUnitPerformanceTest.java | 88 +-
.../cache/execute/Bug51193DUnitTest.java | 66 +-
.../ClientServerFunctionExecutionDUnitTest.java | 694 +-
.../execute/ColocationFailoverDUnitTest.java | 170 +-
.../cache/execute/CustomResultCollector.java | 39 +-
.../execute/CustomerIDPartitionResolver.java | 36 +-
...ributedRegionFunctionExecutionDUnitTest.java | 812 +-
.../FunctionExecution_ExceptionDUnitTest.java | 495 +-
.../cache/execute/FunctionServiceBase.java | 175 +-
.../FunctionServiceClientAccessorPRBase.java | 64 +-
...unctionServiceClientAccessorPRDUnitTest.java | 25 +-
...lientAccessorPRMultipleMembersDUnitTest.java | 32 +-
...essorPRMultipleMembersMultihopDUnitTest.java | 34 +-
.../execute/FunctionServiceClientBase.java | 30 +-
...nServiceClientMultipleOnServerDUnitTest.java | 28 +-
.../FunctionServiceClientOnServerBase.java | 25 +-
.../FunctionServiceClientOnServerDUnitTest.java | 25 +-
.../FunctionServiceLocalPRDUnitTest.java | 31 +-
.../FunctionServiceLocalRRDUnitTest.java | 31 +-
...unctionServiceMultipleOnMemberDUnitTest.java | 28 +-
.../FunctionServicePeerAccessorPRBase.java | 43 +-
.../FunctionServicePeerAccessorPRDUnitTest.java | 22 +-
...ePeerAccessorPRMultipleMembersDUnitTest.java | 25 +-
.../FunctionServicePeerAccessorRRDUnitTest.java | 36 +-
.../FunctionServiceSingleOnMemberDUnitTest.java | 28 +-
.../execute/FunctionServiceStatsDUnitTest.java | 1390 +--
.../cache/execute/LocalDataSetDUnitTest.java | 145 +-
.../cache/execute/LocalDataSetFunction.java | 59 +-
.../execute/LocalDataSetIndexingDUnitTest.java | 180 +-
.../LocalFunctionExecutionDUnitTest.java | 115 +-
.../MemberFunctionExecutionDUnitTest.java | 462 +-
.../MultiRegionFunctionExecutionDUnitTest.java | 163 +-
.../execute/MyFunctionExecutionException.java | 35 +-
.../cache/execute/MyTransactionFunction.java | 399 +-
.../OnGroupsFunctionExecutionDUnitTest.java | 204 +-
...ntServerFunctionExecutionNoAckDUnitTest.java | 165 +-
...tServerRegionFunctionExecutionDUnitTest.java | 1093 +-
...egionFunctionExecutionFailoverDUnitTest.java | 379 +-
...onFunctionExecutionNoSingleHopDUnitTest.java | 589 +-
...onExecutionSelectorNoSingleHopDUnitTest.java | 592 +-
...gionFunctionExecutionSingleHopDUnitTest.java | 2008 ++-
.../cache/execute/PRClientServerTestBase.java | 534 +-
.../cache/execute/PRColocationDUnitTest.java | 1911 ++-
.../execute/PRCustomPartitioningDUnitTest.java | 555 +-
.../execute/PRFunctionExecutionDUnitTest.java | 2529 ++--
.../PRFunctionExecutionTimeOutDUnitTest.java | 718 +-
...ctionExecutionWithResultSenderDUnitTest.java | 434 +-
.../execute/PRPerformanceTestDUnitTest.java | 339 +-
.../cache/execute/PRTransactionDUnitTest.java | 413 +-
.../PRTransactionWithVersionsDUnitTest.java | 22 +-
.../internal/cache/execute/PerfFunction.java | 42 +-
.../internal/cache/execute/PerfTxFunction.java | 45 +-
.../cache/execute/PerformanceTestFunction.java | 39 +-
.../execute/SingleHopGetAllPutAllDUnitTest.java | 93 +-
.../internal/cache/execute/TestFunction.java | 46 +-
.../internal/cache/execute/data/CustId.java | 26 +-
.../internal/cache/execute/data/Customer.java | 26 +-
.../internal/cache/execute/data/Order.java | 32 +-
.../internal/cache/execute/data/OrderId.java | 35 +-
.../internal/cache/execute/data/Shipment.java | 34 +-
.../internal/cache/execute/data/ShipmentId.java | 38 +-
.../SimpleExtensionPointJUnitTest.java | 34 +-
.../extension/mock/AbstractMockExtension.java | 24 +-
.../mock/AbstractMockExtensionXmlGenerator.java | 22 +-
.../mock/AlterMockCacheExtensionFunction.java | 36 +-
.../mock/AlterMockRegionExtensionFunction.java | 34 +-
.../mock/CreateMockCacheExtensionFunction.java | 36 +-
.../mock/CreateMockRegionExtensionFunction.java | 34 +-
.../mock/DestroyMockCacheExtensionFunction.java | 34 +-
.../DestroyMockRegionExtensionFunction.java | 34 +-
.../extension/mock/MockCacheExtension.java | 22 +-
.../mock/MockCacheExtensionXmlGenerator.java | 22 +-
.../extension/mock/MockExtensionCommands.java | 119 +-
.../extension/mock/MockExtensionXmlParser.java | 100 +-
.../extension/mock/MockRegionExtension.java | 22 +-
.../mock/MockRegionExtensionXmlGenerator.java | 25 +-
...gionFunctionFunctionInvocationException.java | 36 +-
.../functions/DistributedRegionFunction.java | 45 +-
.../cache/functions/LocalDataSetFunction.java | 53 +-
.../internal/cache/functions/TestFunction.java | 876 +-
.../ha/BlockingHARQAddOperationJUnitTest.java | 130 +-
.../cache/ha/BlockingHARQStatsJUnitTest.java | 54 +-
.../cache/ha/BlockingHARegionJUnitTest.java | 202 +-
.../ha/BlockingHARegionQueueJUnitTest.java | 134 +-
.../cache/ha/Bug36853EventsExpiryDUnitTest.java | 152 +-
.../internal/cache/ha/Bug48571DUnitTest.java | 84 +-
.../internal/cache/ha/Bug48879DUnitTest.java | 103 +-
.../internal/cache/ha/ConflatableObject.java | 118 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 347 +-
.../cache/ha/EventIdOptimizationJUnitTest.java | 201 +-
.../internal/cache/ha/FailoverDUnitTest.java | 140 +-
.../internal/cache/ha/HABugInPutDUnitTest.java | 65 +-
.../internal/cache/ha/HAClearDUnitTest.java | 275 +-
.../cache/ha/HAConflationDUnitTest.java | 232 +-
.../internal/cache/ha/HADuplicateDUnitTest.java | 123 +-
.../cache/ha/HAEventIdPropagationDUnitTest.java | 358 +-
.../internal/cache/ha/HAExpiryDUnitTest.java | 145 +-
.../internal/cache/ha/HAGIIBugDUnitTest.java | 173 +-
.../geode/internal/cache/ha/HAGIIDUnitTest.java | 176 +-
.../geode/internal/cache/ha/HAHelper.java | 44 +-
.../cache/ha/HARQAddOperationJUnitTest.java | 619 +-
.../cache/ha/HARQueueNewImplDUnitTest.java | 670 +-
.../internal/cache/ha/HARegionDUnitTest.java | 186 +-
.../internal/cache/ha/HARegionJUnitTest.java | 57 +-
.../cache/ha/HARegionQueueDUnitTest.java | 696 +-
.../cache/ha/HARegionQueueJUnitTest.java | 1085 +-
.../ha/HARegionQueueStartStopJUnitTest.java | 68 +-
.../cache/ha/HARegionQueueStatsJUnitTest.java | 234 +-
.../cache/ha/HASlowReceiverDUnitTest.java | 100 +-
.../ha/OperationsPropagationDUnitTest.java | 146 +-
.../internal/cache/ha/PutAllDUnitTest.java | 292 +-
.../internal/cache/ha/StatsBugDUnitTest.java | 153 +-
.../cache/ha/TestBlockingHARegionQueue.java | 66 +-
.../cache/ha/ThreadIdentifierJUnitTest.java | 40 +-
.../cache/locks/TXLockServiceDUnitTest.java | 620 +-
.../internal/cache/lru/LRUClockJUnitTest.java | 367 +-
.../cache/lru/TransactionsWithOverflowTest.java | 33 +-
.../cache/partitioned/Bug39356DUnitTest.java | 114 +-
.../cache/partitioned/Bug43684DUnitTest.java | 119 +-
.../cache/partitioned/Bug47388DUnitTest.java | 88 +-
.../cache/partitioned/Bug51400DUnitTest.java | 68 +-
.../ColocatedRegionDetailsJUnitTest.java | 146 +-
.../partitioned/ElidedPutAllDUnitTest.java | 244 +-
.../FetchEntriesMessageJUnitTest.java | 179 +-
.../OfflineMembersDetailsJUnitTest.java | 33 +-
.../cache/partitioned/PartitionMessageTest.java | 60 +-
.../partitioned/PartitionResolverDUnitTest.java | 212 +-
.../PartitionedRegionLoadModelJUnitTest.java | 1628 ++-
.../PartitionedRegionLoaderWriterDUnitTest.java | 114 +-
...rtitionedRegionMetaDataCleanupDUnitTest.java | 142 +-
.../partitioned/PersistPRKRFDUnitTest.java | 84 +-
...tentColocatedPartitionedRegionDUnitTest.java | 2095 ++--
.../PersistentPartitionedRegionDUnitTest.java | 1961 +--
...tentPartitionedRegionOldConfigDUnitTest.java | 32 +-
.../PersistentPartitionedRegionTestBase.java | 413 +-
...rtitionedRegionWithTransactionDUnitTest.java | 86 +-
.../PutPutReplyMessageJUnitTest.java | 31 +-
.../cache/partitioned/ShutdownAllDUnitTest.java | 452 +-
...treamingPartitionOperationManyDUnitTest.java | 145 +-
...StreamingPartitionOperationOneDUnitTest.java | 110 +-
.../fixed/CustomerFixedPartitionResolver.java | 67 +-
.../fixed/FixedPartitioningDUnitTest.java | 1263 +-
.../fixed/FixedPartitioningTestBase.java | 755 +-
.../FixedPartitioningTestBaseJUnitTest.java | 55 +-
...ngWithColocationAndPersistenceDUnitTest.java | 1159 +-
.../cache/partitioned/fixed/MyDate1.java | 42 +-
.../cache/partitioned/fixed/MyDate2.java | 34 +-
.../cache/partitioned/fixed/MyDate3.java | 42 +-
.../fixed/QuarterPartitionResolver.java | 49 +-
.../SingleHopQuarterPartitionResolver.java | 109 +-
.../rebalance/BucketOperatorImplTest.java | 41 +-
.../rebalance/BucketOperatorWrapperTest.java | 296 +-
.../persistence/BackupInspectorJUnitTest.java | 167 +-
.../PersistentRVVRecoveryDUnitTest.java | 611 +-
.../PersistentRecoveryOrderDUnitTest.java | 1204 +-
...rsistentRecoveryOrderOldConfigDUnitTest.java | 31 +-
.../PersistentReplicatedTestBase.java | 54 +-
.../TemporaryResultSetFactoryJUnitTest.java | 57 +-
.../RegionEntryFactoryBuilderJUnitTest.java | 41 +-
.../cache/snapshot/GFSnapshotDUnitTest.java | 73 +-
.../GFSnapshotJUnitPerformanceTest.java | 62 +-
.../internal/cache/snapshot/TestObject.java | 27 +-
.../internal/cache/tier/Bug40396DUnitTest.java | 132 +-
.../tier/sockets/AcceptorImplJUnitTest.java | 133 +-
...mpatibilityHigherVersionClientDUnitTest.java | 122 +-
.../cache/tier/sockets/Bug36269DUnitTest.java | 70 +-
.../cache/tier/sockets/Bug36457DUnitTest.java | 104 +-
.../cache/tier/sockets/Bug36805DUnitTest.java | 157 +-
.../cache/tier/sockets/Bug36829DUnitTest.java | 69 +-
.../cache/tier/sockets/Bug36995DUnitTest.java | 126 +-
.../cache/tier/sockets/Bug37210DUnitTest.java | 142 +-
.../cache/tier/sockets/Bug37805DUnitTest.java | 97 +-
.../CacheServerMaxConnectionsJUnitTest.java | 67 +-
...heServerSelectorMaxConnectionsJUnitTest.java | 27 +-
.../cache/tier/sockets/CacheServerTestUtil.java | 258 +-
.../CacheServerTransactionsDUnitTest.java | 402 +-
...acheServerTransactionsSelectorDUnitTest.java | 30 +-
.../tier/sockets/ClearPropagationDUnitTest.java | 270 +-
.../tier/sockets/ClientConflationDUnitTest.java | 229 +-
.../sockets/ClientHealthMonitorJUnitTest.java | 166 +-
.../ClientHealthMonitorSelectorJUnitTest.java | 27 +-
.../sockets/ClientInterestNotifyDUnitTest.java | 329 +-
.../ClientServerForceInvalidateDUnitTest.java | 170 +-
.../tier/sockets/ClientServerMiscDUnitTest.java | 658 +-
.../ClientServerMiscSelectorDUnitTest.java | 30 +-
.../cache/tier/sockets/ConflationDUnitTest.java | 446 +-
.../tier/sockets/ConnectionProxyJUnitTest.java | 1182 +-
.../DataSerializerPropogationDUnitTest.java | 553 +-
.../cache/tier/sockets/DeltaEOFException.java | 93 +-
.../DestroyEntryPropagationDUnitTest.java | 205 +-
.../sockets/DurableClientBug39997DUnitTest.java | 36 +-
.../DurableClientQueueSizeDUnitTest.java | 175 +-
.../DurableClientReconnectAutoDUnitTest.java | 37 +-
.../DurableClientReconnectDUnitTest.java | 548 +-
.../sockets/DurableClientStatsDUnitTest.java | 282 +-
.../sockets/DurableRegistrationDUnitTest.java | 522 +-
.../sockets/DurableResponseMatrixDUnitTest.java | 272 +-
.../sockets/EventIDVerificationDUnitTest.java | 239 +-
.../EventIDVerificationInP2PDUnitTest.java | 137 +-
.../cache/tier/sockets/FaultyDelta.java | 91 +-
.../FilterProfileIntegrationJUnitTest.java | 217 +-
.../tier/sockets/FilterProfileJUnitTest.java | 141 +-
.../ForceInvalidateEvictionDUnitTest.java | 189 +-
...ForceInvalidateOffHeapEvictionDUnitTest.java | 30 +-
.../cache/tier/sockets/HABug36738DUnitTest.java | 56 +-
.../sockets/HAInterestDistributedTestCase.java | 27 +-
.../tier/sockets/HAInterestPart1DUnitTest.java | 56 +-
.../tier/sockets/HAInterestPart2DUnitTest.java | 89 +-
.../cache/tier/sockets/HAInterestTestCase.java | 140 +-
.../sockets/HAStartupAndFailoverDUnitTest.java | 684 +-
.../internal/cache/tier/sockets/HaHelper.java | 37 +-
.../InstantiatorPropagationDUnitTest.java | 632 +-
.../tier/sockets/InterestListDUnitTest.java | 488 +-
.../sockets/InterestListEndpointDUnitTest.java | 314 +-
.../InterestListEndpointPRDUnitTest.java | 28 +-
.../InterestListEndpointSelectorDUnitTest.java | 29 +-
.../sockets/InterestListFailoverDUnitTest.java | 178 +-
.../sockets/InterestListRecoveryDUnitTest.java | 262 +-
.../sockets/InterestRegrListenerDUnitTest.java | 351 +-
.../sockets/InterestResultPolicyDUnitTest.java | 204 +-
.../cache/tier/sockets/MessageJUnitTest.java | 43 +-
.../sockets/NewRegionAttributesDUnitTest.java | 263 +-
.../tier/sockets/ObjectPartListJUnitTest.java | 76 +-
.../tier/sockets/RedundancyLevelJUnitTest.java | 120 +-
.../sockets/RedundancyLevelPart1DUnitTest.java | 333 +-
.../sockets/RedundancyLevelPart2DUnitTest.java | 341 +-
.../sockets/RedundancyLevelPart3DUnitTest.java | 139 +-
.../tier/sockets/RedundancyLevelTestBase.java | 352 +-
.../tier/sockets/RegionCloseDUnitTest.java | 108 +-
...erInterestBeforeRegionCreationDUnitTest.java | 192 +-
.../sockets/RegisterInterestKeysDUnitTest.java | 119 +-
.../RegisterInterestKeysPRDUnitTest.java | 28 +-
.../sockets/ReliableMessagingDUnitTest.java | 239 +-
.../internal/cache/tier/sockets/TestFilter.java | 112 +-
.../sockets/UnregisterInterestDUnitTest.java | 211 +-
.../sockets/UpdatePropagationDUnitTest.java | 186 +-
.../sockets/UpdatePropagationPRDUnitTest.java | 24 +-
.../VerifyEventIDGenerationInP2PDUnitTest.java | 76 +-
...UpdatesFromNonInterestEndPointDUnitTest.java | 134 +-
.../tier/sockets/command/CommitCommandTest.java | 56 +-
.../tier/sockets/command/ContainsKey66Test.java | 28 +-
.../tier/sockets/command/ContainsKeyTest.java | 28 +-
.../tier/sockets/command/CreateRegionTest.java | 25 +-
.../tier/sockets/command/Destroy65Test.java | 31 +-
.../tier/sockets/command/DestroyRegionTest.java | 28 +-
.../cache/tier/sockets/command/DestroyTest.java | 31 +-
.../sockets/command/ExecuteFunction65Test.java | 49 +-
.../sockets/command/ExecuteFunction66Test.java | 57 +-
.../sockets/command/ExecuteFunctionTest.java | 45 +-
.../cache/tier/sockets/command/Get70Test.java | 28 +-
.../tier/sockets/command/GetAll651Test.java | 45 +-
.../tier/sockets/command/GetAll70Test.java | 49 +-
.../cache/tier/sockets/command/GetAllTest.java | 45 +-
.../sockets/command/GetAllWithCallbackTest.java | 47 +-
...tClientPartitionAttributesCommand66Test.java | 22 +-
...GetClientPartitionAttributesCommandTest.java | 22 +-
.../tier/sockets/command/InvalidateTest.java | 40 +-
.../cache/tier/sockets/command/KeySetTest.java | 36 +-
.../cache/tier/sockets/command/Put61Test.java | 45 +-
.../cache/tier/sockets/command/Put65Test.java | 46 +-
.../cache/tier/sockets/command/PutTest.java | 45 +-
.../sockets/command/RegisterInterest61Test.java | 34 +-
.../command/RegisterInterestList61Test.java | 36 +-
.../command/RegisterInterestList66Test.java | 38 +-
.../command/RegisterInterestListTest.java | 36 +-
.../sockets/command/RegisterInterestTest.java | 34 +-
.../tier/sockets/command/RemoveAllTest.java | 37 +-
.../cache/tier/sockets/command/RequestTest.java | 28 +-
.../sockets/command/UnregisterInterestTest.java | 35 +-
.../cache/tx/AbstractPeerTXRegionStubTest.java | 75 +-
.../versions/AbstractVersionTagTestBase.java | 39 +-
.../cache/versions/RVVExceptionJUnitTest.java | 22 +-
.../versions/RegionVersionHolder2JUnitTest.java | 348 +-
.../versions/RegionVersionHolderJUnitTest.java | 360 +-
.../RegionVersionHolderRandomJUnitTest.java | 124 +-
...RegionVersionHolderSmallBitSetJUnitTest.java | 31 +-
.../versions/RegionVersionVectorJUnitTest.java | 244 +-
.../cache/versions/VMVersionTagTest.java | 22 +-
.../cache/wan/AsyncEventQueueTestBase.java | 757 +-
.../cache/wan/CustomAsyncEventListener.java | 27 +-
.../geode/internal/cache/wan/Filter70.java | 40 +-
.../cache/wan/MyAsyncEventListener.java | 37 +-
.../cache/wan/MyAsyncEventListener2.java | 113 +-
.../cache/wan/MyDistributedSystemListener.java | 53 +-
.../cache/wan/MyGatewayEventFilter.java | 25 +-
.../cache/wan/MyGatewaySenderEventListener.java | 53 +-
.../wan/MyGatewaySenderEventListener2.java | 34 +-
.../cache/wan/MyGatewayTransportFilter1.java | 40 +-
.../cache/wan/MyGatewayTransportFilter2.java | 40 +-
.../cache/wan/MyGatewayTransportFilter3.java | 40 +-
.../cache/wan/MyGatewayTransportFilter4.java | 40 +-
.../geode/internal/cache/wan/QueueListener.java | 44 +-
.../asyncqueue/AsyncEventListenerDUnitTest.java | 1556 +--
.../AsyncEventListenerOffHeapDUnitTest.java | 22 +-
.../AsyncEventQueueStatsDUnitTest.java | 411 +-
.../AsyncEventQueueValidationsJUnitTest.java | 53 +-
.../ConcurrentAsyncEventQueueDUnitTest.java | 406 +-
...ncurrentAsyncEventQueueOffHeapDUnitTest.java | 25 +-
.../CommonParallelAsyncEventQueueDUnitTest.java | 47 +-
...ParallelAsyncEventQueueOffHeapDUnitTest.java | 26 +-
.../ParallelGatewaySenderQueueJUnitTest.java | 76 +-
...ialGatewaySenderEventProcessorJUnitTest.java | 24 +-
.../xmlcache/AbstractEntityResolverTest.java | 54 +-
.../xmlcache/AbstractXmlParserJUnitTest.java | 42 +-
.../cache/xmlcache/CacheCreationJUnitTest.java | 45 +-
.../cache/xmlcache/CacheXmlParserJUnitTest.java | 56 +-
.../xmlcache/CacheXmlVersionJUnitTest.java | 29 +-
.../xmlcache/GeodeEntityResolverJUnitTest.java | 25 +-
.../PivotalEntityResolverJUnitTest.java | 25 +-
.../cache/xmlcache/RegionCreationJUnitTest.java | 26 +-
.../xmlcache/XmlGeneratorUtilsJUnitTest.java | 37 +-
.../classpathloaderjunittest/DoesExist.java | 22 +-
.../CompressionCacheConfigDUnitTest.java | 95 +-
.../CompressionCacheListenerDUnitTest.java | 189 +-
...ompressionCacheListenerOffHeapDUnitTest.java | 26 +-
.../CompressionRegionConfigDUnitTest.java | 287 +-
.../CompressionRegionFactoryDUnitTest.java | 72 +-
.../CompressionRegionOperationsDUnitTest.java | 312 +-
...ressionRegionOperationsOffHeapDUnitTest.java | 27 +-
.../compression/CompressionStatsDUnitTest.java | 501 +-
.../compression/SnappyCompressorJUnitTest.java | 28 +-
.../datasource/AbstractPoolCacheJUnitTest.java | 117 +-
.../internal/datasource/CleanUpJUnitTest.java | 70 +-
.../ConnectionPoolCacheImplJUnitTest.java | 116 +-
.../datasource/ConnectionPoolingJUnitTest.java | 154 +-
.../datasource/DataSourceFactoryJUnitTest.java | 46 +-
.../internal/datasource/RestartJUnitTest.java | 68 +-
.../geode/internal/i18n/BasicI18nJUnitTest.java | 246 +-
.../io/CompositeOutputStreamJUnitTest.java | 624 +-
.../geode/internal/jndi/ContextJUnitTest.java | 149 +-
.../internal/jta/BlockingTimeOutJUnitTest.java | 101 +-
.../apache/geode/internal/jta/CacheUtils.java | 123 +-
.../internal/jta/DataSourceJTAJUnitTest.java | 416 +-
.../geode/internal/jta/ExceptionJUnitTest.java | 26 +-
.../jta/GlobalTransactionJUnitTest.java | 72 +-
.../org/apache/geode/internal/jta/JTAUtils.java | 478 +-
.../internal/jta/JtaIntegrationJUnitTest.java | 51 +-
.../org/apache/geode/internal/jta/SyncImpl.java | 47 +-
.../internal/jta/TransactionImplJUnitTest.java | 31 +-
.../jta/TransactionManagerImplJUnitTest.java | 69 +-
.../jta/TransactionTimeOutJUnitTest.java | 54 +-
.../jta/UserTransactionImplJUnitTest.java | 25 +-
.../geode/internal/jta/dunit/CommitThread.java | 254 +-
.../internal/jta/dunit/ExceptionsDUnitTest.java | 121 +-
.../jta/dunit/IdleTimeOutDUnitTest.java | 126 +-
.../jta/dunit/LoginTimeOutDUnitTest.java | 113 +-
.../jta/dunit/MaxPoolSizeDUnitTest.java | 98 +-
.../internal/jta/dunit/RollbackThread.java | 254 +-
.../jta/dunit/TransactionTimeOutDUnitTest.java | 164 +-
.../dunit/TxnManagerMultiThreadDUnitTest.java | 251 +-
.../internal/jta/dunit/TxnTimeOutDUnitTest.java | 219 +-
.../internal/jta/functional/CacheJUnitTest.java | 282 +-
.../jta/functional/TestXACacheLoader.java | 132 +-
.../internal/lang/ClassUtilsJUnitTest.java | 48 +-
.../internal/lang/InOutParameterJUnitTest.java | 27 +-
.../internal/lang/InitializerJUnitTest.java | 38 +-
.../internal/lang/ObjectUtilsJUnitTest.java | 33 +-
.../internal/lang/StringUtilsJUnitTest.java | 103 +-
.../internal/lang/SystemUtilsJUnitTest.java | 61 +-
.../internal/lang/ThreadUtilsJUnitTest.java | 70 +-
.../geode/internal/lang/ThrowableUtilsTest.java | 68 +-
.../DistributedSystemLogFileJUnitTest.java | 2076 +--
.../logging/LocatorLogFileJUnitTest.java | 47 +-
.../logging/LogServiceIntegrationJUnitTest.java | 149 +-
.../LogServiceIntegrationTestSupport.java | 32 +-
.../internal/logging/LogServiceJUnitTest.java | 63 +-
.../LogWriterDisabledPerformanceTest.java | 27 +-
.../logging/LogWriterImplJUnitTest.java | 31 +-
.../logging/LogWriterPerformanceTest.java | 52 +-
.../logging/LoggingIntegrationTestSuite.java | 33 +-
.../logging/LoggingPerformanceTestCase.java | 82 +-
.../internal/logging/LoggingUnitTestSuite.java | 37 +-
.../logging/MergeLogFilesJUnitTest.java | 86 +-
.../geode/internal/logging/NullLogWriter.java | 139 +-
.../internal/logging/SortLogFileJUnitTest.java | 37 +-
.../internal/logging/TestLogWriterFactory.java | 77 +-
.../logging/log4j/AlertAppenderJUnitTest.java | 75 +-
.../logging/log4j/ConfigLocatorJUnitTest.java | 92 +-
.../internal/logging/log4j/Configuration.java | 22 +-
.../log4j/FastLoggerIntegrationJUnitTest.java | 417 +-
.../logging/log4j/FastLoggerJUnitTest.java | 96 +-
.../FastLoggerWithDefaultConfigJUnitTest.java | 48 +-
.../GeodeVerboseLogMarkerIntegrationTest.java | 57 +-
.../log4j/LocalizedMessageJUnitTest.java | 29 +-
.../log4j/Log4J2DisabledPerformanceTest.java | 22 +-
.../logging/log4j/Log4J2PerformanceTest.java | 89 +-
.../log4j/Log4jIntegrationTestSuite.java | 28 +-
.../logging/log4j/Log4jUnitTestSuite.java | 33 +-
.../log4j/LogWriterAppenderJUnitTest.java | 161 +-
.../LogWriterLoggerDisabledPerformanceTest.java | 27 +-
.../log4j/LogWriterLoggerPerformanceTest.java | 85 +-
.../logging/log4j/custom/BasicAppender.java | 30 +-
.../CustomConfigWithCacheIntegrationTest.java | 40 +-
...stomConfigWithLogServiceIntegrationTest.java | 37 +-
.../log4j/custom/CustomConfiguration.java | 46 +-
.../net/ClientSocketFactoryIntegrationTest.java | 37 +-
.../net/SSLConfigurationFactoryJUnitTest.java | 119 +-
.../internal/net/SSLSocketIntegrationTest.java | 28 +-
.../internal/net/SocketCloserJUnitTest.java | 64 +-
.../net/SocketCloserWithWaitJUnitTest.java | 30 +-
.../net/SocketCreatorFactoryJUnitTest.java | 364 +-
.../internal/net/SocketUtilsJUnitTest.java | 89 +-
.../offheap/AbstractStoredObjectTestBase.java | 40 +-
.../internal/offheap/DataTypeJUnitTest.java | 77 +-
...tingOutOfOffHeapMemoryListenerJUnitTest.java | 51 +-
.../internal/offheap/FragmentJUnitTest.java | 58 +-
.../internal/offheap/FreeListManagerTest.java | 545 +-
.../offheap/FreeListOffHeapRegionJUnitTest.java | 24 +-
.../internal/offheap/InlineKeyJUnitTest.java | 122 +-
.../offheap/LifecycleListenerJUnitTest.java | 70 +-
...moryAllocatorFillPatternIntegrationTest.java | 169 +-
.../MemoryAllocatorFillPatternJUnitTest.java | 99 +-
.../offheap/MemoryAllocatorJUnitTest.java | 367 +-
.../offheap/MemoryBlockNodeJUnitTest.java | 146 +-
.../offheap/MemoryInspectorImplJUnitTest.java | 26 +-
.../offheap/NullOffHeapMemoryStats.java | 82 +-
.../offheap/NullOutOfOffHeapMemoryListener.java | 31 +-
.../offheap/OffHeapHelperJUnitTest.java | 60 +-
.../internal/offheap/OffHeapIndexJUnitTest.java | 42 +-
.../internal/offheap/OffHeapRegionBase.java | 159 +-
.../OffHeapRegionEntryHelperJUnitTest.java | 185 +-
.../offheap/OffHeapStorageJUnitTest.java | 50 +-
...ffHeapStoredObjectAddressStackJUnitTest.java | 85 +-
.../offheap/OffHeapStoredObjectJUnitTest.java | 88 +-
.../OffHeapStoredObjectSliceJUnitTest.java | 22 +-
...ffHeapStoredObjectWithHeapFormJUnitTest.java | 31 +-
.../offheap/OffHeapValidationJUnitTest.java | 335 +-
.../OffHeapWriteObjectAsByteArrayJUnitTest.java | 45 +-
.../OldFreeListOffHeapRegionJUnitTest.java | 24 +-
.../offheap/OutOfOffHeapMemoryDUnitTest.java | 152 +-
.../offheap/RefCountChangeInfoJUnitTest.java | 43 +-
.../offheap/ReferenceCountHelperImplTest.java | 370 +-
.../offheap/ReferenceCountHelperJUnitTest.java | 150 +-
.../internal/offheap/StoredObjectTestSuite.java | 30 +-
.../offheap/TinyMemoryBlockJUnitTest.java | 79 +-
.../offheap/TinyStoredObjectJUnitTest.java | 104 +-
.../TxReleasesOffHeapOnCloseJUnitTest.java | 28 +-
.../BlockingProcessStreamReaderJUnitTest.java | 312 +-
...leProcessControllerIntegrationJUnitTest.java | 57 +-
.../LocalProcessControllerJUnitTest.java | 59 +-
.../process/LocalProcessLauncherDUnitTest.java | 172 +-
.../process/LocalProcessLauncherJUnitTest.java | 48 +-
...NonBlockingProcessStreamReaderJUnitTest.java | 265 +-
.../internal/process/PidFileJUnitTest.java | 128 +-
.../ProcessControllerFactoryJUnitTest.java | 54 +-
.../process/ProcessStreamReaderTestCase.java | 143 +-
.../geode/internal/process/mbean/Process.java | 34 +-
.../internal/process/mbean/ProcessMBean.java | 24 +-
...tractSignalNotificationHandlerJUnitTest.java | 119 +-
.../security/IntegratedSecurityServiceTest.java | 73 +-
.../internal/size/ObjectSizerJUnitTest.java | 54 +-
.../internal/size/ObjectTraverserJUnitTest.java | 51 +-
.../internal/size/ObjectTraverserPerf.java | 70 +-
.../size/ReflectionObjectSizerJUnitTest.java | 22 +-
.../size/SizeClassOnceObjectSizerJUnitTest.java | 57 +-
.../geode/internal/size/SizeTestUtil.java | 36 +-
.../size/WellKnownClassSizerJUnitTest.java | 45 +-
.../statistics/CallbackSamplerTest.java | 25 +-
...tributedSystemStatisticsIntegrationTest.java | 78 +-
...utedSystemStatisticsTypeIntegrationTest.java | 32 +-
.../GemFireStatSamplerIntegrationTest.java | 261 +-
.../internal/statistics/ResourceInstTest.java | 44 +-
.../statistics/SampleCollectorTest.java | 89 +-
.../SimpleStatSamplerIntegrationTest.java | 130 +-
...iveWithConsecutiveResourceInstGenerator.java | 76 +-
...ithConsecutiveResourceInstGeneratorTest.java | 30 +-
...hConsecutiveResourceInstIntegrationTest.java | 34 +-
.../StatArchiveWriterReaderIntegrationTest.java | 1626 ++-
.../statistics/StatMonitorHandlerTest.java | 98 +-
.../statistics/StatSamplerIntegrationTest.java | 296 +-
.../statistics/StatSamplerTestCase.java | 111 +-
.../geode/internal/statistics/StatUtils.java | 45 +-
.../statistics/StatisticsDistributedTest.java | 390 +-
.../internal/statistics/StatisticsImplTest.java | 33 +-
.../statistics/StatisticsMonitorTest.java | 92 +-
.../internal/statistics/TestSampleHandler.java | 70 +-
.../statistics/TestStatArchiveWriter.java | 28 +-
.../statistics/TestStatisticsManager.java | 28 +-
.../statistics/TestStatisticsSampler.java | 32 +-
.../statistics/ValueMonitorIntegrationTest.java | 249 +-
.../internal/stats50/AtomicStatsJUnitTest.java | 55 +-
.../geode/internal/tcp/ConnectionJUnitTest.java | 168 +-
.../util/AbortableTaskServiceJUnitTest.java | 68 +-
.../internal/util/ArrayUtilsJUnitTest.java | 49 +-
.../geode/internal/util/BlobHelperTest.java | 45 +-
...bHelperWithThreadContextClassLoaderTest.java | 86 +-
.../geode/internal/util/BytesJUnitTest.java | 60 +-
.../internal/util/CollectionUtilsJUnitTest.java | 82 +-
.../internal/util/DelayedActionJUnitTest.java | 32 +-
.../geode/internal/util/HostNameTest.java | 28 +-
.../geode/internal/util/IOUtilsJUnitTest.java | 118 +-
.../apache/geode/internal/util/Valuable.java | 27 +-
.../CompactConcurrentHashSetJUnitTest.java | 34 +-
.../ConcurrentHashMapIteratorJUnitTest.java | 62 +-
.../concurrent/CopyOnWriteHashMapJUnitTest.java | 1002 +-
.../concurrent/ReentrantSemaphoreJUnitTest.java | 36 +-
.../SemaphoreReadWriteLockJUnitTest.java | 24 +-
.../cm/ConcurrentHashMapJUnitTest.java | 1304 +-
.../concurrent/cm/CountedMapLoopsJUnitTest.java | 371 +-
.../concurrent/cm/IntMapCheckJUnitTest.java | 1182 +-
.../util/concurrent/cm/LoopHelpers.java | 406 +-
.../util/concurrent/cm/MapCheckJUnitTest.java | 1184 +-
.../util/concurrent/cm/MapLoopsJUnitTest.java | 368 +-
.../util/concurrent/cm/RLJBarJUnitTest.java | 272 +-
.../concurrent/cm/StringMapLoopsJUnitTest.java | 394 +-
.../management/CacheManagementDUnitTest.java | 219 +-
.../management/ClientHealthStatsDUnitTest.java | 188 +-
.../apache/geode/management/CompositeStats.java | 45 +-
.../geode/management/CompositeTestMBean.java | 47 +-
.../geode/management/CompositeTestMXBean.java | 44 +-
.../management/CompositeTypeTestDUnitTest.java | 217 +-
.../ConnectToLocatorSSLDUnitTest.java | 47 +-
.../apache/geode/management/CustomMBean.java | 29 +-
.../apache/geode/management/CustomMXBean.java | 36 +-
.../management/DLockManagementDUnitTest.java | 249 +-
.../DataBrowserJSONValidationJUnitTest.java | 50 +-
.../management/DiskManagementDUnitTest.java | 204 +-
.../management/DistributedSystemDUnitTest.java | 372 +-
.../geode/management/JMXMBeanDUnitTest.java | 112 +-
.../management/LocatorManagementDUnitTest.java | 93 +-
.../org/apache/geode/management/MBeanUtil.java | 250 +-
.../geode/management/ManagementTestBase.java | 161 +-
.../MemberMBeanAttributesDUnitTest.java | 163 +-
.../management/OffHeapManagementDUnitTest.java | 604 +-
.../geode/management/QueryDataDUnitTest.java | 425 +-
.../RegionCreateDestroyDUnitTest.java | 56 +-
.../management/RegionManagementDUnitTest.java | 614 +-
.../geode/management/TypedJsonJUnitTest.java | 414 +-
...ersalMembershipListenerAdapterDUnitTest.java | 853 +-
.../stats/AsyncEventQueueStatsJUnitTest.java | 30 +-
.../bean/stats/CacheServerStatsJUnitTest.java | 64 +-
.../bean/stats/DiskStatsJUnitTest.java | 36 +-
.../stats/DistributedSystemStatsDUnitTest.java | 38 +-
.../stats/DistributedSystemStatsJUnitTest.java | 27 +-
.../bean/stats/GatewayMBeanBridgeJUnitTest.java | 49 +-
.../stats/GatewayReceiverStatsJUnitTest.java | 80 +-
.../bean/stats/MBeanStatsTestCase.java | 46 +-
.../bean/stats/MemberLevelStatsJUnitTest.java | 239 +-
.../bean/stats/RegionStatsJUnitTest.java | 122 +-
.../bean/stats/StatsRateJUnitTest.java | 45 +-
.../internal/JettyHelperJUnitTest.java | 33 +-
.../beans/DistributedSystemBridgeJUnitTest.java | 47 +-
.../QueryDataFunctionApplyLimitClauseTest.java | 44 +-
.../AbstractCliAroundInterceptorJUnitTest.java | 29 +-
.../cli/ClasspathScanLoadHelperJUnitTest.java | 28 +-
.../internal/cli/CliUtilDUnitTest.java | 369 +-
.../internal/cli/CommandManagerJUnitTest.java | 169 +-
.../internal/cli/CommandRequestTest.java | 24 +-
.../cli/CommandSeparatorEscapeJUnitTest.java | 118 +-
.../internal/cli/DataCommandJsonJUnitTest.java | 35 +-
.../internal/cli/GfshParserIntegrationTest.java | 43 +-
.../internal/cli/GfshParserJUnitTest.java | 410 +-
.../management/internal/cli/HeadlessGfsh.java | 75 +-
.../cli/HeadlessGfshIntegrationTest.java | 28 +-
.../internal/cli/JoptOptionParserTest.java | 104 +-
.../management/internal/cli/ResultHandler.java | 24 +-
.../internal/cli/TableBuilderJUnitTest.java | 81 +-
.../cli/annotations/CliArgumentJUnitTest.java | 79 +-
.../AbstractCommandsSupportJUnitTest.java | 255 +-
.../cli/commands/CliCommandTestBase.java | 114 +-
.../cli/commands/ConfigCommandsDUnitTest.java | 57 +-
...eateAlterDestroyRegionCommandsDUnitTest.java | 340 +-
.../cli/commands/DeployCommandsDUnitTest.java | 155 +-
.../commands/DiskStoreCommandsDUnitTest.java | 255 +-
.../commands/DiskStoreCommandsJUnitTest.java | 336 +-
.../cli/commands/FunctionCommandsDUnitTest.java | 97 +-
.../commands/GemfireDataCommandsDUnitTest.java | 499 +-
...WithCacheLoaderDuringCacheMissDUnitTest.java | 79 +-
.../HTTPServiceSSLSupportJUnitTest.java | 63 +-
.../commands/HelpCommandsIntegrationTest.java | 32 +-
.../cli/commands/IndexCommandsDUnitTest.java | 105 +-
.../cli/commands/IndexCommandsJUnitTest.java | 101 +-
...stAndDescribeDiskStoreCommandsDUnitTest.java | 46 +-
.../ListAndDescribeRegionDUnitTest.java | 76 +-
.../cli/commands/ListIndexCommandDUnitTest.java | 139 +-
.../cli/commands/MemberCommandsDUnitTest.java | 63 +-
.../MiscellaneousCommandsDUnitTest.java | 74 +-
...laneousCommandsExportLogsPart1DUnitTest.java | 35 +-
...laneousCommandsExportLogsPart2DUnitTest.java | 39 +-
...laneousCommandsExportLogsPart3DUnitTest.java | 38 +-
...laneousCommandsExportLogsPart4DUnitTest.java | 39 +-
.../cli/commands/QueueCommandsDUnitTest.java | 143 +-
.../SharedConfigurationCommandsDUnitTest.java | 145 +-
.../cli/commands/ShellCommandsDUnitTest.java | 59 +-
.../cli/commands/ShowDeadlockDUnitTest.java | 59 +-
.../cli/commands/ShowMetricsDUnitTest.java | 105 +-
.../cli/commands/ShowStackTraceDUnitTest.java | 22 +-
.../cli/commands/ToUpperResultCollector.java | 25 +-
.../cli/commands/UserCommandsDUnitTest.java | 33 +-
.../RegionPathConverterJUnitTest.java | 60 +-
.../internal/cli/domain/AbstractImpl.java | 24 +-
.../management/internal/cli/domain/Impl1.java | 24 +-
.../management/internal/cli/domain/Impl12.java | 24 +-
.../internal/cli/domain/Interface1.java | 22 +-
.../internal/cli/domain/Interface2.java | 22 +-
.../management/internal/cli/domain/Stock.java | 32 +-
.../geode/management/internal/cli/dto/Car.java | 46 +-
.../geode/management/internal/cli/dto/Key1.java | 54 +-
.../geode/management/internal/cli/dto/Key2.java | 54 +-
.../internal/cli/dto/ObjectWithCharAttr.java | 49 +-
.../management/internal/cli/dto/Value1.java | 77 +-
.../management/internal/cli/dto/Value2.java | 78 +-
.../functions/DataCommandFunctionJUnitTest.java | 34 +-
.../DescribeDiskStoreFunctionJUnitTest.java | 1752 +--
.../functions/GetRegionsFunctionJUnitTest.java | 32 +-
.../ListDiskStoresFunctionJUnitTest.java | 196 +-
.../functions/ListIndexFunctionJUnitTest.java | 332 +-
.../ShowMissingDiskStoresFunctionJUnitTest.java | 149 +-
.../cli/parser/ParserUtilsJUnitTest.java | 22 +-
.../preprocessor/PreprocessorJUnitTest.java | 79 +-
.../PreprocessorUtilsJUnitTest.java | 40 +-
.../cli/shell/GfshConfigInitFileJUnitTest.java | 68 +-
.../shell/GfshExecutionStrategyJUnitTest.java | 106 +-
.../cli/shell/GfshHistoryJUnitTest.java | 46 +-
.../cli/shell/GfshInitFileJUnitTest.java | 163 +-
.../cli/util/CommentSkipHelperTest.java | 40 +-
.../internal/cli/util/HyphenFormatterTest.java | 57 +-
.../SharedConfigurationDUnitTest.java | 178 +-
.../SharedConfigurationTestUtils.java | 22 +-
.../SharedConfigurationUsingDirDUnitTest.java | 31 +-
.../configuration/ZipUtilsJUnitTest.java | 45 +-
.../domain/CacheElementJUnitTest.java | 63 +-
.../utils/XmlUtilsAddNewNodeJUnitTest.java | 167 +-
.../configuration/utils/XmlUtilsJUnitTest.java | 124 +-
.../internal/pulse/TestClientIdsDUnitTest.java | 105 +-
.../internal/pulse/TestFunctionsDUnitTest.java | 47 +-
.../internal/pulse/TestHeapDUnitTest.java | 53 +-
.../internal/pulse/TestLocatorsDUnitTest.java | 34 +-
.../pulse/TestSubscriptionsDUnitTest.java | 147 +-
.../security/AccessControlMBeanJUnitTest.java | 27 +-
...CacheServerMBeanAuthenticationJUnitTest.java | 25 +-
.../CacheServerMBeanAuthorizationJUnitTest.java | 66 +-
.../CacheServerMBeanShiroJUnitTest.java | 83 +-
.../security/CacheServerStartupRule.java | 33 +-
.../security/CliCommandsSecurityTest.java | 56 +-
.../security/DataCommandsSecurityTest.java | 55 +-
.../DiskStoreMXBeanSecurityJUnitTest.java | 56 +-
.../GatewayReceiverMBeanSecurityTest.java | 37 +-
.../GatewaySenderMBeanSecurityTest.java | 58 +-
.../security/GfshCommandsPostProcessorTest.java | 43 +-
.../security/GfshCommandsSecurityTest.java | 104 +-
.../security/GfshShellConnectionRule.java | 41 +-
...atedSecurityServiceCustomRealmJUnitTest.java | 30 +-
...atedSecurityServiceWithIniFileJUnitTest.java | 45 +-
.../security/JavaRmiServerNameTest.java | 37 +-
.../LockServiceMBeanAuthorizationJUnitTest.java | 45 +-
.../security/MBeanSecurityJUnitTest.java | 65 +-
.../ManagerMBeanAuthorizationJUnitTest.java | 33 +-
.../security/MemberMBeanSecurityJUnitTest.java | 77 +-
.../internal/security/MultiUserDUnitTest.java | 64 +-
.../security/ResourcePermissionTest.java | 34 +-
.../internal/security/TestCommand.java | 97 +-
.../ReadOpFileAccessControllerJUnitTest.java | 113 +-
.../WanCommandsControllerJUnitTest.java | 119 +-
.../geode/management/model/EmptyObject.java | 22 +-
.../org/apache/geode/management/model/Item.java | 133 +-
.../apache/geode/management/model/Order.java | 118 +-
.../apache/geode/management/model/SubOrder.java | 22 +-
.../DomainObjectsAsValuesJUnitTest.java | 54 +-
.../GemcachedBinaryClientJUnitTest.java | 41 +-
.../GemcachedDevelopmentJUnitTest.java | 80 +-
.../geode/memcached/IntegrationJUnitTest.java | 35 +-
.../geode/pdx/AutoSerializableJUnitTest.java | 405 +-
.../apache/geode/pdx/ByteSourceJUnitTest.java | 167 +-
.../ClientsWithVersioningRetryDUnitTest.java | 256 +-
.../java/org/apache/geode/pdx/DSInsidePdx.java | 56 +-
.../geode/pdx/DistributedSystemIdDUnitTest.java | 61 +-
.../java/org/apache/geode/pdx/DomainObject.java | 28 +-
.../org/apache/geode/pdx/DomainObjectBad.java | 29 +-
.../geode/pdx/DomainObjectClassLoadable.java | 27 +-
.../apache/geode/pdx/DomainObjectPdxAuto.java | 42 +-
...DomainObjectPdxAutoNoDefaultConstructor.java | 28 +-
.../java/org/apache/geode/pdx/Employee.java | 61 +-
.../geode/pdx/JSONFormatterJUnitTest.java | 125 +-
.../geode/pdx/JSONPdxClientServerDUnitTest.java | 1267 +-
.../java/org/apache/geode/pdx/NestedPdx.java | 63 +-
.../apache/geode/pdx/NonDelegatingLoader.java | 38 +-
.../OffHeapByteBufferByteSourceJUnitTest.java | 24 +-
.../geode/pdx/OffHeapByteSourceJUnitTest.java | 27 +-
.../geode/pdx/PDXAsyncEventQueueDUnitTest.java | 97 +-
.../geode/pdx/PdxAttributesJUnitTest.java | 115 +-
.../geode/pdx/PdxClientServerDUnitTest.java | 395 +-
.../geode/pdx/PdxDeserializationDUnitTest.java | 318 +-
.../java/org/apache/geode/pdx/PdxInsideDS.java | 49 +-
.../geode/pdx/PdxInstanceFactoryJUnitTest.java | 648 +-
.../apache/geode/pdx/PdxInstanceJUnitTest.java | 237 +-
.../geode/pdx/PdxSerializableDUnitTest.java | 130 +-
.../geode/pdx/PdxSerializableJUnitTest.java | 839 +-
.../apache/geode/pdx/PdxStringJUnitTest.java | 111 +-
.../geode/pdx/PdxTypeExportDUnitTest.java | 49 +-
.../geode/pdx/SeparateClassloaderPdx.java | 29 +-
.../java/org/apache/geode/pdx/SimpleClass.java | 43 +-
.../java/org/apache/geode/pdx/SimpleClass1.java | 67 +-
.../java/org/apache/geode/pdx/SimpleClass2.java | 22 +-
.../geode/pdx/TestObjectForJSONFormatter.java | 257 +-
.../org/apache/geode/redis/AuthJUnitTest.java | 35 +-
.../apache/geode/redis/ConcurrentStartTest.java | 39 +-
.../org/apache/geode/redis/HashesJUnitTest.java | 30 +-
.../org/apache/geode/redis/ListsJUnitTest.java | 32 +-
.../apache/geode/redis/RedisDistDUnitTest.java | 55 +-
.../org/apache/geode/redis/RedisServerTest.java | 34 +-
.../org/apache/geode/redis/SetsJUnitTest.java | 82 +-
.../apache/geode/redis/SortedSetsJUnitTest.java | 52 +-
.../apache/geode/redis/StringsJunitTest.java | 88 +-
.../security/AbstractSecureServerDUnitTest.java | 52 +-
.../security/ClientAuthenticationDUnitTest.java | 32 +-
.../ClientAuthenticationPart2DUnitTest.java | 30 +-
.../security/ClientAuthenticationTestCase.java | 253 +-
.../security/ClientAuthenticationTestUtils.java | 95 +-
.../security/ClientAuthorizationDUnitTest.java | 250 +-
.../security/ClientAuthorizationTestCase.java | 285 +-
.../security/ClientMultiUserAuthzDUnitTest.java | 199 +-
...lusterConfigWithEmbededLocatorDUnitTest.java | 48 +-
.../ClusterConfigWithoutSecurityDUnitTest.java | 37 +-
.../DeltaClientAuthorizationDUnitTest.java | 65 +-
.../DeltaClientPostAuthorizationDUnitTest.java | 130 +-
.../security/GemFireSecurityExceptionTest.java | 51 +-
.../security/IntegratedClientAuthDUnitTest.java | 34 +-
...tedClientContainsKeyAuthDistributedTest.java | 24 +-
...entDestroyInvalidateAuthDistributedTest.java | 44 +-
...dClientDestroyRegionAuthDistributedTest.java | 52 +-
...lientExecuteFunctionAuthDistributedTest.java | 35 +-
...xecuteRegionFunctionAuthDistributedTest.java | 32 +-
...tegratedClientGetAllAuthDistributedTest.java | 24 +-
...tGetClientPRMetaDataAuthDistributedTest.java | 49 +-
...ientPartitionAttrCmdAuthDistributedTest.java | 32 +-
...gratedClientGetEntryAuthDistributedTest.java | 41 +-
...tegratedClientGetPutAuthDistributedTest.java | 32 +-
...tedClientRegionClearAuthDistributedTest.java | 41 +-
...ientRegisterInterestAuthDistributedTest.java | 112 +-
...ratedClientRemoveAllAuthDistributedTest.java | 45 +-
...IntegratedClientSizeAuthDistributedTest.java | 30 +-
...ntUnregisterInterestAuthDistributedTest.java | 38 +-
...edSecurityCacheLifecycleDistributedTest.java | 30 +-
...edSecurityCacheLifecycleIntegrationTest.java | 26 +-
...tegratedSecurityPeerAuthDistributedTest.java | 54 +-
.../security/NoShowValue1PostProcessor.java | 28 +-
.../NoShowValue1PostProcessorDUnitTest.java | 38 +-
.../security/NotAuthorizedExceptionTest.java | 53 +-
.../security/P2PAuthenticationDUnitTest.java | 82 +-
.../PDXGfshPostProcessorOnRemoteServerTest.java | 67 +-
.../apache/geode/security/PDXPostProcessor.java | 49 +-
.../security/PDXPostProcessorDUnitTest.java | 106 +-
.../security/PeerAuthenticatorDUnitTest.java | 32 +-
...henticatorWithCachelessLocatorDUnitTest.java | 36 +-
...eerSecurityWithEmbeddedLocatorDUnitTest.java | 47 +-
.../geode/security/PostProcessorDUnitTest.java | 53 +-
.../SecurityClusterConfigDUnitTest.java | 45 +-
.../geode/security/SecurityTestUtils.java | 917 +-
.../SecurityWithoutClusterConfigDUnitTest.java | 33 +-
.../geode/security/SpySecurityManager.java | 22 +-
.../security/StartServerAuthorizationTest.java | 42 +-
.../generator/AuthzCredentialGenerator.java | 257 +-
.../security/generator/CredentialGenerator.java | 137 +-
.../DummyAuthzCredentialGenerator.java | 38 +-
.../generator/DummyCredentialGenerator.java | 26 +-
.../generator/LdapUserCredentialGenerator.java | 39 +-
.../generator/PKCSCredentialGenerator.java | 34 +-
.../generator/SSLCredentialGenerator.java | 28 +-
.../UserPasswordWithExtraPropsAuthInit.java | 57 +-
.../generator/XmlAuthzCredentialGenerator.java | 77 +-
.../security/templates/DummyAuthenticator.java | 55 +-
.../security/templates/DummyAuthorization.java | 58 +-
.../templates/FunctionSecurityPrmsHolder.java | 29 +-
.../templates/LdapUserAuthenticator.java | 42 +-
.../geode/security/templates/PKCSAuthInit.java | 57 +-
.../security/templates/PKCSAuthenticator.java | 52 +-
.../geode/security/templates/PKCSPrincipal.java | 22 +-
.../security/templates/PKCSPrincipalTest.java | 24 +-
.../templates/SampleSecurityManagerTest.java | 24 +-
.../templates/SimpleSecurityManagerTest.java | 38 +-
.../templates/UserPasswordAuthInit.java | 44 +-
.../security/templates/UsernamePrincipal.java | 22 +-
.../templates/UsernamePrincipalTest.java | 24 +-
.../security/templates/XmlAuthorization.java | 252 +-
.../security/templates/XmlErrorHandler.java | 55 +-
.../java/org/apache/geode/sequence/Arrow.java | 197 +-
.../geode/sequence/DefaultLineMapper.java | 30 +-
.../geode/sequence/GemfireSequenceDisplay.java | 172 +-
.../apache/geode/sequence/HydraLineMapper.java | 71 +-
.../org/apache/geode/sequence/Lifeline.java | 133 +-
.../apache/geode/sequence/LifelineState.java | 162 +-
.../org/apache/geode/sequence/LineMapper.java | 34 +-
.../geode/sequence/SelectGraphDialog.java | 231 +-
.../apache/geode/sequence/SequenceDiagram.java | 505 +-
.../apache/geode/sequence/SequencePanel.java | 118 +-
.../apache/geode/sequence/StateColorMap.java | 80 +-
.../org/apache/geode/sequence/TimeAxis.java | 175 +-
.../org/apache/geode/sequence/ZoomingPanel.java | 306 +-
.../org/apache/geode/test/dunit/Assert.java | 48 +-
.../geode/test/dunit/AsyncInvocation.java | 202 +-
.../org/apache/geode/test/dunit/DUnitEnv.java | 52 +-
.../apache/geode/test/dunit/DebuggerUtils.java | 45 +-
.../geode/test/dunit/DistributedTestCase.java | 22 +-
.../geode/test/dunit/DistributedTestUtils.java | 102 +-
.../java/org/apache/geode/test/dunit/Host.java | 80 +-
.../geode/test/dunit/IgnoredException.java | 166 +-
.../org/apache/geode/test/dunit/Invoke.java | 90 +-
.../org/apache/geode/test/dunit/Jitter.java | 50 +-
.../apache/geode/test/dunit/LogWriterUtils.java | 68 +-
.../apache/geode/test/dunit/NamedCallable.java | 30 +-
.../apache/geode/test/dunit/NamedRunnable.java | 30 +-
.../apache/geode/test/dunit/NetworkUtils.java | 50 +-
.../apache/geode/test/dunit/RMIException.java | 116 +-
.../geode/test/dunit/RepeatableRunnable.java | 33 +-
.../geode/test/dunit/SerializableCallable.java | 31 +-
.../test/dunit/SerializableCallableIF.java | 22 +-
.../geode/test/dunit/SerializableRunnable.java | 39 +-
.../test/dunit/SerializableRunnableIF.java | 22 +-
.../test/dunit/StoppableWaitCriterion.java | 33 +-
.../apache/geode/test/dunit/ThreadUtils.java | 65 +-
.../java/org/apache/geode/test/dunit/VM.java | 306 +-
.../java/org/apache/geode/test/dunit/Wait.java | 99 +-
.../apache/geode/test/dunit/WaitCriterion.java | 38 +-
.../dunit/cache/internal/CacheTestFixture.java | 34 +-
.../cache/internal/JUnit3CacheTestCase.java | 76 +-
.../cache/internal/JUnit4CacheTestCase.java | 192 +-
.../dunit/internal/DistributedTestFixture.java | 57 +-
.../internal/JUnit3DistributedTestCase.java | 153 +-
.../internal/JUnit4DistributedTestCase.java | 193 +-
.../dunit/rules/ConnectionConfiguration.java | 27 +-
.../dunit/rules/DistributedDisconnectRule.java | 34 +-
.../rules/DistributedExternalResource.java | 28 +-
.../DistributedRestoreSystemProperties.java | 43 +-
.../dunit/rules/LocatorServerStartupRule.java | 47 +-
.../geode/test/dunit/rules/LocatorStarter.java | 44 +-
.../dunit/rules/MBeanServerConnectionRule.java | 49 +-
.../geode/test/dunit/rules/RemoteInvoker.java | 27 +-
.../geode/test/dunit/rules/ServerStarter.java | 60 +-
.../test/dunit/standalone/BounceResult.java | 24 +-
.../geode/test/dunit/standalone/ChildVM.java | 33 +-
.../test/dunit/standalone/DUnitLauncher.java | 254 +-
.../test/dunit/standalone/ProcessManager.java | 63 +-
.../test/dunit/standalone/RemoteDUnitVM.java | 149 +-
.../test/dunit/standalone/RemoteDUnitVMIF.java | 30 +-
.../dunit/standalone/StandAloneDUnitEnv.java | 24 +-
.../geode/test/dunit/tests/BasicDUnitTest.java | 55 +-
.../tests/GetDefaultDiskStoreNameDUnitTest.java | 30 +-
.../dunit/tests/GetTestMethodNameDUnitTest.java | 25 +-
.../test/dunit/tests/JUnit4BasicDUnitTest.java | 61 +-
.../JUnit4GetDefaultDiskStoreNameDUnitTest.java | 30 +-
.../tests/JUnit4GetTestMethodNameDUnitTest.java | 25 +-
...ingGetPropertiesDisconnectsAllDUnitTest.java | 29 +-
.../test/dunit/tests/JUnit4VMDUnitTest.java | 33 +-
...ingGetPropertiesDisconnectsAllDUnitTest.java | 26 +-
.../geode/test/dunit/tests/VMDUnitTest.java | 33 +-
.../java/org/apache/geode/test/fake/Fakes.java | 73 +-
.../geode/test/golden/ExecutableProcess.java | 24 +-
.../geode/test/golden/FailOutputTestCase.java | 33 +-
.../golden/FailWithErrorInOutputJUnitTest.java | 32 +-
.../FailWithExtraLineInOutputJUnitTest.java | 42 +-
...WithLineMissingFromEndOfOutputJUnitTest.java | 41 +-
...hLineMissingFromMiddleOfOutputJUnitTest.java | 41 +-
.../FailWithLoggerErrorInOutputJUnitTest.java | 32 +-
.../FailWithLoggerFatalInOutputJUnitTest.java | 32 +-
.../FailWithLoggerWarnInOutputJUnitTest.java | 32 +-
.../golden/FailWithProblemInOutputTestCase.java | 38 +-
.../golden/FailWithSevereInOutputJUnitTest.java | 32 +-
...hTimeoutOfWaitForOutputToMatchJUnitTest.java | 39 +-
.../FailWithWarningInOutputJUnitTest.java | 32 +-
.../geode/test/golden/GoldenComparator.java | 74 +-
.../test/golden/GoldenStringComparator.java | 28 +-
.../geode/test/golden/GoldenTestCase.java | 89 +-
.../golden/GoldenTestFrameworkTestSuite.java | 46 +-
.../apache/geode/test/golden/PassJUnitTest.java | 42 +-
.../golden/PassWithExpectedErrorJUnitTest.java | 32 +-
.../golden/PassWithExpectedProblemTestCase.java | 62 +-
.../golden/PassWithExpectedSevereJUnitTest.java | 32 +-
.../PassWithExpectedWarningJUnitTest.java | 32 +-
.../test/golden/RegexGoldenComparator.java | 29 +-
.../test/golden/StringGoldenComparator.java | 24 +-
.../apache/geode/test/process/MainLauncher.java | 38 +-
.../test/process/MainLauncherJUnitTest.java | 67 +-
.../geode/test/process/OutputFormatter.java | 26 +-
.../geode/test/process/ProcessOutputReader.java | 50 +-
.../geode/test/process/ProcessStreamReader.java | 33 +-
.../process/ProcessTestFrameworkTestSuite.java | 27 +-
.../geode/test/process/ProcessWrapper.java | 187 +-
.../test/process/ProcessWrapperJUnitTest.java | 44 +-
.../org/apache/geode/util/JSR166TestCase.java | 804 +-
.../org/apache/geode/util/test/TestUtil.java | 41 +-
.../org/apache/persistence/admin/Logger.java | 398 +-
.../apache/persistence/logging/Formatter.java | 26 +-
.../org/apache/persistence/logging/Handler.java | 50 +-
.../org/apache/persistence/logging/Level.java | 83 +-
.../apache/persistence/logging/LogRecord.java | 60 +-
.../org/apache/persistence/logging/Logger.java | 184 +-
.../persistence/logging/SimpleFormatter.java | 36 +-
.../persistence/logging/StreamHandler.java | 35 +-
.../parReg/query/unittest/NewPortfolio.java | 191 +-
.../java/parReg/query/unittest/Position.java | 126 +-
.../src/test/java/perffmwk/Formatter.java | 135 +-
.../src/test/java/util/TestException.java | 34 +-
.../geode/cache/client/internal/CloseCQOp.java | 39 +-
.../geode/cache/client/internal/CreateCQOp.java | 95 +-
.../cache/client/internal/CreateCQWithIROp.java | 51 +-
.../cache/client/internal/GetDurableCQsOp.java | 71 +-
.../client/internal/ServerCQProxyImpl.java | 75 +-
.../geode/cache/client/internal/StopCQOp.java | 39 +-
.../cache/query/internal/cq/ClientCQImpl.java | 441 +-
.../internal/cq/CqAttributesMutatorImpl.java | 64 +-
.../cache/query/internal/cq/CqConflatable.java | 119 +-
.../cache/query/internal/cq/CqEventImpl.java | 117 +-
.../cache/query/internal/cq/CqListenerImpl.java | 55 +-
.../cache/query/internal/cq/CqQueryImpl.java | 216 +-
.../query/internal/cq/CqServiceFactoryImpl.java | 41 +-
.../cache/query/internal/cq/CqServiceImpl.java | 1788 ++-
.../internal/cq/CqServiceStatisticsImpl.java | 73 +-
.../query/internal/cq/CqServiceVsdStats.java | 199 +-
.../query/internal/cq/CqStatisticsImpl.java | 53 +-
.../cache/query/internal/cq/ServerCQImpl.java | 454 +-
.../tier/sockets/command/BaseCQCommand.java | 24 +-
.../cache/tier/sockets/command/CloseCQ.java | 70 +-
.../cache/tier/sockets/command/ExecuteCQ.java | 86 +-
.../cache/tier/sockets/command/ExecuteCQ61.java | 112 +-
.../cache/tier/sockets/command/GetCQStats.java | 47 +-
.../tier/sockets/command/GetDurableCQs.java | 46 +-
.../cache/tier/sockets/command/MonitorCQ.java | 63 +-
.../cache/tier/sockets/command/StopCQ.java | 64 +-
.../geode/cache/query/cq/CQJUnitTest.java | 105 +-
.../cache/query/cq/dunit/CqDataDUnitTest.java | 800 +-
.../dunit/CqDataOptimizedExecuteDUnitTest.java | 29 +-
.../cq/dunit/CqDataUsingPoolDUnitTest.java | 721 +-
...qDataUsingPoolOptimizedExecuteDUnitTest.java | 25 +-
.../cache/query/cq/dunit/CqPerfDUnitTest.java | 882 +-
.../cq/dunit/CqPerfUsingPoolDUnitTest.java | 873 +-
.../cache/query/cq/dunit/CqQueryDUnitTest.java | 2997 +++--
.../dunit/CqQueryOptimizedExecuteDUnitTest.java | 224 +-
.../cq/dunit/CqQueryUsingPoolDUnitTest.java | 1998 ++-
...QueryUsingPoolOptimizedExecuteDUnitTest.java | 28 +-
.../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 647 +-
...ltSetUsingPoolOptimizedExecuteDUnitTest.java | 148 +-
.../cache/query/cq/dunit/CqStateDUnitTest.java | 67 +-
.../cache/query/cq/dunit/CqStatsDUnitTest.java | 353 +-
.../dunit/CqStatsOptimizedExecuteDUnitTest.java | 24 +-
.../cq/dunit/CqStatsUsingPoolDUnitTest.java | 373 +-
...StatsUsingPoolOptimizedExecuteDUnitTest.java | 24 +-
.../query/cq/dunit/CqTimeTestListener.java | 103 +-
.../PartitionedRegionCqQueryDUnitTest.java | 1409 +--
...dRegionCqQueryOptimizedExecuteDUnitTest.java | 209 +-
.../query/cq/dunit/PrCqUsingPoolDUnitTest.java | 2008 ++-
.../PrCqUsingPoolOptimizedExecuteDUnitTest.java | 24 +-
.../cache/query/dunit/PdxQueryCQDUnitTest.java | 406 +-
.../cache/query/dunit/PdxQueryCQTestBase.java | 515 +-
.../dunit/QueryIndexUpdateRIDUnitTest.java | 422 +-
.../query/dunit/QueryMonitorDUnitTest.java | 526 +-
.../cache/snapshot/ClientSnapshotDUnitTest.java | 104 +-
.../AnalyzeCQSerializablesJUnitTest.java | 50 +-
.../cache/PRDeltaPropagationDUnitTest.java | 940 +-
.../geode/internal/cache/PutAllCSDUnitTest.java | 2668 ++--
.../cache/RemoteCQTransactionDUnitTest.java | 562 +-
.../internal/cache/ha/CQListGIIDUnitTest.java | 311 +-
.../cache/ha/HADispatcherDUnitTest.java | 82 +-
.../sockets/ClientToServerDeltaDUnitTest.java | 703 +-
.../DeltaPropagationWithCQDUnitTest.java | 117 +-
...ToRegionRelationCQRegistrationDUnitTest.java | 541 +-
.../sockets/DurableClientCrashDUnitTest.java | 89 +-
.../sockets/DurableClientNetDownDUnitTest.java | 44 +-
.../sockets/DurableClientSimpleDUnitTest.java | 2353 ++--
.../tier/sockets/DurableClientTestCase.java | 1235 +-
.../CacheServerManagementDUnitTest.java | 277 +-
.../cli/commands/ClientCommandsDUnitTest.java | 277 +-
.../DurableClientCommandsDUnitTest.java | 179 +-
.../internal/pulse/TestCQDUnitTest.java | 82 +-
.../internal/pulse/TestClientsDUnitTest.java | 36 +-
.../internal/pulse/TestServerDUnitTest.java | 45 +-
.../geode/security/CQClientAuthDunitTest.java | 41 +-
.../security/CQPDXPostProcessorDUnitTest.java | 50 +-
.../security/CQPostProcessorDunitTest.java | 34 +-
.../ClientAuthorizationTwoDUnitTest.java | 102 +-
.../security/ClientAuthzObjectModDUnitTest.java | 179 +-
.../ClientCQPostAuthorizationDUnitTest.java | 155 +-
.../ClientPostAuthorizationDUnitTest.java | 193 +-
.../ClientQueryAuthDistributedTest.java | 59 +-
.../geode/security/MultiUserAPIDUnitTest.java | 99 +-
.../MultiUserDurableCQAuthzDUnitTest.java | 170 +-
geode-json/src/main/java/org/json/CDL.java | 551 +-
geode-json/src/main/java/org/json/Cookie.java | 331 +-
.../src/main/java/org/json/CookieList.java | 177 +-
geode-json/src/main/java/org/json/HTTP.java | 348 +-
.../src/main/java/org/json/HTTPTokener.java | 154 +-
.../src/main/java/org/json/JSONArray.java | 1702 ++-
.../src/main/java/org/json/JSONException.java | 58 +-
geode-json/src/main/java/org/json/JSONML.java | 839 +-
.../src/main/java/org/json/JSONObject.java | 2871 +++--
.../src/main/java/org/json/JSONString.java | 35 +-
.../src/main/java/org/json/JSONStringer.java | 153 +-
.../src/main/java/org/json/JSONTokener.java | 791 +-
.../src/main/java/org/json/JSONWriter.java | 648 +-
geode-json/src/main/java/org/json/XML.java | 926 +-
.../src/main/java/org/json/XMLTokener.java | 727 +-
.../geode/test/junit/ConditionalIgnore.java | 30 +-
.../geode/test/junit/IgnoreCondition.java | 22 +-
.../apache/geode/test/junit/IgnoreUntil.java | 30 +-
.../org/apache/geode/test/junit/Repeat.java | 28 +-
.../java/org/apache/geode/test/junit/Retry.java | 34 +-
.../test/junit/categories/ContainerTest.java | 26 +-
.../test/junit/categories/DistributedTest.java | 25 +-
.../categories/DistributedTransactionsTest.java | 25 +-
.../geode/test/junit/categories/FlakyTest.java | 25 +-
.../geode/test/junit/categories/HydraTest.java | 22 +-
.../test/junit/categories/IntegrationTest.java | 25 +-
.../test/junit/categories/PerformanceTest.java | 22 +-
.../test/junit/categories/SecurityTest.java | 22 +-
.../geode/test/junit/categories/UITest.java | 22 +-
.../geode/test/junit/categories/UnitTest.java | 36 +-
.../geode/test/junit/categories/WanTest.java | 22 +-
.../test/junit/rules/ConditionalIgnoreRule.java | 52 +-
.../junit/rules/DescribedExternalResource.java | 28 +-
.../geode/test/junit/rules/DiskDirRule.java | 40 +-
.../test/junit/rules/ExpectedTimeoutRule.java | 67 +-
.../geode/test/junit/rules/IgnoreUntilRule.java | 49 +-
.../geode/test/junit/rules/RepeatRule.java | 36 +-
.../geode/test/junit/rules/RetryRule.java | 80 +-
.../apache/geode/test/junit/rules/RuleList.java | 33 +-
.../test/junit/rules/TemporaryFileRule.java | 53 +-
.../serializable/FieldSerializationUtils.java | 31 +-
.../serializable/FieldsOfTemporaryFolder.java | 22 +-
.../rules/serializable/FieldsOfTestName.java | 22 +-
.../rules/serializable/FieldsOfTimeout.java | 22 +-
.../SerializableExternalResource.java | 25 +-
.../serializable/SerializableRuleList.java | 22 +-
.../SerializableTemporaryFolder.java | 28 +-
.../serializable/SerializableTestName.java | 26 +-
.../serializable/SerializableTestRule.java | 25 +-
.../serializable/SerializableTestWatcher.java | 26 +-
.../rules/serializable/SerializableTimeout.java | 39 +-
.../test/junit/runner/SuiteBlockRunner.java | 28 +-
.../geode/test/junit/runner/SuiteRunner.java | 39 +-
.../CategoryWithParameterizedRunner.java | 27 +-
.../CategoryWithParameterizedRunnerFactory.java | 28 +-
.../junit/runners/ExposedGetAnnotations.java | 22 +-
.../junit/support/DefaultIgnoreCondition.java | 22 +-
.../IgnoreConditionEvaluationException.java | 27 +-
.../test/junit/categories/CategoryOne.java | 22 +-
.../test/junit/categories/CategoryTest.java | 48 +-
.../test/junit/categories/CategoryTwo.java | 22 +-
.../geode/test/junit/rules/DiskDirRuleTest.java | 22 +-
.../junit/rules/ExpectedTimeoutRuleTest.java | 111 +-
.../test/junit/rules/IgnoreUntilRuleTest.java | 44 +-
.../geode/test/junit/rules/RepeatRuleTest.java | 76 +-
.../rules/RetryRuleGlobalWithErrorTest.java | 74 +-
.../rules/RetryRuleGlobalWithExceptionTest.java | 76 +-
.../rules/RetryRuleLocalWithErrorTest.java | 60 +-
.../rules/RetryRuleLocalWithExceptionTest.java | 62 +-
.../geode/test/junit/rules/RuleListTest.java | 34 +-
.../test/junit/rules/TemporaryFileRuleTest.java | 43 +-
.../geode/test/junit/rules/TestRunner.java | 25 +-
.../examples/RepeatingTestCasesExampleTest.java | 26 +-
.../rules/examples/RetryRuleExampleTest.java | 22 +-
.../rules/examples/RuleAndClassRuleTest.java | 52 +-
.../SerializableExternalResourceTest.java | 25 +-
.../serializable/SerializableRuleListTest.java | 31 +-
.../SerializableTemporaryFolderTest.java | 34 +-
.../serializable/SerializableTestNameTest.java | 22 +-
.../SerializableTestWatcherTest.java | 25 +-
.../serializable/SerializableTimeoutTest.java | 43 +-
...egoryWithParameterizedRunnerFactoryTest.java | 45 +-
.../apache/geode/cache/lucene/LuceneIndex.java | 34 +-
.../apache/geode/cache/lucene/LuceneQuery.java | 41 +-
.../cache/lucene/LuceneQueryException.java | 24 +-
.../geode/cache/lucene/LuceneQueryFactory.java | 73 +-
.../geode/cache/lucene/LuceneQueryProvider.java | 35 +-
.../geode/cache/lucene/LuceneResultStruct.java | 30 +-
.../geode/cache/lucene/LuceneService.java | 58 +-
.../cache/lucene/LuceneServiceProvider.java | 27 +-
.../lucene/PageableLuceneQueryResults.java | 34 +-
.../AbstractPartitionedRepositoryManager.java | 250 +-
.../cache/lucene/internal/IndexListener.java | 27 +-
.../lucene/internal/IndexListenerAdapter.java | 34 +-
.../lucene/internal/IndexRepositoryFactory.java | 46 +-
.../lucene/internal/InternalLuceneIndex.java | 26 +-
.../lucene/internal/InternalLuceneService.java | 24 +-
.../lucene/internal/LuceneEventListener.java | 38 +-
.../internal/LuceneIndexCreationProfile.java | 89 +-
.../lucene/internal/LuceneIndexFactory.java | 55 +-
.../LuceneIndexForPartitionedRegion.java | 90 +-
.../cache/lucene/internal/LuceneIndexImpl.java | 80 +-
.../cache/lucene/internal/LuceneIndexStats.java | 73 +-
.../lucene/internal/LuceneQueryFactoryImpl.java | 43 +-
.../cache/lucene/internal/LuceneQueryImpl.java | 58 +-
.../cache/lucene/internal/LuceneRawIndex.java | 82 +-
.../lucene/internal/LuceneRawIndexFactory.java | 50 +-
.../lucene/internal/LuceneResultStructImpl.java | 29 +-
.../lucene/internal/LuceneServiceImpl.java | 158 +-
.../PageableLuceneQueryResultsImpl.java | 80 +-
.../internal/PartitionedRepositoryManager.java | 37 +-
.../internal/RawIndexRepositoryFactory.java | 122 +-
.../internal/RawLuceneRepositoryManager.java | 88 +-
.../lucene/internal/StringQueryProvider.java | 29 +-
.../lucene/internal/cli/LuceneCliStrings.java | 121 +-
.../internal/cli/LuceneIndexCommands.java | 367 +-
.../lucene/internal/cli/LuceneIndexDetails.java | 87 +-
.../lucene/internal/cli/LuceneIndexInfo.java | 27 +-
.../lucene/internal/cli/LuceneQueryInfo.java | 42 +-
.../internal/cli/LuceneSearchResults.java | 51 +-
.../functions/LuceneCreateIndexFunction.java | 50 +-
.../functions/LuceneDescribeIndexFunction.java | 31 +-
.../cli/functions/LuceneListIndexFunction.java | 29 +-
.../functions/LuceneSearchIndexFunction.java | 50 +-
.../internal/directory/DumpDirectoryFiles.java | 46 +-
.../internal/directory/FileIndexInput.java | 79 +-
.../internal/directory/RegionDirectory.java | 45 +-
.../lucene/internal/directory/package-info.java | 30 +-
.../internal/distributed/CollectorManager.java | 46 +-
.../lucene/internal/distributed/EntryScore.java | 29 +-
.../internal/distributed/LuceneFunction.java | 42 +-
.../distributed/LuceneFunctionContext.java | 38 +-
.../lucene/internal/distributed/TopEntries.java | 32 +-
.../distributed/TopEntriesCollector.java | 28 +-
.../distributed/TopEntriesCollectorManager.java | 40 +-
.../TopEntriesFunctionCollector.java | 55 +-
.../internal/distributed/package-info.java | 33 +-
.../lucene/internal/filesystem/ChunkKey.java | 34 +-
.../cache/lucene/internal/filesystem/File.java | 45 +-
.../internal/filesystem/FileInputStream.java | 46 +-
.../internal/filesystem/FileOutputStream.java | 38 +-
.../lucene/internal/filesystem/FileSystem.java | 94 +-
.../internal/filesystem/FileSystemStats.java | 60 +-
.../filesystem/SeekableInputStream.java | 33 +-
.../internal/filesystem/package-info.java | 32 +-
.../internal/management/LuceneIndexMetrics.java | 102 +-
.../management/LuceneIndexStatsMonitor.java | 43 +-
.../management/LuceneServiceBridge.java | 30 +-
.../internal/management/LuceneServiceMBean.java | 22 +-
.../management/LuceneServiceMXBean.java | 39 +-
.../management/ManagementIndexListener.java | 25 +-
.../lucene/internal/management/StatsKey.java | 22 +-
.../cache/lucene/internal/package-info.java | 26 +-
.../internal/repository/IndexRepository.java | 49 +-
.../repository/IndexRepositoryImpl.java | 50 +-
.../repository/IndexResultCollector.java | 28 +-
.../internal/repository/RepositoryManager.java | 38 +-
.../internal/repository/package-info.java | 30 +-
.../HeterogeneousLuceneSerializer.java | 58 +-
.../repository/serializer/LuceneSerializer.java | 31 +-
.../serializer/PdxLuceneSerializer.java | 32 +-
.../serializer/PrimitiveSerializer.java | 28 +-
.../serializer/ReflectionLuceneSerializer.java | 58 +-
.../repository/serializer/SerializerUtil.java | 84 +-
.../repository/serializer/package-info.java | 26 +-
.../internal/xml/LuceneIndexCreation.java | 34 +-
.../internal/xml/LuceneIndexXmlGenerator.java | 31 +-
.../internal/xml/LuceneServiceXmlGenerator.java | 31 +-
.../lucene/internal/xml/LuceneXmlConstants.java | 26 +-
.../lucene/internal/xml/LuceneXmlParser.java | 65 +-
.../cache/lucene/internal/xml/package-info.java | 30 +-
.../apache/geode/cache/lucene/package-info.java | 43 +-
.../geode/cache/lucene/LuceneDUnitTest.java | 24 +-
.../lucene/LuceneIndexCreationDUnitTest.java | 147 +-
.../LuceneIndexCreationIntegrationTest.java | 106 +-
...ceneIndexCreationOffHeapIntegrationTest.java | 28 +-
...IndexCreationPersistenceIntegrationTest.java | 103 +-
.../LuceneIndexMaintenanceIntegrationTest.java | 43 +-
.../cache/lucene/LuceneIntegrationTest.java | 26 +-
.../geode/cache/lucene/LuceneQueriesBase.java | 58 +-
.../lucene/LuceneQueriesClientDUnitTest.java | 135 +-
.../lucene/LuceneQueriesIntegrationTest.java | 196 +-
.../geode/cache/lucene/LuceneQueriesPRBase.java | 50 +-
.../lucene/LuceneQueriesPeerPRDUnitTest.java | 34 +-
.../LuceneQueriesPeerPROverflowDUnitTest.java | 36 +-
.../LuceneQueriesPeerPRRedundancyDUnitTest.java | 61 +-
...LuceneQueriesPersistenceIntegrationTest.java | 39 +-
.../internal/LuceneEventListenerJUnitTest.java | 62 +-
.../LuceneIndexCreationProfileJUnitTest.java | 99 +-
.../LuceneIndexForPartitionedRegionTest.java | 158 +-
.../internal/LuceneIndexImplJUnitTest.java | 154 +-
.../LuceneIndexRecoveryHAIntegrationTest.java | 57 +-
.../internal/LuceneIndexStatsJUnitTest.java | 37 +-
.../LuceneQueryFactoryImplJUnitTest.java | 32 +-
.../internal/LuceneQueryImplJUnitTest.java | 39 +-
.../LuceneResultStructImpJUnitTest.java | 45 +-
.../LuceneServiceImplIntegrationTest.java | 27 +-
.../internal/LuceneServiceImplJUnitTest.java | 26 +-
...PageableLuceneQueryResultsImplJUnitTest.java | 91 +-
.../PartitionedRepositoryManagerJUnitTest.java | 120 +-
.../RawLuceneRepositoryManagerJUnitTest.java | 191 +-
.../internal/StringQueryProviderJUnitTest.java | 33 +-
.../cli/LuceneIndexCommandsDUnitTest.java | 327 +-
.../cli/LuceneIndexCommandsJUnitTest.java | 365 +-
.../LuceneCreateIndexFunctionJUnitTest.java | 251 +-
.../LuceneDescribeIndexFunctionJUnitTest.java | 206 +-
.../LuceneListIndexFunctionJUnitTest.java | 203 +-
.../LuceneSearchIndexFunctionJUnitTest.java | 229 +-
.../LuceneClusterConfigurationDUnitTest.java | 100 +-
.../DumpDirectoryFilesIntegrationTest.java | 33 +-
.../directory/DumpDirectoryFilesJUnitTest.java | 26 +-
.../directory/RegionDirectoryJUnitTest.java | 44 +-
.../DistributedScoringJUnitTest.java | 59 +-
.../distributed/EntryScoreJUnitTest.java | 24 +-
.../LuceneFunctionContextJUnitTest.java | 27 +-
.../distributed/LuceneFunctionJUnitTest.java | 63 +-
.../TopEntriesCollectorJUnitTest.java | 30 +-
.../TopEntriesFunctionCollectorJUnitTest.java | 46 +-
.../distributed/TopEntriesJUnitTest.java | 41 +-
.../internal/filesystem/ChunkKeyJUnitTest.java | 26 +-
.../internal/filesystem/FileJUnitTest.java | 24 +-
.../filesystem/FileSystemJUnitTest.java | 395 +-
.../filesystem/FileSystemStatsJUnitTest.java | 28 +-
.../management/LuceneManagementDUnitTest.java | 91 +-
.../IndexRepositoryImplJUnitTest.java | 104 +-
.../IndexRepositoryImplPerformanceTest.java | 232 +-
.../HeterogeneousLuceneSerializerJUnitTest.java | 55 +-
.../serializer/PdxFieldMapperJUnitTest.java | 55 +-
.../ReflectionFieldMapperJUnitTest.java | 53 +-
.../internal/repository/serializer/Type1.java | 30 +-
.../internal/repository/serializer/Type2.java | 32 +-
...neIndexXmlGeneratorIntegrationJUnitTest.java | 40 +-
.../xml/LuceneIndexXmlGeneratorJUnitTest.java | 41 +-
...uceneIndexXmlParserIntegrationJUnitTest.java | 59 +-
.../xml/LuceneIndexXmlParserJUnitTest.java | 32 +-
.../geode/cache/lucene/test/IndexRegionSpy.java | 48 +-
.../cache/lucene/test/IndexRepositorySpy.java | 48 +-
.../cache/lucene/test/LuceneTestUtilities.java | 76 +-
.../geode/cache/lucene/test/TestObject.java | 28 +-
.../geode/cache/lucene/test/package-info.java | 26 +-
.../com/gemstone/gemfire/GemFireException.java | 163 +-
.../gemfire/OldClientSupportProvider.java | 38 +-
.../execute/EmtpyRegionFunctionException.java | 34 +-
.../cache/execute/FunctionException.java | 59 +-
.../FunctionInvocationTargetException.java | 52 +-
.../gemfire/ClientDataSerializableObject.java | 22 +-
.../gemfire/ClientPDXSerializableObject.java | 24 +-
.../gemfire/ClientSerializableObject.java | 26 +-
.../geode/ClientDataSerializableObject.java | 26 +-
.../geode/ClientPDXSerializableObject.java | 24 +-
.../apache/geode/ClientSerializableObject.java | 30 +-
.../apache/geode/OldClientSupportDUnitTest.java | 96 +-
.../tools/pulse/internal/PulseAppListener.java | 1421 +--
.../controllers/ExceptionHandlingAdvice.java | 100 +-
.../internal/controllers/PulseController.java | 1042 +-
.../tools/pulse/internal/data/Cluster.java | 7542 ++++++-----
.../tools/pulse/internal/data/DataBrowser.java | 64 +-
.../pulse/internal/data/IClusterUpdater.java | 68 +-
.../pulse/internal/data/JMXDataUpdater.java | 2033 ++-
.../pulse/internal/data/JmxManagerFinder.java | 93 +-
.../tools/pulse/internal/data/PulseConfig.java | 25 +-
.../pulse/internal/data/PulseConstants.java | 257 +-
.../tools/pulse/internal/data/PulseVersion.java | 29 +-
.../tools/pulse/internal/data/Repository.java | 488 +-
.../geode/tools/pulse/internal/json/CDL.java | 542 +-
.../geode/tools/pulse/internal/json/Cookie.java | 322 +-
.../tools/pulse/internal/json/CookieList.java | 168 +-
.../geode/tools/pulse/internal/json/HTTP.java | 339 +-
.../tools/pulse/internal/json/HTTPTokener.java | 145 +-
.../tools/pulse/internal/json/JSONArray.java | 1683 ++-
.../pulse/internal/json/JSONException.java | 94 +-
.../geode/tools/pulse/internal/json/JSONML.java | 820 +-
.../tools/pulse/internal/json/JSONObject.java | 2942 +++--
.../tools/pulse/internal/json/JSONString.java | 71 +-
.../tools/pulse/internal/json/JSONStringer.java | 144 +-
.../tools/pulse/internal/json/JSONTokener.java | 772 +-
.../tools/pulse/internal/json/JSONWriter.java | 639 +-
.../geode/tools/pulse/internal/json/XML.java | 909 +-
.../tools/pulse/internal/json/XMLTokener.java | 718 +-
.../tools/pulse/internal/log/LogWriter.java | 130 +-
.../pulse/internal/log/MessageFormatter.java | 28 +-
.../pulse/internal/log/PulseLogWriter.java | 71 +-
.../tools/pulse/internal/log/PulseLogger.java | 35 +-
.../security/GemFireAuthentication.java | 50 +-
.../security/GemFireAuthenticationProvider.java | 34 +-
.../pulse/internal/security/LogoutHandler.java | 28 +-
.../internal/service/ClusterDetailsService.java | 204 +-
.../service/ClusterDiskThroughputService.java | 28 +-
.../service/ClusterGCPausesService.java | 136 +-
.../service/ClusterKeyStatisticsService.java | 136 +-
.../internal/service/ClusterMemberService.java | 262 +-
.../service/ClusterMembersRGraphService.java | 701 +-
.../service/ClusterMemoryUsageService.java | 128 +-
.../internal/service/ClusterRegionService.java | 417 +-
.../internal/service/ClusterRegionsService.java | 54 +-
.../service/ClusterSelectedRegionService.java | 475 +-
.../ClusterSelectedRegionsMemberService.java | 296 +-
.../internal/service/ClusterWANInfoService.java | 28 +-
.../service/MemberAsynchEventQueuesService.java | 44 +-
.../internal/service/MemberClientsService.java | 25 +-
.../internal/service/MemberDetailsService.java | 32 +-
.../service/MemberDiskThroughputService.java | 34 +-
.../internal/service/MemberGCPausesService.java | 30 +-
.../service/MemberGatewayHubService.java | 37 +-
.../service/MemberHeapUsageService.java | 30 +-
.../service/MemberKeyStatisticsService.java | 41 +-
.../internal/service/MemberRegionsService.java | 31 +-
.../internal/service/MembersListService.java | 22 +-
.../pulse/internal/service/PulseService.java | 78 +-
.../internal/service/PulseServiceFactory.java | 107 +-
.../internal/service/PulseVersionService.java | 27 +-
.../service/QueryStatisticsService.java | 93 +-
.../internal/service/SystemAlertsService.java | 252 +-
.../pulse/internal/util/ConnectionUtil.java | 42 +-
.../pulse/internal/util/IPAddressUtil.java | 40 +-
.../tools/pulse/internal/util/StringUtils.java | 46 +-
.../tools/pulse/internal/util/TimeUtils.java | 38 +-
.../controllers/PulseControllerJUnitTest.java | 720 +-
.../pulse/testbed/GemFireDistributedSystem.java | 287 +-
.../tools/pulse/testbed/GemfireTopology.java | 22 +-
.../tools/pulse/testbed/PropFileHelper.java | 101 +-
.../pulse/testbed/PropMockDataUpdater.java | 244 +-
.../geode/tools/pulse/testbed/TestBed.java | 64 +-
.../tools/pulse/testbed/driver/PulseUITest.java | 560 +-
.../tools/pulse/tests/AggregateStatement.java | 431 +-
.../pulse/tests/AggregateStatementMBean.java | 333 +-
.../pulse/tests/DataBrowserResultLoader.java | 25 +-
.../pulse/tests/GemFireXDAggregateTable.java | 28 +-
.../tests/GemFireXDAggregateTableMBean.java | 24 +-
.../tools/pulse/tests/GemFireXDCluster.java | 63 +-
.../pulse/tests/GemFireXDClusterMBean.java | 24 +-
.../tools/pulse/tests/GemFireXDMember.java | 48 +-
.../tools/pulse/tests/GemFireXDMemberMBean.java | 22 +-
.../geode/tools/pulse/tests/JMXBaseBean.java | 34 +-
.../geode/tools/pulse/tests/JMXProperties.java | 92 +-
.../apache/geode/tools/pulse/tests/Member.java | 385 +-
.../geode/tools/pulse/tests/MemberMBean.java | 170 +-
.../geode/tools/pulse/tests/PulseTestData.java | 210 +-
.../tools/pulse/tests/PulseTestLocators.java | 462 +-
.../apache/geode/tools/pulse/tests/Region.java | 366 +-
.../geode/tools/pulse/tests/RegionMBean.java | 116 +-
.../geode/tools/pulse/tests/RegionOnMember.java | 188 +-
.../tools/pulse/tests/RegionOnMemberMBean.java | 96 +-
.../apache/geode/tools/pulse/tests/Server.java | 498 +-
.../geode/tools/pulse/tests/ServerObject.java | 505 +-
.../tools/pulse/tests/ServerObjectMBean.java | 156 +-
.../pulse/tests/junit/BaseServiceTest.java | 521 +-
.../junit/ClusterSelectedRegionServiceTest.java | 728 +-
...ClusterSelectedRegionsMemberServiceTest.java | 768 +-
.../junit/MemberGatewayHubServiceTest.java | 901 +-
.../tools/pulse/tests/ui/PulseAbstractTest.java | 2054 +--
.../pulse/tests/ui/PulseAnonymousUserTest.java | 34 +-
.../tools/pulse/tests/ui/PulseAuthTest.java | 22 +-
.../pulse/tests/ui/PulseAutomatedTest.java | 1597 +--
.../tools/pulse/tests/ui/PulseBaseTest.java | 1357 +-
.../tools/pulse/tests/ui/PulseNoAuthTest.java | 22 +-
.../apache/geode/cache/util/AutoBalancer.java | 168 +-
.../util/AutoBalancerIntegrationJUnitTest.java | 69 +-
.../geode/cache/util/AutoBalancerJUnitTest.java | 34 +-
.../client/internal/GatewaySenderBatchOp.java | 172 +-
.../cache/client/internal/SenderProxy.java | 33 +-
.../internal/locator/wan/LocatorDiscovery.java | 170 +-
.../internal/locator/wan/LocatorHelper.java | 106 +-
.../locator/wan/LocatorJoinMessage.java | 48 +-
.../wan/LocatorMembershipListenerImpl.java | 165 +-
.../locator/wan/RemoteLocatorJoinRequest.java | 28 +-
.../locator/wan/RemoteLocatorJoinResponse.java | 43 +-
.../locator/wan/RemoteLocatorPingRequest.java | 33 +-
.../locator/wan/RemoteLocatorPingResponse.java | 28 +-
.../locator/wan/RemoteLocatorRequest.java | 33 +-
.../locator/wan/RemoteLocatorResponse.java | 36 +-
.../internal/locator/wan/WANFactoryImpl.java | 40 +-
.../locator/wan/WanLocatorDiscovererImpl.java | 108 +-
.../cache/wan/AbstractRemoteGatewaySender.java | 82 +-
.../cache/wan/GatewayReceiverFactoryImpl.java | 79 +-
.../internal/cache/wan/GatewayReceiverImpl.java | 139 +-
.../wan/GatewaySenderEventRemoteDispatcher.java | 346 +-
.../cache/wan/GatewaySenderFactoryImpl.java | 184 +-
.../wan/parallel/ParallelGatewaySenderImpl.java | 211 +-
...rentParallelGatewaySenderEventProcessor.java | 40 +-
...moteParallelGatewaySenderEventProcessor.java | 100 +-
...urrentSerialGatewaySenderEventProcessor.java | 36 +-
...RemoteSerialGatewaySenderEventProcessor.java | 33 +-
.../wan/serial/SerialGatewaySenderImpl.java | 131 +-
.../geode/cache/CacheXml70GatewayDUnitTest.java | 130 +-
.../geode/cache/CacheXml80GatewayDUnitTest.java | 49 +-
.../AnalyzeWANSerializablesJUnitTest.java | 52 +-
.../internal/cache/UpdateVersionDUnitTest.java | 1032 +-
.../cache/wan/CacheClientNotifierDUnitTest.java | 557 +-
.../cache/wan/Simple2CacheServerDUnitTest.java | 350 +-
.../geode/internal/cache/wan/WANTestBase.java | 1585 ++-
...oncurrentParallelGatewaySenderDUnitTest.java | 902 +-
...ntParallelGatewaySenderOffHeapDUnitTest.java | 26 +-
...allelGatewaySenderOperation_1_DUnitTest.java | 1050 +-
...allelGatewaySenderOperation_2_DUnitTest.java | 216 +-
...tSerialGatewaySenderOperationsDUnitTest.java | 47 +-
...GatewaySenderOperationsOffHeapDUnitTest.java | 28 +-
.../ConcurrentWANPropagation_1_DUnitTest.java | 661 +-
.../ConcurrentWANPropagation_2_DUnitTest.java | 478 +-
.../cache/wan/disttx/DistTXWANDUnitTest.java | 182 +-
.../CommonParallelGatewaySenderDUnitTest.java | 609 +-
...onParallelGatewaySenderOffHeapDUnitTest.java | 26 +-
...wWANConcurrencyCheckForDestroyDUnitTest.java | 565 +-
.../wan/misc/NewWanAuthenticationDUnitTest.java | 252 +-
.../cache/wan/misc/PDXNewWanDUnitTest.java | 924 +-
...dRegion_ParallelWANPersistenceDUnitTest.java | 975 +-
...dRegion_ParallelWANPropagationDUnitTest.java | 1412 +--
.../SenderWithTransportFilterDUnitTest.java | 133 +-
...downAllPersistentGatewaySenderDUnitTest.java | 96 +-
.../wan/misc/WANConfigurationJUnitTest.java | 302 +-
.../wan/misc/WANLocatorServerDUnitTest.java | 87 +-
.../cache/wan/misc/WANSSLDUnitTest.java | 159 +-
.../wan/misc/WanAutoDiscoveryDUnitTest.java | 481 +-
.../cache/wan/misc/WanValidationsDUnitTest.java | 1549 ++-
...tewaySenderOperation_2_OffHeapDUnitTest.java | 22 +-
...tewaySenderOperation_2_OffHeapDUnitTest.java | 24 +-
...GatewaySenderOperationsOffHeapDUnitTest.java | 26 +-
...ewaySenderQueueOverflowOffHeapDUnitTest.java | 26 +-
.../ParallelWANConflationOffHeapDUnitTest.java | 25 +-
...nceEnabledGatewaySenderOffHeapDUnitTest.java | 26 +-
...ropagationConcurrentOpsOffHeapDUnitTest.java | 26 +-
.../ParallelWANPropagationOffHeapDUnitTest.java | 22 +-
...erialGatewaySenderQueueOffHeapDUnitTest.java | 25 +-
...nceEnabledGatewaySenderOffHeapDUnitTest.java | 26 +-
.../SerialWANPropagationOffHeapDUnitTest.java | 22 +-
...ation_PartitionedRegionOffHeapDUnitTest.java | 24 +-
...allelGatewaySenderOperation_2_DUnitTest.java | 25 +-
...arallelGatewaySenderOperationsDUnitTest.java | 566 +-
...llelGatewaySenderQueueOverflowDUnitTest.java | 590 +-
.../ParallelWANConflationDUnitTest.java | 459 +-
...ersistenceEnabledGatewaySenderDUnitTest.java | 1847 +--
...llelWANPropagationClientServerDUnitTest.java | 120 +-
...lelWANPropagationConcurrentOpsDUnitTest.java | 332 +-
.../ParallelWANPropagationDUnitTest.java | 1207 +-
...ParallelWANPropagationLoopBackDUnitTest.java | 623 +-
.../wan/parallel/ParallelWANStatsDUnitTest.java | 621 +-
...tewaySenderDistributedDeadlockDUnitTest.java | 634 +-
...rialGatewaySenderEventListenerDUnitTest.java | 358 +-
.../SerialGatewaySenderOperationsDUnitTest.java | 549 +-
.../SerialGatewaySenderQueueDUnitTest.java | 263 +-
.../serial/SerialWANConflationDUnitTest.java | 119 +-
...ersistenceEnabledGatewaySenderDUnitTest.java | 490 +-
.../serial/SerialWANPropagationDUnitTest.java | 1200 +-
.../SerialWANPropagationLoopBackDUnitTest.java | 668 +-
...NPropagation_PartitionedRegionDUnitTest.java | 492 +-
.../SerialWANPropagationsFeatureDUnitTest.java | 357 +-
.../wan/serial/SerialWANStatsDUnitTest.java | 677 +-
.../wan/wancommand/WANCommandTestBase.java | 178 +-
...anCommandCreateGatewayReceiverDUnitTest.java | 515 +-
.../WanCommandCreateGatewaySenderDUnitTest.java | 687 +-
...WanCommandGatewayReceiverStartDUnitTest.java | 191 +-
.../WanCommandGatewayReceiverStopDUnitTest.java | 172 +-
.../WanCommandGatewaySenderStartDUnitTest.java | 305 +-
.../WanCommandGatewaySenderStopDUnitTest.java | 295 +-
.../wan/wancommand/WanCommandListDUnitTest.java | 322 +-
.../WanCommandPauseResumeDUnitTest.java | 633 +-
.../wancommand/WanCommandStatusDUnitTest.java | 527 +-
.../management/WANManagementDUnitTest.java | 444 +-
.../ClusterConfigurationDUnitTest.java | 377 +-
.../pulse/TestRemoteClusterDUnitTest.java | 159 +-
.../web/controllers/AbstractBaseController.java | 898 +-
.../web/controllers/BaseControllerAdvice.java | 79 +-
.../web/controllers/CommonCrudController.java | 231 +-
.../controllers/FunctionAccessController.java | 128 +-
.../web/controllers/PdxBasedCrudController.java | 317 +-
.../web/controllers/QueryAccessController.java | 338 +-
.../web/controllers/support/JSONTypes.java | 27 +-
.../controllers/support/QueryResultTypes.java | 30 +-
.../web/controllers/support/RegionData.java | 85 +-
.../controllers/support/RegionEntryData.java | 58 +-
.../support/RestServersResultCollector.java | 43 +-
.../web/controllers/support/UpdateOp.java | 26 +-
.../DataTypeNotSupportedException.java | 30 +-
.../web/exception/GemfireRestException.java | 27 +-
.../web/exception/MalformedJsonException.java | 30 +-
.../web/exception/RegionNotFoundException.java | 26 +-
.../exception/ResourceNotFoundException.java | 30 +-
...stomMappingJackson2HttpMessageConverter.java | 66 +-
.../security/GeodeAuthenticationProvider.java | 30 +-
.../web/security/RestSecurityConfiguration.java | 40 +-
.../web/security/RestSecurityService.java | 31 +-
.../web/swagger/config/RestApiPathProvider.java | 41 +-
.../web/swagger/config/SwaggerConfig.java | 84 +-
.../rest/internal/web/util/ArrayUtils.java | 25 +-
.../rest/internal/web/util/DateTimeUtils.java | 23 +-
.../internal/web/util/IdentifiableUtils.java | 54 +-
.../geode/rest/internal/web/util/JSONUtils.java | 52 +-
.../rest/internal/web/util/JsonWriter.java | 669 +-
.../rest/internal/web/util/NumberUtils.java | 74 +-
.../rest/internal/web/util/ValidationUtils.java | 26 +-
.../cli/commands/CommandOverHttpDUnitTest.java | 64 +-
.../ConnectCommandWithHttpAndSSLDUnitTest.java | 125 +-
.../DataCommandsOverHttpDistributedTest.java | 48 +-
.../GfshCommandsOverHttpSecurityTest.java | 26 +-
.../internal/web/AbstractWebTestCase.java | 30 +-
.../ShellCommandsControllerJUnitTest.java | 72 +-
.../LoginHandlerInterceptorJUnitTest.java | 109 +-
.../internal/web/domain/LinkIndexJUnitTest.java | 155 +-
.../internal/web/domain/LinkJUnitTest.java | 44 +-
.../domain/QueryParameterSourceJUnitTest.java | 50 +-
.../web/http/ClientHttpRequestJUnitTest.java | 187 +-
...ableObjectHttpMessageConverterJUnitTest.java | 94 +-
.../RestHttpOperationInvokerJUnitTest.java | 207 +-
.../SimpleHttpOperationInvokerJUnitTest.java | 71 +-
.../web/util/ConvertUtilsJUnitTest.java | 83 +-
.../internal/web/util/UriUtilsJUnitTest.java | 48 +-
gradle/rat.gradle | 4 +-
5785 files changed, 549343 insertions(+), 553819 deletions(-)
----------------------------------------------------------------------
[77/98] [abbrv] incubator-geode git commit: Adding my PGP key to KEYS
Posted by ds...@apache.org.
Adding my PGP key to KEYS
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/06de5273
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/06de5273
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/06de5273
Branch: refs/heads/feature/GEM-983
Commit: 06de52736845a434ab0325766fab44506a81df2a
Parents: a847c55
Author: zhouxh <gz...@pivotal.io>
Authored: Tue Oct 25 14:17:26 2016 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Tue Oct 25 14:17:26 2016 -0700
----------------------------------------------------------------------
KEYS | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 128 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/06de5273/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index cbc5354..183abc1 100644
--- a/KEYS
+++ b/KEYS
@@ -897,3 +897,131 @@ CmrjtFbx4w8QQYkUwvYYtdVWD2JvNnp/eX89ROcaS+TCbLukaC3OphBXvWI3k1BK
Vb32t+OopTVcELjTjAMBsixx+IaBClvjPXBTuaSXA4S+
=SSEN
-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQENBFcGu5QBCACdmRgd8tfI7RVBdySyL/z41j+yJXdAak2BPXyVvlKP0FMvb0qB
+U6l8vk89HB+jpr5HtUFn+/rj4HuN8IK2blyn8NkSFCWdxirOZWWhMXyNFZQNJ7O7
++DdR8/ko/5I8RsLQ3cHLrF4e4c3NtAhv1IndFisd+mnalcnhLMIQU3899YC+VK4N
+KkSs9N1WDBtTd/kdr6sRUvkHf5hlICaXxmYwDknJ/jdLOI7bZN90fTWH0dWQNf2p
+6qEJlG/TrcW8IFVVk/eS9lk2eMVpYe8ObOfoF5lxfBqElTuuFOVQ+ermUzrQ+C7j
+HUYRKGsxs13cJXnaq3m2GCFbCuMzsU0aqg99ABEBAAG0J1hpYW9qaWFuIFpob3Ug
+PHpob3UueGlhb2ppYW5AZ21haWwuY29tPokBOQQTAQgAIwUCVwa7lAIbAwcLCQgH
+AwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEHbgUH6u2u49LkEH/3hL5UqceDnOV+2s
+Fx2kiT7L5dYQWHETls8ZFkrpokCHhPt7A/MxYPP06Ohe7q1g8FJhKeQbzXD6FSdq
+ewn2t9DwZN/pIIdPR/6OTgwgwhqeQvdLQIAZBbC3qjIRe0KxJFtxgcBVMXN8aWfa
+iUF/6ir+6bjx6/mtziTI3A/qdO/D8C3TwU2SpqpqLh1N/cTcgU6ZtIk/ZiaL4Eh4
+qIO205p1fvFX6gytrBkX9aBVSMtJFkOCBX/VqkGsrGcDtQYEwNEbI5rVFiYmA5of
+j8VxrSpXXK8eirXcHEzEbW969Wu29GzdhYIipVjVwDwmA+M6Wf6093jI+Y5IrgAf
+jgxhYn6JARwEEAEIAAYFAlcGyHkACgkQ8EzEmalmEzoZCwf/cl37XcJuH29yTzLr
+ApFMNxOEUb9p5wMKMSyEM7NzIMJc9luP2Di1nCZ/Hgp9+cjVFSwQ5eR8s4+y6d3b
+0Fva7QdMit1GLN+F/vV8ln8fql7SYbjhI/Z4yskMl4nvL8DBlPKGHTv5ruXQAmJi
+y50iCoa9wSXeU8ZT5N7g+BsbryRvfdKjYLfSdMUa4YlR/pRVTitivpwcyA4mN0AQ
+27Tb/ygurqHAVNlmgJjX0fowwOUEr1aqgasTRv5meet//utQsiRlIKGF43IMLai0
+dhk+r/EtXIsHaQXmGGpcFhFf0FN18x52A3LXsZTeSELxCXY8YdzhmtJmyRt7H+pe
+vgEPY4kCHAQQAQoABgUCVwa+JAAKCRBETB0goWiNl3uzD/4+8vs9zX89F8o4HMyF
+DpxzgH3etpjM8CScHcNdbVnrcO3OCgGg1nO8HMwRZS6PjIS0FVfl9csNMOZw8/SJ
+FdVz8u2GycyueiRu4SZHA0smu7lZlLNeB1AOqYFmreXbAHLd8LnCxlW4qA5RPtw/
+x0nWVSNJ5zUvJjBXurcDPS/FpcdaTRoK2jkWePddF/c4SBkgc1VARHWhqIuwvohZ
+ifCEeeU11l0Vl4HZCj0hgUUt9gXAcjk4YhCsSba/Cz3ERuxlhRgluvhBYlp+DzHq
+0benTCOSVUywTLUjajxdeV1l0jgH1Ps9Rvq8KYBPyP8PcdONLDIa9VcrhZNHabHN
+SUZRz3hAp/xsDY9oihUCHn1zfGklZRidAorR5FS0UZzFy8PoV6+Mrz2inf1xZapK
+a4bA3A0fYm1z3pXxA7ty6XCtwaQ7Gavs3toAXZWdiTtvqdObjb+3Zmhh1o63BA9t
+wIMi5dGy9/xvlQT7Ah6vWtJwGD45t9MwbRnDdivk0/3EJlZWwVzlHoPfjzUFKo+J
+zpU4cWRljJQPps5EAPFPl/OWx0nHbvrpbBQzc6f+ZbB+LszEetap+xq9yVJbGlXU
+cLr5OSAe0IWwOca5CGXCiO2Rr33jnCjLwshNTsPi4Iqtj+1ZVE75eDDbLXvQL+DF
+YIhA56DNZ8svFfBs34gtrW60fYkCIgQQAQoADAUCVwa/ugWDB4YfgAAKCRAmj1Aw
+i2z43fBJD/4i1ac8VxqMuSiEovEb/b+BbW2hipE6BofLdHIG3pixyo4mWR+EWlCB
+BDP8Vm/TZrnBS4b22K3xui4wR7ReTS5qqifv2LHxUdWMYZIbCGp4M1QbTmtGPvWG
+F6p/cw0lMltX2zTxRf1H/T71xvy8n4s07BZ7i0dgySYyZHDptXkPyZJGHeE1RbFW
+mwvvW3n8q40wETQXXTajIiUJEsDVbqTPTL5dlHrCbIdUXzxB+vkcg8e6sqZAqKJz
+YIaeL7VjbF9vzvcc6nLMa4qrlaBVOFfVrCgA8BL03UOIJ6sTmrXF7p4/qyxc8BIR
+kTQSXBU6t+D9NTXIGZ1VtOxuIIbE5TzzVGGHni/+D3aHhZjI/WHpXjvWgFfd6xY4
+6mVhO2H1pqgnnTqp+P4HCjKmoifUXVdqZnM0KAT2+RmIQ4FTXTZ/anxIIgETXXtF
+UiR9n+lc/P5D25UEj+gL07L+2smb0UYQmPAvCs0gGgyfR+iovOFX4CO9c/UPwnKf
+lPlW1u0nIEBIK6Z0kgsHCEh9H5NE1IV5YUY/2lq8ymAatCIf0+vaeI1b44j15aqd
+f1n/Ddp9eH8WOsicO9E5FJqBaOIGeRcGxkpFeix0HiMq0q5rwoC6M1agSxNdZVWy
+FkQx8r0kIMa28KDvMLFEhiLsc7sEZYHvcy0N5gYtXsu29hqva1XA0IkCIgQQAQoA
+DAUCVwbAUgWDB4YfgAAKCRDg7ynLSKVPhAyAD/9eBoOoc6a9tl7zIzBBlKjHMvFh
+Uv2zDJQpT6bd7HdzNnB9Ja2k72xeOzxdLH+2PU5IO0nrasJQMmvxSYQ4nPg1jWOQ
+hE8TQ061Y2Fbv8Z0eb5HJKcvI74xcseoML4wg15V69XV9768eeQD53jGpLoarbd8
+sNMOn8je6Gp1lGJ2MSxFOiPI2VWCTzc4BHMVv7t8VvQDOgOgEYw5ZhW1U+4spSWi
+45mS4y8V0zaA8x4pULkP1en+x3F8zavKWwJqCAl6zmd5gYtAvfEroXSLE7r/lRwd
+8gHJD/lhUmFLok31c61+a2yz8bDdD26noDorO7O66sYSJowflHsDz5jB9j1/iL3Z
+eHoM0ANLZ8TNHnR/buyiKoUG+BuQCCKBQH00ifqqP7UabLea/Ajbf9hxHGxfjOiA
+EA2Ij7pbYYR39FBdww3QmJxU9MyFL89h8egW5XE7Q73MdCd8WiqrLj4/NYI1Gvht
++5QKR0sY0jtJpX9+YW+8XBb2HwfwIZvmP/H6nyaXPq2uLCMNMMl+HNs4dpM5+1Gz
+dqHoyCpNoY39G3KdxWFe+Cwmf0Jt5JZab4DkRjYSRRkQ3R/lIdDnqPRaa0YConVh
+puywIKjS/yJWC6Sg9m6Wh1uf0IM94d45OGuFV/wDnky6kqnTOOwB5XIjaZvNflIU
+W1zh5l9Eb9fS9g55bokCIgQTAQgADAUCVwa+9AWDB4YfgAAKCRBWSn1JwdVHAe16
+D/9uy0+VEir3BtVuTw/S24cr1aUmaztOzi2unJN04Chd0XWmb5X5a/qaie1Kn7on
+YiyUERdKt6ScOuUEyszsMFukqOqB1HOuJbWzgu33KHNZYnrYEiIPXGxA4vHcYn0m
+SFatwVI+JV699DV1t/rJvhgzmWGtHohY0+oAkd6EFv7IQ1BJ7QGcPg24XViAoZes
+7Irur1USELrE5A4g9dbAeaS5CBZy52o+0MNQNZh2HqhDOOSxT2KT/CFMTQQ+1/GV
+QpbmA2CKQDKuzaMzRaiH3hlMAFc7NDVyTW+kmiKjPY6XddgHzqttZVOt0icijm+s
+9w2CptbasYQsZ/aTUvsoQS+YePthH6nS9G0BM20u21Za1Cpo5SDj2hKByMkBRSPJ
+I773ceeXPSMYePBY7ttBFtD/zzFrJcrNT7BK1FAMq1q3t0OgaZ4MJ/IoqUg6abM5
+UvgU1575c+kUWff+NA6c/XVFtqIubNjaZUfOqbQ9DGEt3jQpovzDlCmGxolGO1cX
+2FZnpOP4FjcqGOiGK0cf2LO+O2zurT1roqlj+FWR9qOho0iJo2RjKpX8cxbeDwNm
+5uv/BsVEXXSGxHjb2vx87+AzkRR9Nu9AOkN7y97mL3QT+onn0MpEzFkOJoTxYI3W
+iTWkmBNU8IoHUqCNkWFxXdWHCH1KAI1ars4KT7A9XDascokCIgQTAQgADAUCVwbA
+uQWDB4YfgAAKCRCE8JcYraLxkA4rEADh0JpNkvttf2VpB27b28v/SHiCUC8I61oL
+YZb7jFumI/8EM9+xbxoJmPrpbLnDS2cqSa6hHIpR4CUUwX4yFLJSvgCXnMJDe2Ud
+2NsWOgWlJkKzdOkjK06ntM+sxP3DWzNU4lX6d37fjEiM5TdAVu1edpGlVJKh6UfD
+raMGLoES0auOMISALN0XquYwuorU4wcxyPfcu3i9FwmZxo+zHqFB7rtTxVS7z/69
+6aUlZzgOcTCQeBHzH6ztPt7sZu1+kSVvbBUEQG8tRu0xYlEHkxqmmWts0yiT4aqd
+FLT/mwy8NcFj6EBizYGxdU3R3KLtOUTnv2cJQcHewmSFSytaeWt6QML0uZt2PyTd
+Co2FwdsZNKPY3eLA4cB+2kbQ6e5Y1n85f2KVnm/cMIWb3gISG0xK6AJGBDYzYBXH
+lYcnICL5hR1vbHVh8LOHal+U9V4PGayD9d/x98iXz6curXOZzmw1hUfoeImJKnmM
+4CmLgI6m6b4hAynTfVK/jIFgJp0gq5pw5+AZu1no42BZEdDWJOzkxSIholXztDaN
+lc0KbWoja4cv2yx+SNkOhwB9mt/M9Kz6C5e/el5o0ZlrYosW1hIi8gIg7fMKDbpb
+u7TGGyRfxHeRWCiMkMeoJPci8KxRI4xERR/+7PaR45X0aEqannHsvule6fYT5d/K
+SV8z08tI4okCIgQTAQoADAUCVwa/gAWDB4YfgAAKCRDI03Bfnb4hdwHAEACV46bE
+8dotDZcDGiULPGKxGVg3d/4KI+sTMPl4TzGdsYQY2aprSRixsMu9qjJaG8P6MVG9
+KUm/DxhwgAQu87DDNrmP5bzRVWio+AmbWzBT7FyTWiXRPWNQvrEgcplvZORziuUh
+DdBKvryNQD0iPyxO2EPTs5vroYa4YIAv3Vlr16JZ1IRfZxJkZq+da2mmDRoFk+LR
+vZSWzkDSLMy5vEoyWaer4MVc/nkn6k+UHKlqQALRdps9QAuikUL4yQUW20y3K8bM
+hfrOGDNEXZSg4W6wjaSVGMpKTu0PE/tP+mbH+FoP1Qg0oUl771cHan2x7WOZ5gqe
+JKSiAb6rDPQNhJjbpftyaYJCMYY5Sw7/ef2aA8X+bmuKqFeW+Yd5IbHQWrecCzqe
+QTO5pZapf+KTj3T9w8pkOFbvzvyIK0zL7m9NIfKBZyCof/XuYbJbbNnFX1VEygfW
+/ghxXtjcMcaBvjvKHxo73SLI/xOc0gObmd+H5pSmzSXLtPCh6n7lnphVSeTIWM/t
+PQzi+s6/4UdMh/NLkUjOVh/2foIF7sflhOifCg+XsX1hmnqNe+5fthxVFIqqGuAn
+sLPdwPSV0SSTLU9z6RfHhNAovRRaQqDpzQP0A8SJf2Fu0HqeaiT569h090svd1O9
+blKijXtwfXToqzqza9drWXnkeVSm3Iwg7E2fKIkCIgQTAQoADAUCVwa/vQWDB4Yf
+gAAKCRA/rHq1u7/feUhFEACgjBD6Nb+6PBY2KVH/glwkQHTwa6PDNsg4NkwwfSdy
+T9k6UvhCx37LB0UP3LC+Z6sQyoDr1IwtavQoLbyJkwZN6Cek3GCOjKQJOpbdSYGF
+/Ef26DZ17qlt+v6hN+jHP0bM16oBuPHucUivY3DvR2ll2/XmD7M9/AbiGkvpMRJ5
+qzdCV9eKrC7nBw+lOrYIURCuvhQpBysw3jrR1GgXXnlhVPw3wOqFhOZJDpY3oMxR
+d1bkomTMnuu1BOmswqsGePUqoApOpAM1t2biEsB+c6wnLjeHvFGWCoFj9H9RqoWB
+rs8LCyQVHc2GQv4yNQE0l05PVaUTOMUTdS45xfnjrWSnIPkoMXTzOreLu+3ttY+m
+GniMi/RMGffWGaF05WlQYUW3tHrVVMmkQrc5pv/6MMpfFcWXSeJcX8nHJQIunbI2
+n3v2y+Yui4WYSpumd652rTa827ETpS9LY36E08CrKVtd6sHzN0SO5t1TPqzcrE8Z
+I87vX5FkJZVhtWfASjG5bc5GMSxQYwsFlY59FtERbu/e+mbNc6JsNYlxC2Zy1V7R
+lHGWVgHhCkg4u3ERnl6HuvRQqwHyeJg+IUk1ENBTPUOlQvbamWPDlIJEHkIkM1Ly
+g19k83aPLJLokh8cxp7U0YcvU6ZlKTgeXmmVJPVvJ0JzoFjGavLHyxxDDZSl1pxm
+X4kCIgQTAQoADAUCVwbBCAWDB4YfgAAKCRAZcAmILC3yrlGsD/sH2YU1EoiD/JbI
+7GTT/fMo6fK6vQzuSSvja79tt+mUmsMoWB02K8rgV9w7Ja6UtnTc3KGE2X6HuaZk
+6whoMX4Djwfpu1eueKEPHNR90qkKInKqyvKGpfvm92puzqz8kIQ0J7Xf4mpLwceh
+XVqnEncVJFHiRgBMFM9fZVQTVQAJdW8CxBIh8UaZ2ttroCUzMCn6vxPp5keuedin
+YTwghfw8dUF+qkK3OduU7lT+OIZ9of+mZjk5NoAEsbi5O8H1YVHVgBQjmT55oVfD
+JXsd9qr7iLJLV5RzTgG8ktSd+oYgmAbg/YLakG6dThmVPORHrh0oiGjUU+gMiUNv
+2ayBr1ymPx0dy/JLQh6H4/0paAzXN/k+l4IROx59iCIbuZ2Eh0cyTeJ+heB3pGMu
+94fb8pNNzuVta3U9g86D5h0b+6RhJKfBzRW6U27c1pGivb37P0AO9CHrXfE7TtkJ
+RSm5T68DXPu5nxRNjMJELry+fh/FXzsWVUEQrH83vjv6frEh9xbYr8HrVgbpNVsI
+69s1FbWo+ecGNHJi5zOuh1tH3ralGn/4mtbWVtMbyf1HiAf12NfHoo4Mrikz1lzl
+xljMc/+eLU5UGQuxQWO/l4zLEQa+FVNfM1gVImASrT/W6bTAjq/fKuKBUFv4CmFP
+An8c4XFhgZzF/BXfOoCAtkNXOMphXLkBDQRXBruUAQgAuY+0pz4kunCLVDpZSH8R
+cKU1QJLqJtvHpAxlY2222//A9zPz6/fm/zj6wfKtGjIaHHIuv4kvDUosDWbQFgVu
+vsALwLd7EfGIjwLiUJVxzf76lY2PDMTbjlXNbhmrIXOTJrtb4ZyTkudSCvc/mzy1
+9rhpY42UbCQcWjBE6UL+3acL4MztgMAPT4iosHqA0OrXqPxf9xAXpDOGfCwyr38x
+Rvs4N597HDjFnIGnMStv3qjwp+7t+3LZmUSJcO/3kiTfA6y2D5QMFSyDMSnP7YWb
+64wO9yZ6l0j2Qd3K2FGBFdSbJBb88gKEMzkMc2G8+HqFw8sQFm+QAF82El4x62xU
+dQARAQABiQEfBBgBCAAJBQJXBruUAhsMAAoJEHbgUH6u2u49hZMH/0IY+2mvdCQT
+1WN4LdoEvHy1ACGlzoJyJolHoh0MFD/lPxEbUP/8irmK9HJEkv/CNdoNYzAQ4uzX
++24en2gK83e1eORNDXlcWfsQK3QsoyffD98tmk/66VMJNjwOvUoN5eiYjMSIuQL3
+ml1nvnsx3TgIWP/1E0vVZ8eyAwd5Ldor0nu8pCaicPgeo07q7/4sb9xWHuKda2Q8
+t+qzsGqoQLPihv3Qx++fQXaJVWUfhkm2kVjr7/dhgHy2uMvp7lzkUEnfTb1uGu05
+J2xcjxdmxDOpFF1aAJar1V22U0m1tnVgLoN0ta6bDPXXMvacx0+VWe8Tgt3SY3/a
+A4DF9y+6usA=
+=O5OI
+-----END PGP PUBLIC KEY BLOCK-----
[68/98] [abbrv] incubator-geode git commit: GEODE-2015: Edit links to
docs info
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/redirects.rb
----------------------------------------------------------------------
diff --git a/geode-book/redirects.rb b/geode-book/redirects.rb
index e913407..71f50d9 100644
--- a/geode-book/redirects.rb
+++ b/geode-book/redirects.rb
@@ -14,5 +14,5 @@
#permissions and limitations under the License.
r301 %r{/releases/latest/javadoc/(.*)}, 'http://geode.incubator.apache.org/releases/latest/javadoc/$1'
-rewrite '/', '/docs/about_geode.html'
-rewrite '/index.html', '/docs/about_geode.html'
+rewrite '/', '/docs/guide/about_geode.html'
+rewrite '/index.html', '/docs/guide/about_geode.html'
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-docs/about_geode.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/about_geode.html.md.erb b/geode-docs/about_geode.html.md.erb
index b4f090f..ca6f022 100644
--- a/geode-docs/about_geode.html.md.erb
+++ b/geode-docs/about_geode.html.md.erb
@@ -19,8 +19,6 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-This documentation describes product concepts and provides complete setup instructions for Apache Geode 1.0.0-incubating. Source files and instructions on how to build this documentation are available at [https://github.com/project-geode/docs](https://github.com/project-geode/docs) and [https://github.com/project-geode/docs/blob/master/README.md](https://github.com/project-geode/docs/blob/master/README.md).
+This documentation describes product concepts and provides complete setup instructions for Apache Geode 1.0.0-incubating. Source files are available at [https://github.com/apache/incubator-geode/tree/develop/geode-docs](https://github.com/apache/incubator-geode/tree/develop/geode-docs) and instructions on how to build this documentation is available at [https://github.com/apache/incubator-geode/blob/develop/geode-book/README.md](https://github.com/apache/incubator-geode/blob/develop/geode-book/README.md).
You can also find additional documentation about Geode on the **Apache Geode Wiki**: [https://cwiki.apache.org/confluence/display/GEODE/Index](https://cwiki.apache.org/confluence/display/GEODE/Index).
-
-
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-site/website/README.md
----------------------------------------------------------------------
diff --git a/geode-site/website/README.md b/geode-site/website/README.md
index ff9ee89..8baf904 100644
--- a/geode-site/website/README.md
+++ b/geode-site/website/README.md
@@ -2,15 +2,20 @@
This directory contains the source files for the project website. Website content is written in [Markdown](https://help.github.com/articles/markdown-basics) and the site files are generated from that source by a tool called [Pandoc](http://johnmacfarlane.net/pandoc).
-Source files for the website are in ``${geode-project-dir}/geode-site/website/content``
+Source files for the website are in `${geode-project-dir}/geode-site/website/content`.
-Generated files for the website are in ``${geode-project-dir}/geode-site/content``
+Generated files for the website are in `${geode-project-dir}/geode-site/content`.
+
+NOTE: To make changes to the [Apache Geode User Guide](http://geode.incubator.apache.org/docs/guide/About_Geode.html):
+
+- See `${geode-project-dir}/geode-docs/CONTRIBUTE.md` for information about contributing to the documentation source files.
+- See `${geode-project-dir}/geode-book/README.md` for information about building a local version of the guide and adding it to the website.
The website is updated by a "sync" tool that monitors the __asf-site__ branch
of our Git repo, so after making changes you must place your updated source
and generated files on the __asf-site__ branch and push.
The content will be published to the
-[Geode website](http://geode.incubator.apache.org) after a 5-20 minute delay.
+Geode website](http://geode.incubator.apache.org) after a 5-20 minute delay.
## Prerequisites
@@ -36,13 +41,15 @@ Install Nanoc and other Ruby Gems needed:
Source files for the website are in
``${geode-project-dir}/geode-site/website/content``.
When changing the actual content of the site, find the Markdown files that you
-need to edit under the ``${geode-project-dir}/geode-site/website/content/docs``
+need to edit under the `${geode-project-dir}/geode-site/website/content/`
directory and make your change.
If you need to change the layout or styling of the site,
then you will probably need to change an HTML, JS or CSS file
within the ``${geode-project-dir}/geode-site/website/content`` directory.
+NOTE: The [Apache Geode User Guide](http://geode.incubator.apache.org/docs/guide/About_Geode.html) source files are in `${geode-project-dir}/geode-docs/`. See `${geode-project-dir}/geode-docs/CONTRIBUTE.md` for more information.
+
### 2. Locally generate the site and test your changes
Run the nanoc compiler to generate the site.
@@ -53,10 +60,11 @@ file to place the locally built website into the
With a cwd of ``${geode-project-dir}/geode-site/website``:
$ nanoc compile
-
Run ``git status`` and you should see your changes plus any updated files
under the ``${geode-project-dir}/content`` directory.
+NOTE: Whether or not you have made changes to the Apache Geode User Guide, you must now build the User Guide and move the User Guide files to the Geode website. For instructions, see `${geode-project-dir}/geode-book/README.md`.
+
To view your changes locally, use the view command to start a local web server. Check the website at [http://0.0.0.0:3000](http://0.0.0.0:3000)
$ nanoc view
@@ -76,18 +84,16 @@ top level, ``${geode-project-dir}``, of the __asf-site__ branch.
Here is one way to accomplish this:
1. On the __develop__ branch
-
+
$ cd geode-site/website
$ nanoc compile
$ cd ../content
$ tar cvf new-website-content.tar .
- $ mv new-website-content.tar ~/Desktop/.
-The move of the TAR file is not necessary, but helps to clarify this example.
+ $ mv new-website-content.tar ~/Desktop/
-2. Expand the TAR file at the top level of the __asf-site__ branch
+2. Expand the TAR file at the top level of the __asf-site__ branch (cwd should be ${geode-project-dir}:
- $ cd .. (cwd should be ${geode-project-dir})
- $ checkout asf-site
+ $ git checkout asf-site
$ tar xvf ~/Desktop/new-website-content.tar
3. Commit and push on the __asf-site__ branch
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-site/website/content/docs/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/docs/index.html b/geode-site/website/content/docs/index.html
index f7f4a50..d09dea0 100644
--- a/geode-site/website/content/docs/index.html
+++ b/geode-site/website/content/docs/index.html
@@ -31,7 +31,7 @@ under the License. -->
<div class="container">
<div class="row">
<div class="col-md-4">
- <h3><a href="http://geode.docs.pivotal.io/" style="color: #1275ff;">Apache Geode (incubating) User Documentation</a></h3>
+ <h3><a href="guide/about_geode.html" style="color: #1275ff;">Apache Geode (incubating) User Documentation</a></h3>
<p>Installation Instructions, User Manual, other product docs</p>
</div>
<div class="col-md-4">
@@ -45,4 +45,3 @@ under the License. -->
</div>
</div>
</section>
-
[26/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
index 71fb7e1..7a1fb1a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
@@ -1,26 +1,24 @@
/*
- * 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
+ * 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.admin;
import org.apache.geode.cache.server.ServerLoadProbe;
/**
- * Administrative interface that represents a CacheServer that
- * serves the contents of a system member's cache.
+ * Administrative interface that represents a CacheServer that serves the contents of a system
+ * member's cache.
*
* @see SystemMemberCache#addCacheServer
*
@@ -30,39 +28,33 @@ import org.apache.geode.cache.server.ServerLoadProbe;
@Deprecated
public interface SystemMemberBridgeServer {
- /**
- * Returns the port on which this bridge server listens for bridge
- * clients to connect.
+ /**
+ * Returns the port on which this bridge server listens for bridge clients to connect.
*/
public int getPort();
/**
- * Sets the port on which this bridge server listens for bridge
- * clients to connect.
+ * Sets the port on which this bridge server listens for bridge clients to connect.
*
- * @throws AdminException
- * If this bridge server is running
+ * @throws AdminException If this bridge server is running
*/
public void setPort(int port) throws AdminException;
/**
- * Starts this bridge server. Once the server is running, its
- * configuration cannot be changed.
+ * Starts this bridge server. Once the server is running, its configuration cannot be changed.
*
- * @throws AdminException
- * If an error occurs while starting the bridge server
+ * @throws AdminException If an error occurs while starting the bridge server
*/
public void start() throws AdminException;
- /**
+ /**
* Returns whether or not this bridge server is running
*/
public boolean isRunning();
/**
- * Stops this bridge server. Note that the
- * <code>BridgeServer</code> can be reconfigured and restarted if
- * desired.
+ * Stops this bridge server. Note that the <code>BridgeServer</code> can be reconfigured and
+ * restarted if desired.
*/
public void stop() throws AdminException;
@@ -72,80 +64,87 @@ public interface SystemMemberBridgeServer {
public void refresh();
/**
- * Returns a string representing the ip address or host name that this server
- * will listen on.
+ * Returns a string representing the ip address or host name that this server will listen on.
+ *
* @return the ip address or host name that this server is to listen on
* @since GemFire 5.7
*/
public String getBindAddress();
+
/**
- * Sets the ip address or host name that this server is to listen on for
- * client connections.
- * <p>Setting a specific bind address will cause the bridge server to always
- * use this address and ignore any address specified by "server-bind-address"
- * or "bind-address" in the <code>gemfire.properties</code> file
- * (see {@link org.apache.geode.distributed.DistributedSystem}
- * for a description of these properties).
- * <p> A <code>null</code> value will be treated the same as the default "".
- * <p> The default value does not override the gemfire.properties. If you wish to
- * override the properties and want to have your server bind to all local
- * addresses then use this string <code>"0.0.0.0"</code>.
+ * Sets the ip address or host name that this server is to listen on for client connections.
+ * <p>
+ * Setting a specific bind address will cause the bridge server to always use this address and
+ * ignore any address specified by "server-bind-address" or "bind-address" in the
+ * <code>gemfire.properties</code> file (see
+ * {@link org.apache.geode.distributed.DistributedSystem} for a description of these properties).
+ * <p>
+ * A <code>null</code> value will be treated the same as the default "".
+ * <p>
+ * The default value does not override the gemfire.properties. If you wish to override the
+ * properties and want to have your server bind to all local addresses then use this string
+ * <code>"0.0.0.0"</code>.
+ *
* @param address the ip address or host name that this server is to listen on
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
public void setBindAddress(String address) throws AdminException;
+
/**
- * Returns a string representing the ip address or host name that server locators
- * will tell clients that this server is listening on.
- * @return the ip address or host name to give to clients so they can connect
- * to this server
+ * Returns a string representing the ip address or host name that server locators will tell
+ * clients that this server is listening on.
+ *
+ * @return the ip address or host name to give to clients so they can connect to this server
* @since GemFire 5.7
*/
public String getHostnameForClients();
+
/**
- * Sets the ip address or host name that this server is to listen on for
- * client connections.
- * <p>Setting a specific hostname-for-clients will cause server locators
- * to use this value when telling clients how to connect to this server.
- * <p> The default value causes the bind-address to be given to clients
- * <p> A <code>null</code> value will be treated the same as the default "".
- * @param name the ip address or host name that will be given to clients
- * so they can connect to this server
+ * Sets the ip address or host name that this server is to listen on for client connections.
+ * <p>
+ * Setting a specific hostname-for-clients will cause server locators to use this value when
+ * telling clients how to connect to this server.
+ * <p>
+ * The default value causes the bind-address to be given to clients
+ * <p>
+ * A <code>null</code> value will be treated the same as the default "".
+ *
+ * @param name the ip address or host name that will be given to clients so they can connect to
+ * this server
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
public void setHostnameForClients(String name) throws AdminException;
+
/**
- * Sets whether or not this bridge server should notify clients based on
- * key subscription.
+ * Sets whether or not this bridge server should notify clients based on key subscription.
*
- * If false, then an update to any key on the server causes an update to
- * be sent to all clients. This update does not push the actual data to the
- * clients. Instead, it causes the client to locally invalidate or destroy
- * the corresponding entry. The next time the client requests the key, it
- * goes to the bridge server for the value.
+ * If false, then an update to any key on the server causes an update to be sent to all clients.
+ * This update does not push the actual data to the clients. Instead, it causes the client to
+ * locally invalidate or destroy the corresponding entry. The next time the client requests the
+ * key, it goes to the bridge server for the value.
*
- * If true, then an update to any key on the server causes an update to be
- * sent to only those clients who have registered interest in that key. Other
- * clients are not notified of the change. In addition, the actual value is
- * pushed to the client. The client does not need to request the new value
- * from the bridge server.
+ * If true, then an update to any key on the server causes an update to be sent to only those
+ * clients who have registered interest in that key. Other clients are not notified of the change.
+ * In addition, the actual value is pushed to the client. The client does not need to request the
+ * new value from the bridge server.
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
public void setNotifyBySubscription(boolean b) throws AdminException;
/**
- * Answers whether or not this bridge server should notify clients based on
- * key subscription.
+ * Answers whether or not this bridge server should notify clients based on key subscription.
+ *
* @since GemFire 5.7
*/
public boolean getNotifyBySubscription();
/**
- * Sets the buffer size in bytes of the socket connection for this
- * <code>BridgeServer</code>. The default is 32768 bytes.
+ * Sets the buffer size in bytes of the socket connection for this <code>BridgeServer</code>. The
+ * default is 32768 bytes.
*
* @param socketBufferSize The size in bytes of the socket buffer
* @throws AdminException if this bridge server is running
@@ -154,155 +153,155 @@ public interface SystemMemberBridgeServer {
public void setSocketBufferSize(int socketBufferSize) throws AdminException;
/**
- * Returns the configured buffer size of the socket connection for this
- * <code>BridgeServer</code>. The default is 32768 bytes.
- * @return the configured buffer size of the socket connection for this
- * <code>BridgeServer</code>
+ * Returns the configured buffer size of the socket connection for this <code>BridgeServer</code>.
+ * The default is 32768 bytes.
+ *
+ * @return the configured buffer size of the socket connection for this <code>BridgeServer</code>
* @since GemFire 5.7
*/
public int getSocketBufferSize();
/**
- * Sets the maximum amount of time between client pings. This value is
- * used by the <code>ClientHealthMonitor</code> to determine the health
- * of this <code>BridgeServer</code>'s clients. The default is 60000 ms.
+ * Sets the maximum amount of time between client pings. This value is used by the
+ * <code>ClientHealthMonitor</code> to determine the health of this <code>BridgeServer</code>'s
+ * clients. The default is 60000 ms.
*
- * @param maximumTimeBetweenPings The maximum amount of time between client
- * pings
+ * @param maximumTimeBetweenPings The maximum amount of time between client pings
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings) throws AdminException;
/**
- * Returns the maximum amount of time between client pings. This value is
- * used by the <code>ClientHealthMonitor</code> to determine the health
- * of this <code>BridgeServer</code>'s clients. The default is 60000 ms.
+ * Returns the maximum amount of time between client pings. This value is used by the
+ * <code>ClientHealthMonitor</code> to determine the health of this <code>BridgeServer</code>'s
+ * clients. The default is 60000 ms.
+ *
* @return the maximum amount of time between client pings.
* @since GemFire 5.7
*/
public int getMaximumTimeBetweenPings();
- /**
- * Returns the maximum allowed client connections
+ /**
+ * Returns the maximum allowed client connections
+ *
* @since GemFire 5.7
*/
public int getMaxConnections();
/**
- * Sets the maxium number of client connections allowed.
- * When the maximum is reached the server will stop accepting
- * connections.
+ * Sets the maxium number of client connections allowed. When the maximum is reached the server
+ * will stop accepting connections.
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
public void setMaxConnections(int maxCons) throws AdminException;
- /**
- * Returns the maxium number of threads allowed in this server to service
- * client requests.
- * The default of <code>0</code> causes the server to dedicate a thread for
- * every client connection.
+ /**
+ * Returns the maxium number of threads allowed in this server to service client requests. The
+ * default of <code>0</code> causes the server to dedicate a thread for every client connection.
+ *
* @since GemFire 5.7
*/
public int getMaxThreads();
/**
- * Sets the maxium number of threads allowed in this server to service
- * client requests.
- * The default of <code>0</code> causes the server to dedicate a thread for
- * every client connection.
+ * Sets the maxium number of threads allowed in this server to service client requests. The
+ * default of <code>0</code> causes the server to dedicate a thread for every client connection.
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
public void setMaxThreads(int maxThreads) throws AdminException;
/**
- * Returns the maximum number of messages that can be enqueued in a
- * client-queue.
+ * Returns the maximum number of messages that can be enqueued in a client-queue.
+ *
* @since GemFire 5.7
*/
public int getMaximumMessageCount();
/**
* Sets maximum number of messages that can be enqueued in a client-queue.
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
public void setMaximumMessageCount(int maxMessageCount) throws AdminException;
-
+
/**
- * Returns the time (in seconds ) after which a message in the client queue
- * will expire.
+ * Returns the time (in seconds ) after which a message in the client queue will expire.
+ *
* @since GemFire 5.7
*/
public int getMessageTimeToLive();
/**
- * Sets the time (in seconds ) after which a message in the client queue
- * will expire.
+ * Sets the time (in seconds ) after which a message in the client queue will expire.
+ *
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
public void setMessageTimeToLive(int messageTimeToLive) throws AdminException;
+
/**
- * Sets the list of server groups this bridge server will belong to.
- * By default bridge servers belong to the default global server group
- * which all bridge servers always belong to.
- * @param groups possibly empty array of <code>String</code> where each string
- * is a server groups that this bridge server will be a member of.
+ * Sets the list of server groups this bridge server will belong to. By default bridge servers
+ * belong to the default global server group which all bridge servers always belong to.
+ *
+ * @param groups possibly empty array of <code>String</code> where each string is a server groups
+ * that this bridge server will be a member of.
* @throws AdminException if this bridge server is running
* @since GemFire 5.7
*/
public void setGroups(String[] groups) throws AdminException;
+
/**
* Returns the list of server groups that this bridge server belongs to.
- * @return a possibly empty array of <code>String</code>s where
- * each string is a server group. Modifying this array will not change the
- * server groups that this bridge server belongs to.
+ *
+ * @return a possibly empty array of <code>String</code>s where each string is a server group.
+ * Modifying this array will not change the server groups that this bridge server belongs
+ * to.
* @since GemFire 5.7
*/
public String[] getGroups();
-
+
/**
- * Get a description of the load probe for this bridge server.
- * {@link ServerLoadProbe} for details on the load probe.
- * @return the load probe used by this bridge
- * server.
+ * Get a description of the load probe for this bridge server. {@link ServerLoadProbe} for details
+ * on the load probe.
+ *
+ * @return the load probe used by this bridge server.
* @since GemFire 5.7
*/
public String getLoadProbe();
/**
- * Set the load probe for this bridge server. See
- * {@link ServerLoadProbe} for details on how to implement
- * a load probe.
+ * Set the load probe for this bridge server. See {@link ServerLoadProbe} for details on how to
+ * implement a load probe.
*
- * The load probe should implement DataSerializable if
- * it is used with this interface, because it will be sent to the remote
- * VM.
- * @param loadProbe the load probe to use for
- * this bridge server.
- * @throws AdminException if the bridge server is running
+ * The load probe should implement DataSerializable if it is used with this interface, because it
+ * will be sent to the remote VM.
+ *
+ * @param loadProbe the load probe to use for this bridge server.
+ * @throws AdminException if the bridge server is running
* @since GemFire 5.7
*/
public void setLoadProbe(ServerLoadProbe loadProbe) throws AdminException;
/**
- * Get the frequency in milliseconds to poll the load probe on this bridge
- * server.
+ * Get the frequency in milliseconds to poll the load probe on this bridge server.
*
* @return the frequency in milliseconds that we will poll the load probe.
*/
public long getLoadPollInterval();
/**
- * Set the frequency in milliseconds to poll the load probe on this bridge
- * server
- * @param loadPollInterval the frequency in milliseconds to poll
- * the load probe. Must be greater than 0.
+ * Set the frequency in milliseconds to poll the load probe on this bridge server
+ *
+ * @param loadPollInterval the frequency in milliseconds to poll the load probe. Must be greater
+ * than 0.
* @throws AdminException if the bridge server is running
*/
public void setLoadPollInterval(long loadPollInterval) throws AdminException;
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
index 2c194ca..8517fd0 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCache.java
@@ -1,29 +1,29 @@
/*
- * 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
+ * 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.admin;
import org.apache.geode.cache.RegionAttributes;
/**
- * Administrative interface that represent's the {@link SystemMember}'s view
- * of its {@link org.apache.geode.cache.Cache}.
+ * Administrative interface that represent's the {@link SystemMember}'s view of its
+ * {@link org.apache.geode.cache.Cache}.
*
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @since GemFire 3.5
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface SystemMemberCache {
// attributes
@@ -31,73 +31,68 @@ public interface SystemMemberCache {
* The name of the cache.
*/
public String getName();
+
/**
* Value that uniquely identifies an instance of a cache for a given member.
*/
public int getId();
+
/**
* Indicates if this cache has been closed.
+ *
* @return true, if this cache is closed; false, otherwise
*/
public boolean isClosed();
+
/**
- * Gets the number of seconds a cache operation will wait to obtain
- * a distributed lock lease.
+ * Gets the number of seconds a cache operation will wait to obtain a distributed lock lease.
*/
public int getLockTimeout();
+
/**
- * Sets the number of seconds a cache operation may wait to obtain a
- * distributed lock lease before timing out.
+ * Sets the number of seconds a cache operation may wait to obtain a distributed lock lease before
+ * timing out.
*
- * @throws AdminException
- * If a problem is encountered while setting the lock
- * timeout
+ * @throws AdminException If a problem is encountered while setting the lock timeout
*
* @see org.apache.geode.cache.Cache#setLockTimeout
*/
public void setLockTimeout(int seconds) throws AdminException;
-
+
/**
- * Gets the length, in seconds, of distributed lock leases obtained
- * by this cache.
+ * Gets the length, in seconds, of distributed lock leases obtained by this cache.
*/
public int getLockLease();
+
/**
- * Sets the length, in seconds, of distributed lock leases obtained
- * by this cache.
+ * Sets the length, in seconds, of distributed lock leases obtained by this cache.
*
- * @throws AdminException
- * If a problem is encountered while setting the lock
- * lease
+ * @throws AdminException If a problem is encountered while setting the lock lease
*
* @see org.apache.geode.cache.Cache#setLockLease
*/
public void setLockLease(int seconds) throws AdminException;
-
+
/**
- * Gets the number of seconds a cache
- * {@link org.apache.geode.cache.Region#get(Object) get} operation
- * can spend searching for a value before it times out.
- * The search includes any time spent loading the object.
- * When the search times out it causes the get to fail by throwing
- * an exception.
+ * Gets the number of seconds a cache {@link org.apache.geode.cache.Region#get(Object) get}
+ * operation can spend searching for a value before it times out. The search includes any time
+ * spent loading the object. When the search times out it causes the get to fail by throwing an
+ * exception.
*/
public int getSearchTimeout();
+
/**
- * Sets the number of seconds a cache get operation can spend searching
- * for a value.
+ * Sets the number of seconds a cache get operation can spend searching for a value.
*
- * @throws AdminException
- * If a problem is encountered while setting the search
- * timeout
+ * @throws AdminException If a problem is encountered while setting the search timeout
*
* @see org.apache.geode.cache.Cache#setSearchTimeout
*/
public void setSearchTimeout(int seconds) throws AdminException;
+
/**
- * Returns number of seconds since this member's cache has been created.
- * Returns <code>-1</code> if this member does not have a cache or its cache
- * has been closed.
+ * Returns number of seconds since this member's cache has been created. Returns <code>-1</code>
+ * if this member does not have a cache or its cache has been closed.
*/
public int getUpTime();
@@ -114,10 +109,9 @@ public interface SystemMemberCache {
public Statistic[] getStatistics();
/**
- * Return the existing region (or subregion) with the specified
- * path that already exists in the cache.
- * Whether or not the path starts with a forward slash it is interpreted as a
- * full path starting at a root.
+ * Return the existing region (or subregion) with the specified path that already exists in the
+ * cache. Whether or not the path starts with a forward slash it is interpreted as a full path
+ * starting at a root.
*
* @param path the path to the region
* @return the Region or null if not found
@@ -128,74 +122,59 @@ public interface SystemMemberCache {
/**
* Creates a VM root <code>Region</code> in this cache.
*
- * @param name
- * The name of the region to create
- * @param attrs
- * The attributes of the root region
+ * @param name The name of the region to create
+ * @param attrs The attributes of the root region
*
- * @throws AdminException
- * If the region cannot be created
+ * @throws AdminException If the region cannot be created
*
* @since GemFire 4.0
* @deprecated as of GemFire 5.0, use {@link #createRegion} instead
*/
@Deprecated
- public SystemMemberRegion createVMRegion(String name,
- RegionAttributes attrs)
- throws AdminException;
+ public SystemMemberRegion createVMRegion(String name, RegionAttributes attrs)
+ throws AdminException;
/**
* Creates a root <code>Region</code> in this cache.
*
- * @param name
- * The name of the region to create
- * @param attrs
- * The attributes of the root region
+ * @param name The name of the region to create
+ * @param attrs The attributes of the root region
*
- * @throws AdminException
- * If the region cannot be created
+ * @throws AdminException If the region cannot be created
*
* @since GemFire 5.0
*/
- public SystemMemberRegion createRegion(String name,
- RegionAttributes attrs)
- throws AdminException;
+ public SystemMemberRegion createRegion(String name, RegionAttributes attrs) throws AdminException;
/**
- * Updates the state of this cache instance. Note that once a cache
- * instance is closed refresh will never change the state of that instance.
+ * Updates the state of this cache instance. Note that once a cache instance is closed refresh
+ * will never change the state of that instance.
*/
public void refresh();
/**
- * Adds a new, unstarted cache server that will serve the contents
- * of this cache to clients.
+ * Adds a new, unstarted cache server that will serve the contents of this cache to clients.
*
* @see org.apache.geode.cache.Cache#addCacheServer
*
* @since GemFire 5.7
*/
- public SystemMemberCacheServer addCacheServer()
- throws AdminException;
+ public SystemMemberCacheServer addCacheServer() throws AdminException;
/**
- * Returns the cache servers that run in this member's VM. Note
- * that this list will not be updated until {@link #refresh} is
- * called.
+ * Returns the cache servers that run in this member's VM. Note that this list will not be updated
+ * until {@link #refresh} is called.
*
* @see org.apache.geode.cache.Cache#getCacheServers
*
* @since GemFire 5.7
*/
- public SystemMemberCacheServer[] getCacheServers()
- throws AdminException;
+ public SystemMemberCacheServer[] getCacheServers() throws AdminException;
/**
- * Returns whether or not this cache acts as a server. This method
- * will always return <code>true</code> for the
- * <code>SystemMemberCache</code> obtained from a {@link
- * CacheServer}. Note that this value will not be updated until
- * {@link #refresh} is invoked.
+ * Returns whether or not this cache acts as a server. This method will always return
+ * <code>true</code> for the <code>SystemMemberCache</code> obtained from a {@link CacheServer}.
+ * Note that this value will not be updated until {@link #refresh} is invoked.
*
* @since GemFire 4.0
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java
index dee9bc1..d26ee40 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheEvent.java
@@ -1,29 +1,29 @@
/*
- * 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
+ * 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.admin;
import org.apache.geode.cache.Operation;
+
/**
- * An event that describes an operation on a cache.
- * Instances of this are delivered to a {@link SystemMemberCacheListener} when a
- * a cache is created or closed.
+ * An event that describes an operation on a cache. Instances of this are delivered to a
+ * {@link SystemMemberCacheListener} when a a cache is created or closed.
*
* @since GemFire 5.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface SystemMemberCacheEvent extends SystemMembershipEvent {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
index 0d258b6..4008bdf 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheListener.java
@@ -1,37 +1,38 @@
/*
- * 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
+ * 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.admin;
import org.apache.geode.cache.*;
/**
- * A listener whose callback methods can be used to track the lifecycle of
- * {@link Cache caches} and {@link Region regions} in the GemFire distributed system.
+ * A listener whose callback methods can be used to track the lifecycle of {@link Cache caches} and
+ * {@link Region regions} in the GemFire distributed system.
*
* @see AdminDistributedSystem#addCacheListener
* @see AdminDistributedSystem#removeCacheListener
*
* @since GemFire 5.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface SystemMemberCacheListener {
/**
* Invoked after a region is created in any node of distributed system.
+ *
* @param event describes the region that was created.
* @see CacheFactory#create
* @see Cache#createRegion
@@ -41,11 +42,12 @@ public interface SystemMemberCacheListener {
/**
* Invoked when a region is destroyed or closed in any node of distributed system.
- * @param event describes the region that was lost. The operation on this event
- * can be used to determine the actual operation that caused the loss. Note that
- * {@link Cache#close()} invokes this callback with <code>Operation.CACHE_CLOSE</code>
- * for each region in the closed cache and it invokes {@link #afterCacheClose}.
-
+ *
+ * @param event describes the region that was lost. The operation on this event can be used to
+ * determine the actual operation that caused the loss. Note that {@link Cache#close()}
+ * invokes this callback with <code>Operation.CACHE_CLOSE</code> for each region in the
+ * closed cache and it invokes {@link #afterCacheClose}.
+ *
* @see Cache#close()
* @see Region#close
* @see Region#localDestroyRegion()
@@ -54,17 +56,19 @@ public interface SystemMemberCacheListener {
public void afterRegionLoss(SystemMemberRegionEvent event);
/**
- * Invoked after a cache is created in any node of a distributed system.
- * Note that this callback will be done before any regions are created in the
- * cache.
+ * Invoked after a cache is created in any node of a distributed system. Note that this callback
+ * will be done before any regions are created in the cache.
+ *
* @param event describes the member that created the cache.
* @see CacheFactory#create
*/
public void afterCacheCreate(SystemMemberCacheEvent event);
+
/**
- * Invoked after a cache is closed in any node of a distributed system.
- * This callback is done after those done for each region in the cache.
- * This callback is not done if the distributed member that has a cache crashes.
+ * Invoked after a cache is closed in any node of a distributed system. This callback is done
+ * after those done for each region in the cache. This callback is not done if the distributed
+ * member that has a cache crashes.
+ *
* @param event describes the member that closed its cache.
* @see Cache#close()
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
index daf2199..edfa356 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberCacheServer.java
@@ -1,68 +1,61 @@
/*
- * 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
+ * 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.admin;
import org.apache.geode.cache.server.ServerLoadProbe;
/**
- * Administrative interface that represents a {@link
- * org.apache.geode.cache.server.CacheServer CacheServer} that
- * serves the contents of a system member's cache to clients.
+ * Administrative interface that represents a {@link org.apache.geode.cache.server.CacheServer
+ * CacheServer} that serves the contents of a system member's cache to clients.
*
* @see SystemMemberCache#addCacheServer
*
* @since GemFire 5.7
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface SystemMemberCacheServer {
- /**
- * Returns the port on which this cache server listens for
- * clients to connect.
+ /**
+ * Returns the port on which this cache server listens for clients to connect.
*/
public int getPort();
/**
- * Sets the port on which this cache server listens for
- * clients to connect.
+ * Sets the port on which this cache server listens for clients to connect.
*
- * @throws AdminException
- * If this cache server is running
+ * @throws AdminException If this cache server is running
*/
public void setPort(int port) throws AdminException;
/**
- * Starts this cache server. Once the server is running, its
- * configuration cannot be changed.
+ * Starts this cache server. Once the server is running, its configuration cannot be changed.
*
- * @throws AdminException
- * If an error occurs while starting the cache server
+ * @throws AdminException If an error occurs while starting the cache server
*/
public void start() throws AdminException;
- /**
+ /**
* Returns whether or not this cache server is running
*/
public boolean isRunning();
/**
- * Stops this cache server. Note that the
- * <code>CacheServer</code> can be reconfigured and restarted if
- * desired.
+ * Stops this cache server. Note that the <code>CacheServer</code> can be reconfigured and
+ * restarted if desired.
*/
public void stop() throws AdminException;
@@ -72,80 +65,87 @@ public interface SystemMemberCacheServer {
public void refresh();
/**
- * Returns a string representing the ip address or host name that this server
- * will listen on.
+ * Returns a string representing the ip address or host name that this server will listen on.
+ *
* @return the ip address or host name that this server is to listen on
* @since GemFire 5.7
*/
public String getBindAddress();
+
/**
- * Sets the ip address or host name that this server is to listen on for
- * client connections.
- * <p>Setting a specific bind address will cause the cache server to always
- * use this address and ignore any address specified by "server-bind-address"
- * or "bind-address" in the <code>gemfire.properties</code> file
- * (see {@link org.apache.geode.distributed.DistributedSystem}
- * for a description of these properties).
- * <p> A <code>null</code> value will be treated the same as the default "".
- * <p> The default value does not override the gemfire.properties. If you wish to
- * override the properties and want to have your server bind to all local
- * addresses then use this string <code>"0.0.0.0"</code>.
+ * Sets the ip address or host name that this server is to listen on for client connections.
+ * <p>
+ * Setting a specific bind address will cause the cache server to always use this address and
+ * ignore any address specified by "server-bind-address" or "bind-address" in the
+ * <code>gemfire.properties</code> file (see
+ * {@link org.apache.geode.distributed.DistributedSystem} for a description of these properties).
+ * <p>
+ * A <code>null</code> value will be treated the same as the default "".
+ * <p>
+ * The default value does not override the gemfire.properties. If you wish to override the
+ * properties and want to have your server bind to all local addresses then use this string
+ * <code>"0.0.0.0"</code>.
+ *
* @param address the ip address or host name that this server is to listen on
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
public void setBindAddress(String address) throws AdminException;
+
/**
- * Returns a string representing the ip address or host name that server locators
- * will tell clients that this server is listening on.
- * @return the ip address or host name to give to clients so they can connect
- * to this server
+ * Returns a string representing the ip address or host name that server locators will tell
+ * clients that this server is listening on.
+ *
+ * @return the ip address or host name to give to clients so they can connect to this server
* @since GemFire 5.7
*/
public String getHostnameForClients();
+
/**
- * Sets the ip address or host name that this server is to listen on for
- * client connections.
- * <p>Setting a specific hostname-for-clients will cause server locators
- * to use this value when telling clients how to connect to this server.
- * <p> The default value causes the bind-address to be given to clients
- * <p> A <code>null</code> value will be treated the same as the default "".
- * @param name the ip address or host name that will be given to clients
- * so they can connect to this server
+ * Sets the ip address or host name that this server is to listen on for client connections.
+ * <p>
+ * Setting a specific hostname-for-clients will cause server locators to use this value when
+ * telling clients how to connect to this server.
+ * <p>
+ * The default value causes the bind-address to be given to clients
+ * <p>
+ * A <code>null</code> value will be treated the same as the default "".
+ *
+ * @param name the ip address or host name that will be given to clients so they can connect to
+ * this server
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
public void setHostnameForClients(String name) throws AdminException;
+
/**
- * Sets whether or not this cache server should notify clients based on
- * key subscription.
+ * Sets whether or not this cache server should notify clients based on key subscription.
*
- * If false, then an update to any key on the server causes an update to
- * be sent to all clients. This update does not push the actual data to the
- * clients. Instead, it causes the client to locally invalidate or destroy
- * the corresponding entry. The next time the client requests the key, it
- * goes to the cache server for the value.
+ * If false, then an update to any key on the server causes an update to be sent to all clients.
+ * This update does not push the actual data to the clients. Instead, it causes the client to
+ * locally invalidate or destroy the corresponding entry. The next time the client requests the
+ * key, it goes to the cache server for the value.
*
- * If true, then an update to any key on the server causes an update to be
- * sent to only those clients who have registered interest in that key. Other
- * clients are not notified of the change. In addition, the actual value is
- * pushed to the client. The client does not need to request the new value
- * from the cache server.
+ * If true, then an update to any key on the server causes an update to be sent to only those
+ * clients who have registered interest in that key. Other clients are not notified of the change.
+ * In addition, the actual value is pushed to the client. The client does not need to request the
+ * new value from the cache server.
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
public void setNotifyBySubscription(boolean b) throws AdminException;
/**
- * Answers whether or not this cache server should notify clients based on
- * key subscription.
+ * Answers whether or not this cache server should notify clients based on key subscription.
+ *
* @since GemFire 5.7
*/
public boolean getNotifyBySubscription();
/**
- * Sets the buffer size in bytes of the socket connection for this
- * <code>CacheServer</code>. The default is 32768 bytes.
+ * Sets the buffer size in bytes of the socket connection for this <code>CacheServer</code>. The
+ * default is 32768 bytes.
*
* @param socketBufferSize The size in bytes of the socket buffer
* @throws AdminException if this cache server is running
@@ -154,155 +154,155 @@ public interface SystemMemberCacheServer {
public void setSocketBufferSize(int socketBufferSize) throws AdminException;
/**
- * Returns the configured buffer size of the socket connection for this
- * <code>CacheServer</code>. The default is 32768 bytes.
- * @return the configured buffer size of the socket connection for this
- * <code>CacheServer</code>
+ * Returns the configured buffer size of the socket connection for this <code>CacheServer</code>.
+ * The default is 32768 bytes.
+ *
+ * @return the configured buffer size of the socket connection for this <code>CacheServer</code>
* @since GemFire 5.7
*/
public int getSocketBufferSize();
/**
- * Sets the maximum amount of time between client pings. This value is
- * used by the <code>ClientHealthMonitor</code> to determine the health
- * of this <code>CacheServer</code>'s clients. The default is 60000 ms.
+ * Sets the maximum amount of time between client pings. This value is used by the
+ * <code>ClientHealthMonitor</code> to determine the health of this <code>CacheServer</code>'s
+ * clients. The default is 60000 ms.
*
- * @param maximumTimeBetweenPings The maximum amount of time between client
- * pings
+ * @param maximumTimeBetweenPings The maximum amount of time between client pings
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
public void setMaximumTimeBetweenPings(int maximumTimeBetweenPings) throws AdminException;
/**
- * Returns the maximum amount of time between client pings. This value is
- * used by the <code>ClientHealthMonitor</code> to determine the health
- * of this <code>CacheServer</code>'s clients. The default is 60000 ms.
+ * Returns the maximum amount of time between client pings. This value is used by the
+ * <code>ClientHealthMonitor</code> to determine the health of this <code>CacheServer</code>'s
+ * clients. The default is 60000 ms.
+ *
* @return the maximum amount of time between client pings.
* @since GemFire 5.7
*/
public int getMaximumTimeBetweenPings();
- /**
- * Returns the maximum allowed client connections
+ /**
+ * Returns the maximum allowed client connections
+ *
* @since GemFire 5.7
*/
public int getMaxConnections();
/**
- * Sets the maxium number of client connections allowed.
- * When the maximum is reached the server will stop accepting
- * connections.
+ * Sets the maxium number of client connections allowed. When the maximum is reached the server
+ * will stop accepting connections.
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
public void setMaxConnections(int maxCons) throws AdminException;
- /**
- * Returns the maxium number of threads allowed in this server to service
- * client requests.
- * The default of <code>0</code> causes the server to dedicate a thread for
- * every client connection.
+ /**
+ * Returns the maxium number of threads allowed in this server to service client requests. The
+ * default of <code>0</code> causes the server to dedicate a thread for every client connection.
+ *
* @since GemFire 5.7
*/
public int getMaxThreads();
/**
- * Sets the maxium number of threads allowed in this server to service
- * client requests.
- * The default of <code>0</code> causes the server to dedicate a thread for
- * every client connection.
+ * Sets the maxium number of threads allowed in this server to service client requests. The
+ * default of <code>0</code> causes the server to dedicate a thread for every client connection.
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
public void setMaxThreads(int maxThreads) throws AdminException;
/**
- * Returns the maximum number of messages that can be enqueued in a
- * client-queue.
+ * Returns the maximum number of messages that can be enqueued in a client-queue.
+ *
* @since GemFire 5.7
*/
public int getMaximumMessageCount();
/**
* Sets maximum number of messages that can be enqueued in a client-queue.
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
public void setMaximumMessageCount(int maxMessageCount) throws AdminException;
-
+
/**
- * Returns the time (in seconds ) after which a message in the client queue
- * will expire.
+ * Returns the time (in seconds ) after which a message in the client queue will expire.
+ *
* @since GemFire 5.7
*/
public int getMessageTimeToLive();
/**
- * Sets the time (in seconds ) after which a message in the client queue
- * will expire.
+ * Sets the time (in seconds ) after which a message in the client queue will expire.
+ *
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
public void setMessageTimeToLive(int messageTimeToLive) throws AdminException;
+
/**
- * Sets the list of server groups this cache server will belong to.
- * By default cache servers belong to the default global server group
- * which all cache servers always belong to.
- * @param groups possibly empty array of <code>String</code> where each string
- * is a server groups that this cache server will be a member of.
+ * Sets the list of server groups this cache server will belong to. By default cache servers
+ * belong to the default global server group which all cache servers always belong to.
+ *
+ * @param groups possibly empty array of <code>String</code> where each string is a server groups
+ * that this cache server will be a member of.
* @throws AdminException if this cache server is running
* @since GemFire 5.7
*/
public void setGroups(String[] groups) throws AdminException;
+
/**
* Returns the list of server groups that this cache server belongs to.
- * @return a possibly empty array of <code>String</code>s where
- * each string is a server group. Modifying this array will not change the
- * server groups that this cache server belongs to.
+ *
+ * @return a possibly empty array of <code>String</code>s where each string is a server group.
+ * Modifying this array will not change the server groups that this cache server belongs
+ * to.
* @since GemFire 5.7
*/
public String[] getGroups();
-
+
/**
- * Get a description of the load probe for this cache server.
- * {@link ServerLoadProbe} for details on the load probe.
- * @return the load probe used by this cache
- * server.
+ * Get a description of the load probe for this cache server. {@link ServerLoadProbe} for details
+ * on the load probe.
+ *
+ * @return the load probe used by this cache server.
* @since GemFire 5.7
*/
public String getLoadProbe();
/**
- * Set the load probe for this cache server. See
- * {@link ServerLoadProbe} for details on how to implement
- * a load probe.
+ * Set the load probe for this cache server. See {@link ServerLoadProbe} for details on how to
+ * implement a load probe.
*
- * The load probe should implement DataSerializable if
- * it is used with this interface, because it will be sent to the remote
- * VM.
- * @param loadProbe the load probe to use for
- * this cache server.
- * @throws AdminException if the cache server is running
+ * The load probe should implement DataSerializable if it is used with this interface, because it
+ * will be sent to the remote VM.
+ *
+ * @param loadProbe the load probe to use for this cache server.
+ * @throws AdminException if the cache server is running
* @since GemFire 5.7
*/
public void setLoadProbe(ServerLoadProbe loadProbe) throws AdminException;
/**
- * Get the frequency in milliseconds to poll the load probe on this cache
- * server.
+ * Get the frequency in milliseconds to poll the load probe on this cache server.
*
* @return the frequency in milliseconds that we will poll the load probe.
*/
public long getLoadPollInterval();
/**
- * Set the frequency in milliseconds to poll the load probe on this cache
- * server
- * @param loadPollInterval the frequency in milliseconds to poll
- * the load probe. Must be greater than 0.
+ * Set the frequency in milliseconds to poll the load probe on this cache server
+ *
+ * @param loadPollInterval the frequency in milliseconds to poll the load probe. Must be greater
+ * than 0.
* @throws AdminException if the cache server is running
*/
public void setLoadPollInterval(long loadPollInterval) throws AdminException;
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
index 22acdcc..d26ce39 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegion.java
@@ -1,18 +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
+ * 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.admin;
@@ -20,15 +18,15 @@ import org.apache.geode.cache.*;
import java.io.File;
/**
- * Administrative interface that represent's the {@link
- * SystemMember}'s view of one of its cache's {@link
- * org.apache.geode.cache.Region}s. If the region in the remote
- * system member is closed or destroyed, the methods of
- * <code>SystemMemberRegion</code> will throw {@link
- * RegionNotFoundException}.
+ * Administrative interface that represent's the {@link SystemMember}'s view of one of its cache's
+ * {@link org.apache.geode.cache.Region}s. If the region in the remote system member is closed or
+ * destroyed, the methods of <code>SystemMemberRegion</code> will throw
+ * {@link RegionNotFoundException}.
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface SystemMemberRegion {
// attributes
@@ -38,10 +36,9 @@ public interface SystemMemberRegion {
* @see org.apache.geode.cache.Region#getName
*/
public String getName();
-
+
/**
- * Returns the full path name that identifies this region in its
- * cache.
+ * Returns the full path name that identifies this region in its cache.
*
* @see org.apache.geode.cache.Region#getFullPath
*/
@@ -53,16 +50,14 @@ public interface SystemMemberRegion {
public java.util.Set getSubregionNames();
/**
- * Returns the full path of each of the subregions of this region.
- * These paths are suitable for use with {@link
- * SystemMemberCache#getRegion}.
+ * Returns the full path of each of the subregions of this region. These paths are suitable for
+ * use with {@link SystemMemberCache#getRegion}.
*/
public java.util.Set getSubregionFullPaths();
/**
- * Returns a description of any user attribute associated with this
- * region. The description includes the classname of the user
- * attribute object as well as its <code>toString</code>
+ * Returns a description of any user attribute associated with this region. The description
+ * includes the classname of the user attribute object as well as its <code>toString</code>
* representation.
*/
public String getUserAttribute();
@@ -71,22 +66,22 @@ public interface SystemMemberRegion {
* Returns a description of any CacheLoader associated with this region.
*/
public String getCacheLoader();
+
/**
* Returns a description of any CacheWriter associated with this region.
*/
public String getCacheWriter();
/**
- * Returns the <code>EvictionAttributes</code> that configure how
- * entries in the the region are evicted
+ * Returns the <code>EvictionAttributes</code> that configure how entries in the the region are
+ * evicted
*/
public EvictionAttributes getEvictionAttributes();
/**
- * Returns a description of the CacheListener in this region's attributes. If
- * there is more than 1 CacheListener defined for a region this method will
- * return the description of the 1st CacheListener returned from
- * {@link #getCacheListeners}
+ * Returns a description of the CacheListener in this region's attributes. If there is more than 1
+ * CacheListener defined for a region this method will return the description of the 1st
+ * CacheListener returned from {@link #getCacheListeners}
*
* @deprecated as of 6.0 use getCacheListeners() instead
*/
@@ -94,10 +89,9 @@ public interface SystemMemberRegion {
public String getCacheListener();
/**
- * This method will return an empty array if there are no CacheListeners
- * defined on the region. If there are one or more than 1 CacheListeners
- * defined, this method will return an array which has the names of all the
- * CacheListeners
+ * This method will return an empty array if there are no CacheListeners defined on the region. If
+ * there are one or more than 1 CacheListeners defined, this method will return an array which has
+ * the names of all the CacheListeners
*
* @return String[] the region's <code>CacheListeners</code> as a String array
* @since GemFire 6.0
@@ -136,10 +130,11 @@ public interface SystemMemberRegion {
/**
* string describing the CustomExpiry for entry-time-to-live
+ *
* @return the CustomExpiry for entry-time-to-live
*/
public String getCustomEntryTimeToLive();
-
+
/**
* Returns the RegionIdleTimeout time limit in this region's attributes.
*/
@@ -159,29 +154,30 @@ public interface SystemMemberRegion {
* Returns the EntryIdleTimeout action in this region's attributes.
*/
public ExpirationAction getEntryIdleTimeoutAction();
-
+
/**
* string describing the CustomExpiry for entry-idle-timeout
+ *
* @return the CustomExpiry for entry-idle-timeout
*/
public String getCustomEntryIdleTimeout();
-
+
/**
* Returns the MirrorType in this region's attributes.
+ *
* @deprecated as of 5.0, you should use getDataPolicy instead
*/
@Deprecated
public MirrorType getMirrorType();
-
+
/**
* Returns the DataPolicy in this region's attributes.
*/
public DataPolicy getDataPolicy();
-
- /**
-
+
/**
- * Returns the Scope in this region's attributes.
+ *
+ * /** Returns the Scope in this region's attributes.
*/
public Scope getScope();
@@ -201,8 +197,7 @@ public interface SystemMemberRegion {
public int getConcurrencyLevel();
/**
- * Returns whether or not conflicting concurrent operations on this region
- * are prevented
+ * Returns whether or not conflicting concurrent operations on this region are prevented
*/
public boolean getConcurrencyChecksEnabled();
@@ -212,21 +207,19 @@ public interface SystemMemberRegion {
public boolean getStatisticsEnabled();
/**
- * Returns whether or not a persistent backup should be made of the
- * region (as opposed to just writing the overflow data to disk).
+ * Returns whether or not a persistent backup should be made of the region (as opposed to just
+ * writing the overflow data to disk).
*/
public boolean getPersistBackup();
/**
- * Returns the <code>DiskWriteAttributes</code> that configure how
- * the region is written to disk.
+ * Returns the <code>DiskWriteAttributes</code> that configure how the region is written to disk.
*/
public DiskWriteAttributes getDiskWriteAttributes();
/**
- * Returns the directories to which the region's data are written. If
- * multiple directories are used, GemFire will attempt to distribute the
- * data evenly amongst them.
+ * Returns the directories to which the region's data are written. If multiple directories are
+ * used, GemFire will attempt to distribute the data evenly amongst them.
*/
public File[] getDiskDirs();
@@ -234,7 +227,7 @@ public interface SystemMemberRegion {
* Returns the number of entries currently in this region.
*/
public int getEntryCount();
-
+
/**
* Returns the number of subregions currently in this region.
*/
@@ -267,8 +260,9 @@ public interface SystemMemberRegion {
/**
* Returns whether or not acks are sent after an update is processed.
- * @return False if acks are sent after updates are processed;
- * true if acks are sent before updates are processed.
+ *
+ * @return False if acks are sent after updates are processed; true if acks are sent before
+ * updates are processed.
*
* @since GemFire 4.1
*/
@@ -276,43 +270,42 @@ public interface SystemMemberRegion {
// operations
/**
- * Updates the state of this region instance. Note that once a cache
- * instance is closed refresh will never change the state of its regions.
+ * Updates the state of this region instance. Note that once a cache instance is closed refresh
+ * will never change the state of its regions.
*/
public void refresh();
/**
* Creates a subregion of this region.
*
- * @param name
- * The name of the region to create
- * @param attrs
- * The attributes of the root region
+ * @param name The name of the region to create
+ * @param attrs The attributes of the root region
*
- * @throws AdminException
- * If the region cannot be created
+ * @throws AdminException If the region cannot be created
*
* @since GemFire 4.0
*/
- public SystemMemberRegion createSubregion(String name,
- RegionAttributes attrs)
- throws AdminException;
+ public SystemMemberRegion createSubregion(String name, RegionAttributes attrs)
+ throws AdminException;
/**
- * Returns the <code>MembershipAttributes</code> that configure required
- * roles for reliable access to the region.
+ * Returns the <code>MembershipAttributes</code> that configure required roles for reliable access
+ * to the region.
+ *
* @deprecated this API is scheduled to be removed
*/
public MembershipAttributes getMembershipAttributes();
-
+
/**
* Returns the <code>SubscriptionAttributes</code> for the region.
+ *
* @since GemFire 5.0
*/
public SubscriptionAttributes getSubscriptionAttributes();
-
+
/**
* Returns the <code>PartitionAttributes</code> for the region.
+ *
* @since GemFire 5.7
*/
public PartitionAttributes getPartitionAttributes();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java
index 2dd1ffd..27ee8ae 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberRegionEvent.java
@@ -1,28 +1,27 @@
/*
- * 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
+ * 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.admin;
/**
- * An event that describes an operation on a region.
- * Instances of this are delivered to a {@link SystemMemberCacheListener} when a
- * a region comes or goes.
+ * An event that describes an operation on a region. Instances of this are delivered to a
+ * {@link SystemMemberCacheListener} when a a region comes or goes.
*
* @since GemFire 5.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface SystemMemberRegionEvent extends SystemMemberCacheEvent {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMemberType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberType.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberType.java
index 7ba99fb..c95d32e 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberType.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberType.java
@@ -1,46 +1,45 @@
/*
- * 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
+ * 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.admin;
-//import java.io.*;
+// import java.io.*;
/**
* Type-safe definition for system members.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class SystemMemberType implements java.io.Serializable {
private static final long serialVersionUID = 3284366994485749302L;
-
+
/** GemFire shared-memory manager connected to the distributed system */
- public static final SystemMemberType MANAGER =
- new SystemMemberType("GemFireManager");
+ public static final SystemMemberType MANAGER = new SystemMemberType("GemFireManager");
/** Application connected to the distributed system */
- public static final SystemMemberType APPLICATION =
- new SystemMemberType("Application");
+ public static final SystemMemberType APPLICATION = new SystemMemberType("Application");
/** GemFire Cache VM connected to the distributed system */
- public static final SystemMemberType CACHE_VM =
- new SystemMemberType("CacheVm");
+ public static final SystemMemberType CACHE_VM = new SystemMemberType("CacheVm");
- /** GemFire Cache Server connected to the distributed system
+ /**
+ * GemFire Cache Server connected to the distributed system
+ *
* @deprecated as of 5.7 use {@link #CACHE_VM} instead.
*/
@Deprecated
@@ -49,25 +48,24 @@ public class SystemMemberType implements java.io.Serializable {
/** The display-friendly name of this system member type. */
private final transient String name;
-
+
// The 4 declarations below are necessary for serialization
/** int used as ordinal to represent this Scope */
public final int ordinal = nextOrdinal++;
private static int nextOrdinal = 0;
-
- private static final SystemMemberType[] VALUES =
- { MANAGER, APPLICATION, CACHE_VM };
+
+ private static final SystemMemberType[] VALUES = {MANAGER, APPLICATION, CACHE_VM};
private Object readResolve() throws java.io.ObjectStreamException {
- return VALUES[ordinal]; // Canonicalize
+ return VALUES[ordinal]; // Canonicalize
}
-
+
/** Creates a new instance of SystemMemberType. */
private SystemMemberType(String name) {
this.name = name;
}
-
+
/** Return the SystemMemberType represented by specified ordinal */
public static SystemMemberType fromOrdinal(int ordinal) {
return VALUES[ordinal];
@@ -76,70 +74,77 @@ public class SystemMemberType implements java.io.Serializable {
public String getName() {
return this.name;
}
-
+
/** Return whether this is <code>MANAGER</code>. */
public boolean isManager() {
return this.equals(MANAGER);
}
-
+
/** Return whether this is <code>APPLICATION</code>. */
public boolean isApplication() {
return this.equals(APPLICATION);
}
- /** Return whether this is <code>CACHE_SERVER</code>.
+ /**
+ * Return whether this is <code>CACHE_SERVER</code>.
+ *
* @deprecated as of 5.7 use {@link #isCacheVm} instead.
*/
@Deprecated
public boolean isCacheServer() {
return isCacheVm();
}
- /** Return whether this is <code>CACHE_VM</code>.
+
+ /**
+ * Return whether this is <code>CACHE_VM</code>.
*/
public boolean isCacheVm() {
return this.equals(CACHE_VM);
}
-
- /**
+
+ /**
* Returns a string representation for this system member type.
*
* @return the name of this system member type
*/
@Override
public String toString() {
- return this.name;
+ return this.name;
}
- /**
- * Indicates whether some other object is "equal to" this one.
- *
- * @param other the reference object with which to compare.
- * @return true if this object is the same as the obj argument;
- * false otherwise.
- */
+ /**
+ * Indicates whether some other object is "equal to" this one.
+ *
+ * @param other the reference object with which to compare.
+ * @return true if this object is the same as the obj argument; false otherwise.
+ */
@Override
- public boolean equals(Object other) {
- if (other == this) return true;
- if (other == null) return false;
- if (!(other instanceof SystemMemberType)) return false;
- final SystemMemberType that = (SystemMemberType) other;
- if (this.ordinal != that.ordinal) return false;
- return true;
- }
-
- /**
- * Returns a hash code for the object. This method is supported for the
- * benefit of hashtables such as those provided by java.util.Hashtable.
- *
- * @return the integer 0 if description is null; otherwise a unique integer.
- */
+ public boolean equals(Object other) {
+ if (other == this)
+ return true;
+ if (other == null)
+ return false;
+ if (!(other instanceof SystemMemberType))
+ return false;
+ final SystemMemberType that = (SystemMemberType) other;
+ if (this.ordinal != that.ordinal)
+ return false;
+ return true;
+ }
+
+ /**
+ * Returns a hash code for the object. This method is supported for the benefit of hashtables such
+ * as those provided by java.util.Hashtable.
+ *
+ * @return the integer 0 if description is null; otherwise a unique integer.
+ */
@Override
- public int hashCode() {
- int result = 17;
- final int mult = 37;
- result = mult * result + this.ordinal;
- return result;
- }
-
+ public int hashCode() {
+ int result = 17;
+ final int mult = 37;
+ result = mult * result + this.ordinal;
+ return result;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
index 9319de5..d7850b4 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipEvent.java
@@ -1,29 +1,30 @@
/*
- * 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
+ * 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.admin;
import org.apache.geode.distributed.DistributedMember;
+
/**
- * An event that describes the distributed member originated this event.
- * Instances of this are delivered to a {@link SystemMembershipListener} when a
- * member has joined or left the distributed system.
+ * An event that describes the distributed member originated this event. Instances of this are
+ * delivered to a {@link SystemMembershipListener} when a member has joined or left the distributed
+ * system.
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface SystemMembershipEvent {
/**
@@ -33,6 +34,7 @@ public interface SystemMembershipEvent {
/**
* Returns the {@link DistributedMember} that this event originated in.
+ *
* @return the member that performed the operation that originated this event.
* @since GemFire 5.0
*/
[72/98] [abbrv] incubator-geode git commit: GEODE-2023: Add Lucene
documentation
Posted by ds...@apache.org.
GEODE-2023: Add Lucene documentation
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b0d12050
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b0d12050
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b0d12050
Branch: refs/heads/feature/GEM-983
Commit: b0d12050cf7f88f4e2bfc4d7187a8a10a12a27f7
Parents: 15a5465
Author: Dave Barnes <db...@pivotal.io>
Authored: Fri Oct 21 14:44:37 2016 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Tue Oct 25 09:56:31 2016 -0700
----------------------------------------------------------------------
.../source/subnavs/geode-subnav.erb | 14 ++
geode-docs/tools_modules/book_intro.html.md.erb | 13 +-
.../lucene_integration.html.md.erb | 136 +++++++++++++++++++
3 files changed, 158 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0d12050/geode-book/master_middleman/source/subnavs/geode-subnav.erb
----------------------------------------------------------------------
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index 30ff2f9..d0eb74e 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -2343,6 +2343,20 @@ limitations under the License.
</li>
</ul>
</li>
+ <li class="has_submenu">
+ <a href="/docs/tools_modules/lucene_integration.html">Apache Lucene Integration</a>
+ <ul>
+ <li>
+ <a href="/docs/tools_modules/lucene_integration.html#using-the-apache-lucene-integration">Using the Apache Lucene Integration</a>
+ </li>
+ <li>
+ <a href="/docs/tools_modules/lucene_integration.html#java-api-example">Java API Example</a>
+ </li>
+ <li>
+ <a href="/docs/tools_modules/lucene_integration.html#gfsh-api">Gfsh API</a>
+ </li>
+ </ul>
+ </li>
</ul>
</li>
<li class="has_submenu">
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0d12050/geode-docs/tools_modules/book_intro.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/book_intro.html.md.erb b/geode-docs/tools_modules/book_intro.html.md.erb
index 852e3c9..a6db1d2 100644
--- a/geode-docs/tools_modules/book_intro.html.md.erb
+++ b/geode-docs/tools_modules/book_intro.html.md.erb
@@ -23,25 +23,28 @@ limitations under the License.
<a id="deploy_run__section_tool_intro"></a>
-- **[gfsh (Geode SHell)](../tools_modules/gfsh/chapter_overview.html)**
+- **[gfsh (Geode SHell)](gfsh/chapter_overview.html)**
Geode gfsh (pronounced "jee-fish") provides a single, powerful command-line interface from which you can launch, manage, and monitor Geode processes, data, and applications.
-- **[Gemcached](../tools_modules/gemcached/chapter_overview.html)**
+- **[Gemcached](gemcached/chapter_overview.html)**
Gemcached is a Geode adapter that allows Memcached clients to communicate with a Geode server cluster, as if the servers were memcached servers. Memcached is an open-source caching solution that uses a distributed, in-memory hash map to store key-value pairs of string or object data.
-- **[HTTP Session Management Modules](../tools_modules/http_session_mgmt/chapter_overview.html)**
+- **[HTTP Session Management Modules](http_session_mgmt/chapter_overview.html)**
The Apache Geode HTTP Session Management modules provide fast, scalable, and reliable session replication for HTTP servers without requiring application changes.
-- **[Geode Pulse](../tools_modules/pulse/chapter_overview.html)**
+- **[Geode Pulse](pulse/chapter_overview.html)**
Geode Pulse is a Web Application that provides a graphical dashboard for monitoring vital, real-time health and performance of Geode clusters, members, and regions.
-- **[Geode Redis Adapter](../tools_modules/redis_adapter.html)**
+- **[Geode Redis Adapter](redis_adapter.html)**
The Geode Redis adapter allows Geode to function as a drop-in replacement for a Redis data store, letting Redis applications take advantage of Geode\u2019s scaling capabilities without changing their client code. Redis clients connect to a Geode server in the same way they connect to a Redis server, using an IP address and a port number.
+- **[Apache Lucene® Integration](lucene_integration.html)**
+
+ The Apache Lucene® integration enables users to create Lucene indexes and execute Lucene searches on data stored in Geode.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0d12050/geode-docs/tools_modules/lucene_integration.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/lucene_integration.html.md.erb b/geode-docs/tools_modules/lucene_integration.html.md.erb
new file mode 100644
index 0000000..6361650
--- /dev/null
+++ b/geode-docs/tools_modules/lucene_integration.html.md.erb
@@ -0,0 +1,136 @@
+---
+title: Apache Lucene® Integration
+---
+<a id="topic_523F6DE33FE54307BBE8F83BB7D9355D"></a>
+
+<!--
+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.
+-->
+
+Apache Lucene® is a widely-used Java full-text search engine. This section describes how the system integrates with Apache Lucene.
+We assume that the reader is familiar with Apache Lucene's indexing and search functionalities.
+
+The Apache Lucene integration:
+
+- enables users to create Lucene indexes on data stored in Geode
+- provides high availability of indexes using Geode's HA capabilities to store the indexes in memory
+- optionally stores indexes on disk
+- updates the indexes asynchronously to minimize impacting write latency
+- provides scalability by partitioning index data
+- colocates indexes with data
+
+For more details, see Javadocs for the classes and interfaces that implement Apache Lucene indexes and searches, including
+`LuceneService`, `LuceneQueryFactory`, `LuceneQuery`, and `LuceneResultStruct`.
+
+## <a id="using-the-apache-lucene-integration" class="no-quick-link"></a>Using the Apache Lucene Integration
+
+You can create Apache Lucene indexes through a Java API, through the `gfsh` command-line utility, or by means of
+the `cache.xml` configuration file.
+
+To use Apache Lucene Integration, you will need two pieces of information:
+
+1. The name of the region to be indexed or searched
+2. The names of the fields you wish to index
+
+
+### Key Points ###
+
+- Only top level fields of objects stored in the region can be indexed.
+- Apache Lucene indexes are supported only on Partitioned regions.
+- A single index supports a single region. Indexes do not support multiple regions.
+- Heterogeneous objects in single region are supported.
+- Join queries between regions are not supported.
+- Nested objects are not supported.
+- The index needs to be created before the region is created.
+
+## <a id="java-api-example" class="no-quick-link"></a>Java API Example
+
+``` pre
+// Get LuceneService
+LuceneService luceneService = LuceneServiceProvider.get(cache);
+
+// Create Index on fields with default analyzer:
+luceneService.createIndex(indexName, regionName, "field1", "field2", "field3");
+
+Region region = cache.createRegionFactory(RegionShutcut.PARTITION).create(regionName);
+
+```
+
+## Search Example
+
+``` pre
+LuceneQuery<String, Person> query = luceneService.createLuceneQueryFactory()
+ .setResultLimit(10)
+ .create(indexName, regionName, "Main Street", "address");
+
+Collection<Person> results = query.findValues();
+```
+
+
+## <a id="gfsh-api" class="no-quick-link"></a>Gfsh API
+
+The gfsh command-line utility supports four Apache Lucene actions:
+
+<dt><b>create lucene index</b></dt>
+ <dd>Create a lucene index that can be used to execute queries.</dd>
+<dt><b>describe lucene index</b></dt>
+ <dd>Display the describe of lucene indexes created for all members.</dd>
+<dt><b>list lucene indexes [with-stats]</b></dt>
+ <dd>Display the list of lucene indexes created for all members. The optional `with-stats` qualifier shows activity on the indexes.</dd>
+<dt><b>search lucene</b></dt>
+ <dd>Search lucene index</dd>
+
+**Gfsh command-line examples:**
+
+``` pre
+// List Index
+gfsh> list lucene indexes [with-stats]
+
+// Create Index
+gfsh>create lucene index --name=indexName --region=/orders --field=customer,tags
+
+// Create Index, specifying a custom analyzer for the second field
+// Note: "null" in the first analyzer position means "use the default analyzer for the first field"
+gfsh>create lucene index --name=indexName --region=/orders --field=customer,tags --analyzer=null,org.apache.lucene.analysis.bg.BulgarianAnalyzer
+
+// Execute Lucene query
+gfsh> lucene search --regionName=/orders -queryStrings="John*" --defaultField=field1 --limit=100
+```
+
+
+## XML Configuration
+
+``` pre
+<cache
+ xmlns="http://geode.apache.org/schema/cache"
+ xmlns:lucene="http://geode.apache.org/schema/lucene"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://geode.apache.org/schema/cache
+ http://geode.apache.org/schema/cache/cache-1.0.xsd
+ http://geode.apache.org/schema/lucene
+ http://geode.apache.org/schema/lucene/lucene-1.0.xsd"
+ version="1.0">
+
+ <region name="region" refid="PARTITION">
+ <lucene:index name="index">
+ <lucene:field name="a" analyzer="org.apache.lucene.analysis.core.KeywordAnalyzer"/>
+ <lucene:field name="b" analyzer="org.apache.lucene.analysis.core.SimpleAnalyzer"/>
+ <lucene:field name="c" analyzer="org.apache.lucene.analysis.standard.ClassicAnalyzer"/>
+ </lucene:index>
+ </region>
+</cache>
+```
+
[53/98] [abbrv] incubator-geode git commit: GEODE-706 Fixed race
condition between expiry thread and user thread.
Posted by ds...@apache.org.
GEODE-706 Fixed race condition between expiry thread and user thread.
ExpirationManager tracks the regionEntry as reference to expiryTask. It
assumes, it is unique for that key. But consistency check mechanism
keeps that regionEntry around and that enforces re-use of that for new
update. That introduces the race condition between expiry thread and
user thread, it endup not scheduling the entry for expiration. As a fix,
now "consistency check mechanism" unschedules the expiry task to avoid
this race condition.
Unmarked flaky from testEntryIdleDestroy test
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/24a72040
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/24a72040
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/24a72040
Branch: refs/heads/feature/GEM-983
Commit: 24a72040cba3afe96da8ef752aa1f07c10dd1fa1
Parents: 6eb0fd3
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Fri Oct 21 15:59:16 2016 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Fri Oct 21 16:09:29 2016 -0700
----------------------------------------------------------------------
.../org/apache/geode/internal/cache/AbstractRegionMap.java | 9 ++++++---
.../org/apache/geode/internal/cache/EntryEventImpl.java | 9 ---------
.../org/apache/geode/internal/cache/EntryExpiryTask.java | 3 +--
.../java/org/apache/geode/internal/cache/LocalRegion.java | 3 ---
.../test/java/org/apache/geode/cache30/RegionTestCase.java | 2 --
5 files changed, 7 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24a72040/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index b2738ba..de05b0d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -1521,9 +1521,11 @@ public abstract class AbstractRegionMap implements RegionMap {
} finally {
if (opCompleted) {
if (re != null) {
- owner.cancelExpiryTask(re, event.getExpiryTask());
- } else if (tombstone != null) {
- owner.cancelExpiryTask(tombstone, event.getExpiryTask());
+ // we only want to cancel if concurrency-check is not enabled
+ // re(regionentry) will be null when concurrency-check is enable and removeTombstone
+ // method
+ // will call cancelExpiryTask on regionEntry
+ owner.cancelExpiryTask(re);
}
}
}
@@ -3801,6 +3803,7 @@ public abstract class AbstractRegionMap implements RegionMap {
try {
re.setValue(_getOwner(), Token.REMOVED_PHASE2);
if (removeTombstone(re)) {
+ _getOwner().cancelExpiryTask(re);
result = true;
incEntryCount(-1);
// Bug 51118: When the method is called by tombstoneGC thread, current 're' is an
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24a72040/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
index 65ae0f3..02c0422 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
@@ -69,7 +69,6 @@ public class EntryEventImpl
// PACKAGE FIELDS //
public transient LocalRegion region;
private transient RegionEntry re;
- private transient ExpiryTask expiryTask;
protected KeyInfo keyInfo;
@@ -2820,12 +2819,4 @@ public class EntryEventImpl
public boolean isOldValueOffHeap() {
return isOffHeapReference(this.oldValue);
}
-
- public ExpiryTask getExpiryTask() {
- return expiryTask;
- }
-
- public void setExpiryTask(ExpiryTask expiryTask) {
- this.expiryTask = expiryTask;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24a72040/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
index 603f713..254fc88 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
@@ -111,7 +111,6 @@ public class EntryExpiryTask extends ExpiryTask {
@Released
EntryEventImpl event = EntryEventImpl.create(lr, Operation.EXPIRE_DESTROY, key, null,
createExpireEntryCallback(lr, key), false, lr.getMyId());
- event.setExpiryTask(this);
try {
event.setPendingSecondaryExpireDestroy(isPending);
if (lr.generateEventID()) {
@@ -216,7 +215,7 @@ public class EntryExpiryTask extends ExpiryTask {
// so the next call to addExpiryTaskIfAbsent will
// add a new task instead of doing nothing, which would
// erroneously cancel expiration for this key.
- getLocalRegion().cancelExpiryTask(this.re, null);
+ getLocalRegion().cancelExpiryTask(this.re, this);
getLocalRegion().performExpiryTimeout(this);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24a72040/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index fce8b5d..360c6a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -8316,7 +8316,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
if (this.customEntryIdleTimeout != null || this.customEntryTimeToLive != null) {
newTask = createExpiryTask(re);
if (newTask == null) {
- cancelExpiryTask(re); // cancel any old task
return;
}
// to fix bug 44418 see if the new tasks expiration would be earlier than
@@ -8344,7 +8343,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
if (newTask == null) {
newTask = createExpiryTask(re);
if (newTask == null) {
- cancelExpiryTask(re); // cancel any old task
return;
}
}
@@ -8370,7 +8368,6 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
// return;
// }
} else {
- cancelExpiryTask(re);
if (logger.isTraceEnabled()) {
logger.trace("addExpiryTask(key) ignored");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24a72040/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
index bee89b6..d87cbd8 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/RegionTestCase.java
@@ -3510,8 +3510,6 @@ public abstract class RegionTestCase extends JUnit4CacheTestCase {
/**
* Tests that an entry in a region that remains idle for a given amount of time is destroyed.
*/
- @Category(FlakyTest.class) // GEODE-706: time sensitive, expiration, waitForDestroy,
- // EXPIRY_MS_PROPERTY, short timeout
@Test
public void testEntryIdleDestroy() throws Exception {
[95/98] [abbrv] incubator-geode git commit: GEODE-1912: make
ServerStarter and LocatorStarter as regular rules so that it's easier to use
them in a RuleChain
Posted by ds...@apache.org.
GEODE-1912: make ServerStarter and LocatorStarter as regular rules so that it's easier to use them in a RuleChain
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fa88520b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fa88520b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fa88520b
Branch: refs/heads/feature/GEM-983
Commit: fa88520b658dbf8ec74a83a63190bca8dc2bcff5
Parents: 6ec3f88
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Thu Oct 27 10:24:07 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri Oct 28 08:56:49 2016 -0700
----------------------------------------------------------------------
.../web/RestSecurityIntegrationTest.java | 5 +-
.../rest/internal/web/RestServersJUnitTest.java | 5 +-
.../internal/web/SwaggerVerificationTest.java | 10 +-
.../management/internal/cli/GfshParser.java | 42 ++++---
.../CacheServerMBeanShiroJUnitTest.java | 29 +++--
.../security/CacheServerStartupRule.java | 6 +-
.../security/GfshCommandsPostProcessorTest.java | 26 +++--
.../security/GfshCommandsSecurityTest.java | 48 +++++---
.../security/GfshShellConnectionRule.java | 113 -------------------
.../security/JavaRmiServerNameTest.java | 22 ++--
.../security/AbstractSecureServerDUnitTest.java | 27 +++--
.../ClusterConfigWithoutSecurityDUnitTest.java | 6 +-
.../security/PeerAuthenticatorDUnitTest.java | 4 +-
...eerSecurityWithEmbeddedLocatorDUnitTest.java | 6 +-
.../SecurityClusterConfigDUnitTest.java | 12 +-
.../SecurityWithoutClusterConfigDUnitTest.java | 4 +-
.../security/StartServerAuthorizationTest.java | 6 +-
.../dunit/rules/GfshShellConnectionRule.java | 111 ++++++++++++++++++
.../dunit/rules/LocatorServerStartupRule.java | 25 ++--
.../geode/test/dunit/rules/LocatorStarter.java | 72 ------------
.../test/dunit/rules/LocatorStarterRule.java | 75 ++++++++++++
.../geode/test/dunit/rules/ServerStarter.java | 97 ----------------
.../test/dunit/rules/ServerStarterRule.java | 110 ++++++++++++++++++
.../GfshCommandsOverHttpSecurityTest.java | 3 +-
24 files changed, 441 insertions(+), 423 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index 2dffcb7..aee2560 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.security.templates.SampleSecurityManager;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.http.HttpResponse;
@@ -58,12 +58,11 @@ public class RestSecurityIntegrationTest {
};
@ClassRule
- public static ServerStarter serverStarter = new ServerStarter(properties);
+ public static ServerStarterRule serverStarter = new ServerStarterRule(properties);
private final GeodeRestClient restClient = new GeodeRestClient("localhost", restPort);
@BeforeClass
public static void before() throws Exception {
- serverStarter.startServer();
serverStarter.cache.createRegionFactory(RegionShortcut.REPLICATE).create(REGION_NAME);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
index 552a184..b49e6ca 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
@@ -19,7 +19,7 @@ import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_
import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.http.HttpResponse;
import org.json.JSONArray;
@@ -42,12 +42,11 @@ public class RestServersJUnitTest {
};
@ClassRule
- public static ServerStarter serverStarter = new ServerStarter(properties);
+ public static ServerStarterRule serverStarter = new ServerStarterRule(properties);
private static GeodeRestClient restClient;
@BeforeClass
public static void before() throws Exception {
- serverStarter.startServer();
restClient = new GeodeRestClient("localhost", defaultPort);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
index b550e11..e706b0e 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
@@ -24,12 +24,11 @@ import static org.junit.Assert.assertThat;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.security.templates.SimpleSecurityManager;
-import org.apache.geode.test.dunit.rules.ServerStarter;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.http.HttpResponse;
import org.json.JSONObject;
-import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -51,14 +50,9 @@ public class SwaggerVerificationTest {
};
@ClassRule
- public static ServerStarter serverStarter = new ServerStarter(properties);
+ public static ServerStarterRule serverStarter = new ServerStarterRule(properties);
private final GeodeRestClient restClient = new GeodeRestClient("localhost", restPort);
- @BeforeClass
- public static void before() throws Exception {
- serverStarter.startServer();
- }
-
@Test
public void isSwaggerRunning() throws Exception {
// Check the UI
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/main/java/org/apache/geode/management/internal/cli/GfshParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/GfshParser.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/GfshParser.java
index bc25567..a1d03e4 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/GfshParser.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/GfshParser.java
@@ -14,28 +14,7 @@
*/
package org.apache.geode.management.internal.cli;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.logging.Logger;
-import java.util.regex.Pattern;
-
import org.apache.commons.lang.StringUtils;
-import org.springframework.shell.core.AbstractShell;
-import org.springframework.shell.core.Completion;
-import org.springframework.shell.core.Converter;
-import org.springframework.shell.core.MethodTarget;
-import org.springframework.shell.core.Parser;
-import org.springframework.shell.event.ParseResult;
-
import org.apache.geode.management.cli.CommandProcessingException;
import org.apache.geode.management.internal.cli.exceptions.CliCommandMultiModeOptionException;
import org.apache.geode.management.internal.cli.exceptions.CliCommandOptionException;
@@ -60,6 +39,26 @@ import org.apache.geode.management.internal.cli.parser.preprocessor.Preprocessor
import org.apache.geode.management.internal.cli.parser.preprocessor.TrimmedInput;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.CLIConsoleBufferUtil;
+import org.springframework.shell.core.AbstractShell;
+import org.springframework.shell.core.Completion;
+import org.springframework.shell.core.Converter;
+import org.springframework.shell.core.MethodTarget;
+import org.springframework.shell.core.Parser;
+import org.springframework.shell.event.ParseResult;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.logging.Logger;
+import java.util.regex.Pattern;
/**
* Implementation of the {@link Parser} interface for GemFire SHell (gfsh) requirements.
@@ -927,7 +926,6 @@ public class GfshParser implements Parser {
}
} else {
if (targets.size() == 1) {
-
OptionSet parse = null;
List<MethodParameter> parameters = new ArrayList<MethodParameter>();
Map<String, String> paramValMap = new HashMap<String, String>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanShiroJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanShiroJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanShiroJUnitTest.java
index 992c27d..3183aaf 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanShiroJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerMBeanShiroJUnitTest.java
@@ -14,24 +14,24 @@
*/
package org.apache.geode.management.internal.security;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.assertj.core.api.Assertions.*;
-
-import java.util.Properties;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.geode.internal.AvailablePort;
import org.apache.geode.management.CacheServerMXBean;
import org.apache.geode.test.dunit.rules.ConnectionConfiguration;
import org.apache.geode.test.dunit.rules.MBeanServerConnectionRule;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Properties;
@Category({IntegrationTest.class, SecurityTest.class})
public class CacheServerMBeanShiroJUnitTest {
@@ -45,11 +45,8 @@ public class CacheServerMBeanShiroJUnitTest {
private CacheServerMXBean bean;
- @BeforeClass
- public static void before() throws Exception {
- ServerStarter serverStarter = new ServerStarter(properties);
- serverStarter.startServer();
- }
+ @ClassRule
+ public static ServerStarterRule serverStarter = new ServerStarterRule(properties);
@Rule
public MBeanServerConnectionRule connectionRule = new MBeanServerConnectionRule(jmxManagerPort);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerStartupRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerStartupRule.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerStartupRule.java
index c9ae997..03f4e84 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerStartupRule.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/CacheServerStartupRule.java
@@ -26,14 +26,14 @@ import org.junit.rules.ExternalResource;
import org.apache.geode.cache.Cache;
import org.apache.geode.security.templates.SampleSecurityManager;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
/**
* this rule would help you start up a cache server with the given properties in the current VM
*/
public class CacheServerStartupRule extends ExternalResource implements Serializable {
- private ServerStarter serverStarter;
+ private ServerStarterRule serverStarter;
public static CacheServerStartupRule withDefaultSecurityJson(int jmxManagerPort) {
return new CacheServerStartupRule(jmxManagerPort,
@@ -49,7 +49,7 @@ public class CacheServerStartupRule extends ExternalResource implements Serializ
properties.put(SECURITY_MANAGER, SampleSecurityManager.class.getName());
properties.put(SampleSecurityManager.SECURITY_JSON, jsonFile);
}
- serverStarter = new ServerStarter(properties);
+ serverStarter = new ServerStarterRule(properties);
}
@Before
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
index 60f58da..d3390ba 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsPostProcessorTest.java
@@ -14,16 +14,10 @@
*/
package org.apache.geode.management.internal.security;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.internal.Assert.*;
-
-import java.util.Properties;
-
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST_PROCESSOR;
+import static org.apache.geode.internal.Assert.assertTrue;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.AvailablePortHelper;
@@ -31,9 +25,17 @@ import org.apache.geode.management.internal.cli.HeadlessGfsh;
import org.apache.geode.security.templates.SamplePostProcessor;
import org.apache.geode.security.templates.SampleSecurityManager;
import org.apache.geode.test.dunit.rules.ConnectionConfiguration;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Properties;
@Category({IntegrationTest.class, SecurityTest.class})
public class GfshCommandsPostProcessorTest {
@@ -53,7 +55,7 @@ public class GfshCommandsPostProcessorTest {
@BeforeClass
public static void beforeClass() throws Exception {
- ServerStarter serverStarter = new ServerStarter(properties);
+ ServerStarterRule serverStarter = new ServerStarterRule(properties);
serverStarter.startServer();
serverStarter.cache.createRegionFactory(RegionShortcut.REPLICATE).create("region1");
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
index ce9c21c..b2dc6fe 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshCommandsSecurityTest.java
@@ -14,18 +14,14 @@
*/
package org.apache.geode.management.internal.security;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.shiro.authz.permission.WildcardPermission;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import org.apache.geode.cache.RegionShortcut;
import org.apache.geode.internal.AvailablePortHelper;
@@ -37,17 +33,38 @@ import org.apache.geode.management.internal.cli.result.ErrorResultData;
import org.apache.geode.management.internal.cli.result.ResultBuilder;
import org.apache.geode.security.templates.SampleSecurityManager;
import org.apache.geode.test.dunit.rules.ConnectionConfiguration;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.GfshShellConnectionRule;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.shiro.authz.permission.WildcardPermission;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.List;
+import java.util.Properties;
@Category({IntegrationTest.class, SecurityTest.class})
+// @RunWith(Parameterized.class)
+// @Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
public class GfshCommandsSecurityTest {
protected static int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
protected static int jmxPort = ports[0];
protected static int httpPort = ports[1];
+ // can't do parameterized tests here since useHttp tests needs to be in geode-web project
+ // @Parameterized.Parameters
+ // public static Collection<Object> data() {
+ // return Arrays.asList(new Object[] {true, false});
+ // }
+ //
+ // @Parameterized.Parameter
+ // public boolean useHttp;
+
static Properties properties = new Properties() {
{
setProperty(JMX_MANAGER_PORT, jmxPort + "");
@@ -62,14 +79,13 @@ public class GfshCommandsSecurityTest {
@BeforeClass
public static void beforeClass() throws Exception {
- ServerStarter serverStarter = new ServerStarter(properties);
+ ServerStarterRule serverStarter = new ServerStarterRule(properties);
serverStarter.startServer();
serverStarter.cache.createRegionFactory(RegionShortcut.REPLICATE).create("region1");
}
@Rule
- public GfshShellConnectionRule gfshConnection =
- new GfshShellConnectionRule(jmxPort, httpPort, false);
+ public GfshShellConnectionRule gfshConnection = new GfshShellConnectionRule(jmxPort);
@Before
public void before() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshShellConnectionRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshShellConnectionRule.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshShellConnectionRule.java
deleted file mode 100644
index e7724f7..0000000
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshShellConnectionRule.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.management.internal.security;
-
-import org.junit.runner.Description;
-
-import org.apache.geode.management.internal.cli.CliUtil;
-import org.apache.geode.management.internal.cli.HeadlessGfsh;
-import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.cli.result.CommandResult;
-import org.apache.geode.management.internal.cli.result.ErrorResultData;
-import org.apache.geode.management.internal.cli.result.ResultBuilder;
-import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.dunit.rules.ConnectionConfiguration;
-import org.apache.geode.test.junit.rules.DescribedExternalResource;
-
-/**
- * Class which eases the creation of MBeans for security testing. When combined with
- * {@link ConnectionConfiguration} it allows for the creation of per-test connections with different
- * user/password combinations.
- */
-public class GfshShellConnectionRule extends DescribedExternalResource {
-
- private int jmxPort = 0;
- private int httpPort = 0;
- private boolean useHttp = false;
- private HeadlessGfsh gfsh;
- private boolean authenticated;
-
- /**
- * Rule constructor
- */
- public GfshShellConnectionRule(int jmxPort, int httpPort, boolean useHttp) {
- this.jmxPort = jmxPort;
- this.httpPort = httpPort;
- this.useHttp = useHttp;
- }
-
- public GfshShellConnectionRule(int jmxPort) {
- this.jmxPort = jmxPort;
- }
-
- protected void before(Description description) throws Throwable {
- ConnectionConfiguration config = description.getAnnotation(ConnectionConfiguration.class);
- if (config == null)
- return;
-
- CliUtil.isGfshVM = true;
- String shellId = getClass().getSimpleName() + "_" + description.getMethodName();
- gfsh = new HeadlessGfsh(shellId, 30, "gfsh_files"); // TODO: move to TemporaryFolder
-
- final CommandStringBuilder connectCommand = new CommandStringBuilder(CliStrings.CONNECT);
- connectCommand.addOption(CliStrings.CONNECT__USERNAME, config.user());
- connectCommand.addOption(CliStrings.CONNECT__PASSWORD, config.password());
-
- String endpoint;
- if (useHttp) {
- endpoint = "http://localhost:" + httpPort + "/gemfire/v1";
- connectCommand.addOption(CliStrings.CONNECT__USE_HTTP, Boolean.TRUE.toString());
- connectCommand.addOption(CliStrings.CONNECT__URL, endpoint);
- } else {
- endpoint = "localhost[" + jmxPort + "]";
- connectCommand.addOption(CliStrings.CONNECT__JMX_MANAGER, endpoint);
- }
- System.out.println(getClass().getSimpleName() + " using endpoint: " + endpoint);
-
- gfsh.executeCommand(connectCommand.toString());
-
- CommandResult result = (CommandResult) gfsh.getResult();
- if (result.getResultData() instanceof ErrorResultData) {
- ErrorResultData errorResultData = (ErrorResultData) result.getResultData();
- this.authenticated =
- !(errorResultData.getErrorCode() == ResultBuilder.ERRORCODE_CONNECTION_ERROR);
- } else {
- this.authenticated = true;
- }
- }
-
- /**
- * Override to tear down your specific external resource.
- */
- protected void after(Description description) throws Throwable {
- if (gfsh != null) {
- gfsh.clearEvents();
- gfsh.executeCommand("disconnect");
- gfsh.executeCommand("exit");
- gfsh.terminate();
- gfsh.setThreadLocalInstance();
- gfsh = null;
- }
- CliUtil.isGfshVM = false;
- }
-
- public HeadlessGfsh getGfsh() {
- return gfsh;
- }
-
- public boolean isAuthenticated() {
- return authenticated;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
index f754f2e..2ae6140 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
@@ -16,19 +16,18 @@
package org.apache.geode.management.internal.security;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.util.Properties;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static org.junit.Assert.assertEquals;
+import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
-import org.junit.BeforeClass;
+import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.internal.AvailablePort;
-import org.apache.geode.test.dunit.rules.ServerStarter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
+import java.util.Properties;
@Category(IntegrationTest.class)
public class JavaRmiServerNameTest {
@@ -44,11 +43,8 @@ public class JavaRmiServerNameTest {
}
};
- @BeforeClass
- public static void beforeClass() throws Exception {
- ServerStarter serverStarter = new ServerStarter(properties);
- serverStarter.startServer();
- }
+ @ClassRule
+ public static ServerStarterRule serverStarter = new ServerStarterRule(properties);
// https://issues.apache.org/jira/browse/GEODE-1548
@Test
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/security/AbstractSecureServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/AbstractSecureServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/AbstractSecureServerDUnitTest.java
index b9efe07..f43191d 100644
--- a/geode-core/src/test/java/org/apache/geode/security/AbstractSecureServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/AbstractSecureServerDUnitTest.java
@@ -15,16 +15,12 @@
package org.apache.geode.security;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.assertj.core.api.Assertions.*;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-
-import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
-import org.junit.Before;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTH_INIT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionShortcut;
@@ -37,7 +33,14 @@ import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
+import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
+import org.junit.Before;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
public abstract class AbstractSecureServerDUnitTest extends JUnit4DistributedTestCase {
@@ -71,7 +74,7 @@ public abstract class AbstractSecureServerDUnitTest extends JUnit4DistributedTes
@Before
public void before() throws Exception {
- ServerStarter serverStarter = new ServerStarter(getProperties());
+ ServerStarterRule serverStarter = new ServerStarterRule(getProperties());
serverStarter.startServer(0, pdxPersistent);
serverPort = serverStarter.server.getPort();
Region region =
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
index cbe4a3b..32a92a2 100644
--- a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.*;
import java.util.Properties;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
@@ -34,7 +35,6 @@ import org.apache.geode.security.templates.SimpleSecurityManager;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.ServerStarter;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -71,7 +71,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends JUnit4DistributedTest
props.setProperty("use-cluster-configuration", "false");
// initial security properties should only contain initial set of values
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
serverStarter.startServer(lsRule.getPort(0));
DistributedSystem ds = serverStarter.cache.getDistributedSystem();
@@ -91,7 +91,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends JUnit4DistributedTest
props.setProperty("security-manager", "mySecurityManager");
props.setProperty("use-cluster-configuration", "true");
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
.isInstanceOf(GemFireConfigException.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
index 84a4dd4..90cc6f1 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
@@ -20,6 +20,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
import java.util.Properties;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -29,7 +30,6 @@ import org.apache.geode.security.templates.DummyAuthenticator;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.ServerStarter;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -61,7 +61,7 @@ public class PeerAuthenticatorDUnitTest extends JUnit4DistributedTestCase {
VM server2 = lsRule.getNodeVM(2);
server2.invoke(() -> {
- ServerStarter serverStarter = new ServerStarter(server2Props);
+ ServerStarterRule serverStarter = new ServerStarterRule(server2Props);
assertThatThrownBy(() -> serverStarter.startServer(locatorPort))
.isInstanceOf(GemFireSecurityException.class).hasMessageContaining("Invalid user name");
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
index 577a7a1..fbbbf2b 100644
--- a/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/PeerSecurityWithEmbeddedLocatorDUnitTest.java
@@ -30,7 +30,7 @@ import org.apache.geode.security.templates.SimpleSecurityManager;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -62,7 +62,7 @@ public class PeerSecurityWithEmbeddedLocatorDUnitTest extends JUnit4DistributedT
VM server2 = lsRule.getNodeVM(2);
server2.invoke(() -> {
- ServerStarter serverStarter = new ServerStarter(server2Props);
+ ServerStarterRule serverStarter = new ServerStarterRule(server2Props);
assertThatThrownBy(() -> serverStarter.startServer(locatorPort))
.isInstanceOf(GemFireSecurityException.class)
.hasMessageContaining("Security check failed. Authentication error");
@@ -90,7 +90,7 @@ public class PeerSecurityWithEmbeddedLocatorDUnitTest extends JUnit4DistributedT
VM server2 = lsRule.getNodeVM(2);
server2.invoke(() -> {
- ServerStarter serverStarter = new ServerStarter(server2Props);
+ ServerStarterRule serverStarter = new ServerStarterRule(server2Props);
assertThatThrownBy(() -> serverStarter.startServer(locatorPort))
.isInstanceOf(GemFireSecurityException.class).hasMessageContaining("Invalid user name");
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
index a4b25f5..cce4fdb 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityClusterConfigDUnitTest.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.*;
import java.util.Properties;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -33,7 +34,6 @@ import org.apache.geode.security.templates.SimpleSecurityManager;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.ServerStarter;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -67,7 +67,7 @@ public class SecurityClusterConfigDUnitTest extends JUnit4DistributedTestCase {
props.setProperty("use-cluster-configuration", "true");
// initial security properties should only contain initial set of values
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
serverStarter.startServer(lsRule.getPort(0));
DistributedSystem ds = serverStarter.cache.getDistributedSystem();
@@ -89,7 +89,7 @@ public class SecurityClusterConfigDUnitTest extends JUnit4DistributedTestCase {
props.setProperty(SECURITY_MANAGER, SimpleSecurityManager.class.getName());
// initial security properties should only contain initial set of values
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
serverStarter.startServer(lsRule.getPort(0));
DistributedSystem ds = serverStarter.cache.getDistributedSystem();
@@ -110,7 +110,7 @@ public class SecurityClusterConfigDUnitTest extends JUnit4DistributedTestCase {
props.setProperty("use-cluster-configuration", "true");
// initial security properties should only contain initial set of values
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
.isInstanceOf(GemFireConfigException.class)
@@ -129,7 +129,7 @@ public class SecurityClusterConfigDUnitTest extends JUnit4DistributedTestCase {
props.setProperty("use-cluster-configuration", "true");
// initial security properties should only contain initial set of values
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
.isInstanceOf(GemFireConfigException.class)
@@ -147,7 +147,7 @@ public class SecurityClusterConfigDUnitTest extends JUnit4DistributedTestCase {
props.setProperty("security-manager", "mySecurityManager");
props.setProperty("use-cluster-configuration", "false");
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
.isInstanceOf(GemFireConfigException.class)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java b/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
index 87314ed..7af5d93 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SecurityWithoutClusterConfigDUnitTest.java
@@ -32,7 +32,7 @@ import org.apache.geode.security.templates.SimpleSecurityManager;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -70,7 +70,7 @@ public class SecurityWithoutClusterConfigDUnitTest extends JUnit4DistributedTest
props.setProperty("use-cluster-configuration", "true");
// initial security properties should only contain initial set of values
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
serverStarter.startServer(lsRule.getPort(0));
DistributedSystem ds = serverStarter.cache.getDistributedSystem();
assertEquals(3, ds.getSecurityProperties().size());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java b/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java
index 3cafdac..ed64f40 100644
--- a/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/StartServerAuthorizationTest.java
@@ -20,6 +20,7 @@ import static org.assertj.core.api.Assertions.*;
import java.util.Properties;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -29,7 +30,6 @@ import org.apache.geode.security.templates.SimpleSecurityManager;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
-import org.apache.geode.test.dunit.rules.ServerStarter;
import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -55,7 +55,7 @@ public class StartServerAuthorizationTest extends JUnit4DistributedTestCase {
VM server = lsRule.getNodeVM(1);
server.invoke(() -> {
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
.isInstanceOf(GemFireSecurityException.class).hasMessageContaining(
"Security check failed. Authentication error. Please check your credentials");
@@ -72,7 +72,7 @@ public class StartServerAuthorizationTest extends JUnit4DistributedTestCase {
VM server = lsRule.getNodeVM(1);
server.invoke(() -> {
- ServerStarter serverStarter = new ServerStarter(props);
+ ServerStarterRule serverStarter = new ServerStarterRule(props);
assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
.isInstanceOf(GemFireSecurityException.class)
.hasMessageContaining("user not authorized for CLUSTER:MANAGE");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
new file mode 100644
index 0000000..25780e6
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/GfshShellConnectionRule.java
@@ -0,0 +1,111 @@
+/*
+ * 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.test.dunit.rules;
+
+import org.apache.geode.management.internal.cli.CliUtil;
+import org.apache.geode.management.internal.cli.HeadlessGfsh;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+import org.apache.geode.management.internal.cli.result.CommandResult;
+import org.apache.geode.management.internal.cli.result.ErrorResultData;
+import org.apache.geode.management.internal.cli.result.ResultBuilder;
+import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.junit.rules.DescribedExternalResource;
+import org.junit.runner.Description;
+
+/**
+ * Class which eases the connection to the jmxManager {@link ConnectionConfiguration} it allows for
+ * the creation of per-test connections with different user/password combinations, or no username
+ * and password
+ */
+public class GfshShellConnectionRule extends DescribedExternalResource {
+
+ private int port = 0;
+ private boolean useHttp = false;
+ private HeadlessGfsh gfsh;
+ private boolean authenticated;
+
+ /**
+ * Rule constructor
+ */
+
+ public GfshShellConnectionRule(int port) {
+ this.useHttp = false;
+ this.port = port;
+ }
+
+ public GfshShellConnectionRule(int port, boolean useHttp) {
+ this.useHttp = useHttp;
+ this.port = port;
+ }
+
+ protected void before(Description description) throws Throwable {
+ CliUtil.isGfshVM = true;
+ String shellId = getClass().getSimpleName() + "_" + description.getMethodName();
+ gfsh = new HeadlessGfsh(shellId, 30, "gfsh_files"); // TODO: move to TemporaryFolder
+
+ final CommandStringBuilder connectCommand = new CommandStringBuilder(CliStrings.CONNECT);
+
+ ConnectionConfiguration config = description.getAnnotation(ConnectionConfiguration.class);
+ if (config != null) {
+ connectCommand.addOption(CliStrings.CONNECT__USERNAME, config.user());
+ connectCommand.addOption(CliStrings.CONNECT__PASSWORD, config.password());
+ }
+
+ String endpoint;
+ if (useHttp) {
+ endpoint = "http://localhost:" + port + "/gemfire/v1";
+ connectCommand.addOption(CliStrings.CONNECT__USE_HTTP, Boolean.TRUE.toString());
+ connectCommand.addOption(CliStrings.CONNECT__URL, endpoint);
+ } else {
+ endpoint = "localhost[" + port + "]";
+ connectCommand.addOption(CliStrings.CONNECT__JMX_MANAGER, endpoint);
+ }
+ System.out.println(getClass().getSimpleName() + " using endpoint: " + endpoint);
+
+ gfsh.executeCommand(connectCommand.toString());
+
+ CommandResult result = (CommandResult) gfsh.getResult();
+ if (result.getResultData() instanceof ErrorResultData) {
+ ErrorResultData errorResultData = (ErrorResultData) result.getResultData();
+ this.authenticated =
+ !(errorResultData.getErrorCode() == ResultBuilder.ERRORCODE_CONNECTION_ERROR);
+ } else {
+ this.authenticated = true;
+ }
+ }
+
+ /**
+ * Override to tear down your specific external resource.
+ */
+ protected void after(Description description) throws Throwable {
+ if (gfsh != null) {
+ gfsh.clearEvents();
+ gfsh.executeCommand("disconnect");
+ gfsh.executeCommand("exit");
+ gfsh.terminate();
+ gfsh.setThreadLocalInstance();
+ gfsh = null;
+ }
+ CliUtil.isGfshVM = false;
+ }
+
+ public HeadlessGfsh getGfsh() {
+ return gfsh;
+ }
+
+ public boolean isAuthenticated() {
+ return authenticated;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
index ba78fdc..4e10b0a 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorServerStartupRule.java
@@ -15,20 +15,19 @@
package org.apache.geode.test.dunit.rules;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Host.*;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.Properties;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+import static org.apache.geode.test.dunit.Host.getHost;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.Invoke;
+import org.apache.geode.test.dunit.VM;
import org.junit.After;
import org.junit.Before;
import org.junit.rules.ExternalResource;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.Invoke;
-import org.apache.geode.test.dunit.VM;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.Properties;
/**
@@ -43,8 +42,8 @@ public class LocatorServerStartupRule extends ExternalResource implements Serial
// these are only avaialbe in each VM
- public static ServerStarter serverStarter;
- public static LocatorStarter locatorStarter;
+ public static ServerStarterRule serverStarter;
+ public static LocatorStarterRule locatorStarter;
@Before
public void before() {
@@ -69,7 +68,7 @@ public class LocatorServerStartupRule extends ExternalResource implements Serial
public VM getLocatorVM(int index, Properties locatorProperties) throws IOException {
VM locatorVM = host.getVM(index);
int locatorPort = locatorVM.invoke(() -> {
- locatorStarter = new LocatorStarter(locatorProperties);
+ locatorStarter = new LocatorStarterRule(locatorProperties);
locatorStarter.startLocator();
return locatorStarter.locator.getPort();
});
@@ -99,7 +98,7 @@ public class LocatorServerStartupRule extends ExternalResource implements Serial
VM nodeVM = getNodeVM(index);
properties.setProperty(NAME, "server-" + index);
int port = nodeVM.invoke(() -> {
- serverStarter = new ServerStarter(properties);
+ serverStarter = new ServerStarterRule(properties);
serverStarter.startServer(locatorPort);
return serverStarter.server.getPort();
});
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarter.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarter.java
deleted file mode 100644
index 216acef..0000000
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.apache.geode.test.dunit.rules;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.io.Serializable;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import com.jayway.awaitility.Awaitility;
-import org.junit.rules.ExternalResource;
-
-import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalLocator;
-
-/**
- * This is a rule to start up a locator in your current VM. It's useful for your Integration Tests.
- *
- * If you need a rule to start a server/locator in different VM for Distribution tests, You should
- * use LocatorServerStartupRule
- *
- * This rule does not have a before(), because you may choose to start a locator in different time
- * of your tests. You may choose to use this class not as a rule or use it in your own rule, (see
- * LocatorServerStartupRule) you will need to call after() manually in that case.
- */
-
-public class LocatorStarter extends ExternalResource implements Serializable {
-
- public InternalLocator locator;
-
- private Properties properties;
-
- public LocatorStarter(Properties properties) {
- this.properties = properties;
- }
-
- public void startLocator() throws Exception {
- if (!properties.containsKey(MCAST_PORT)) {
- properties.setProperty(MCAST_PORT, "0");
- }
- locator = (InternalLocator) Locator.startLocatorAndDS(0, null, properties);
- int locatorPort = locator.getPort();
- locator.resetInternalLocatorFileNamesWithCorrectPortNumber(locatorPort);
-
- if (locator.getConfig().getEnableClusterConfiguration()) {
- Awaitility.await().atMost(65, TimeUnit.SECONDS)
- .until(() -> assertTrue(locator.isSharedConfigurationRunning()));
- }
- }
-
- @Override
- public void after() {
- if (locator != null) {
- locator.stop();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
new file mode 100644
index 0000000..72627a0
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/LocatorStarterRule.java
@@ -0,0 +1,75 @@
+/*
+ * 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.test.dunit.rules;
+
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.junit.Assert.assertTrue;
+
+import com.jayway.awaitility.Awaitility;
+import org.apache.geode.distributed.Locator;
+import org.apache.geode.distributed.internal.InternalLocator;
+import org.junit.rules.ExternalResource;
+
+import java.io.Serializable;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * This is a rule to start up a locator in your current VM. It's useful for your Integration Tests.
+ *
+ * If you need a rule to start a server/locator in different VM for Distribution tests, You should
+ * use LocatorServerStartupRule
+ *
+ * You may choose to use this class not as a rule or use it in your own rule, (see
+ * LocatorServerStartupRule) you will need to call startLocator() and after() manually in that case.
+ */
+
+public class LocatorStarterRule extends ExternalResource implements Serializable {
+
+ public InternalLocator locator;
+
+ private Properties properties;
+
+ public LocatorStarterRule(Properties properties) {
+ this.properties = properties;
+ }
+
+ public void startLocator() throws Exception {
+ if (!properties.containsKey(MCAST_PORT)) {
+ properties.setProperty(MCAST_PORT, "0");
+ }
+ locator = (InternalLocator) Locator.startLocatorAndDS(0, null, properties);
+ int locatorPort = locator.getPort();
+ locator.resetInternalLocatorFileNamesWithCorrectPortNumber(locatorPort);
+
+ if (locator.getConfig().getEnableClusterConfiguration()) {
+ Awaitility.await().atMost(65, TimeUnit.SECONDS)
+ .until(() -> assertTrue(locator.isSharedConfigurationRunning()));
+ }
+ }
+
+ @Override
+ protected void before() throws Throwable {
+ startLocator();
+ }
+
+ @Override
+ protected void after() {
+ if (locator != null) {
+ locator.stop();
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarter.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarter.java
deleted file mode 100644
index 22d3c56..0000000
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarter.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package org.apache.geode.test.dunit.rules;
-
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-import org.junit.rules.ExternalResource;
-
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.server.CacheServer;
-
-
-/**
- * This is a rule to start up a server in your current VM. It's useful for your Integration Tests.
- *
- * If you need a rule to start a server/locator in different VM for Distribution tests, You should
- * use LocatorServerStartupRule
- *
- * This rule does not have a before(), because you may choose to start a server in different time of
- * your tests. You may choose to use this class not as a rule or use it in your own rule, (see
- * LocatorServerStartupRule) you will need to call after() manually in that case.
- */
-public class ServerStarter extends ExternalResource implements Serializable {
-
- public Cache cache;
- public CacheServer server;
-
- private Properties properties;
-
- public ServerStarter(Properties properties) {
- this.properties = properties;
- }
-
- public void startServer() throws Exception {
- startServer(0, false);
- }
-
- public void startServer(int locatorPort) throws Exception {
- startServer(locatorPort, false);
- }
-
- public void startServer(int locatorPort, boolean pdxPersistent) throws Exception {
- if (!properties.containsKey(MCAST_PORT)) {
- properties.setProperty(MCAST_PORT, "0");
- }
- if (!properties.containsKey(NAME)) {
- properties.setProperty(NAME, this.getClass().getName());
- }
- if (locatorPort > 0) {
- properties.setProperty(LOCATORS, "localhost[" + locatorPort + "]");
- } else {
- properties.setProperty(LOCATORS, "");
- }
- if (properties.containsKey(JMX_MANAGER_PORT)) {
- int jmxPort = Integer.parseInt(properties.getProperty(JMX_MANAGER_PORT));
- if (jmxPort > 0) {
- if (!properties.containsKey(JMX_MANAGER))
- properties.put(JMX_MANAGER, "true");
- if (!properties.containsKey(JMX_MANAGER_START))
- properties.put(JMX_MANAGER_START, "true");
- }
- }
-
- CacheFactory cf = new CacheFactory(properties);
- cf.setPdxReadSerialized(pdxPersistent);
- cf.setPdxPersistent(pdxPersistent);
-
- cache = cf.create();
- server = cache.addCacheServer();
- server.setPort(0);
- server.start();
- }
-
- public void after() {
- if (cache != null)
- cache.close();
- if (server != null)
- server.stop();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java
new file mode 100644
index 0000000..8da0778
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/rules/ServerStarterRule.java
@@ -0,0 +1,110 @@
+/*
+ * 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.test.dunit.rules;
+
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_START;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.NAME;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.server.CacheServer;
+import org.junit.rules.ExternalResource;
+
+import java.io.Serializable;
+import java.util.Properties;
+
+
+/**
+ * This is a rule to start up a server in your current VM. It's useful for your Integration Tests.
+ *
+ * If you need a rule to start a server/locator in different VM for Distribution tests, You should
+ * use LocatorServerStartupRule
+ *
+ * You may choose to use this class not as a rule or use it in your own rule, (see
+ * LocatorServerStartupRule) you will need to call startServer and after() manually in that case.
+ */
+public class ServerStarterRule extends ExternalResource implements Serializable {
+
+ public Cache cache;
+ public CacheServer server;
+
+ private Properties properties;
+
+ public ServerStarterRule(Properties properties) {
+ this.properties = properties;
+ }
+
+ public void startServer() throws Exception {
+ startServer(0, false);
+ }
+
+ public void startServer(int locatorPort) throws Exception {
+ startServer(locatorPort, false);
+ }
+
+ public void startServer(int locatorPort, boolean pdxPersistent) throws Exception {
+ if (!properties.containsKey(MCAST_PORT)) {
+ properties.setProperty(MCAST_PORT, "0");
+ }
+ if (!properties.containsKey(NAME)) {
+ properties.setProperty(NAME, this.getClass().getName());
+ }
+ if (locatorPort > 0) {
+ properties.setProperty(LOCATORS, "localhost[" + locatorPort + "]");
+ } else {
+ properties.setProperty(LOCATORS, "");
+ }
+ if (properties.containsKey(JMX_MANAGER_PORT)) {
+ int jmxPort = Integer.parseInt(properties.getProperty(JMX_MANAGER_PORT));
+ if (jmxPort > 0) {
+ if (!properties.containsKey(JMX_MANAGER))
+ properties.put(JMX_MANAGER, "true");
+ if (!properties.containsKey(JMX_MANAGER_START))
+ properties.put(JMX_MANAGER_START, "true");
+ }
+ }
+
+ CacheFactory cf = new CacheFactory(properties);
+ cf.setPdxReadSerialized(pdxPersistent);
+ cf.setPdxPersistent(pdxPersistent);
+
+ cache = cf.create();
+ server = cache.addCacheServer();
+ server.setPort(0);
+ server.start();
+ }
+
+ /**
+ * if you use this class as a rule, the default startServer will be called in the before. You need
+ * to make sure your properties to start the server with has the locator information it needs to
+ * connect to, otherwise, this server won't connect to any locator
+ */
+ protected void before() throws Throwable {
+ startServer();
+ }
+
+ @Override
+ public void after() {
+ if (cache != null)
+ cache.close();
+ if (server != null)
+ server.stop();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
----------------------------------------------------------------------
diff --git a/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java b/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
index a4162fd..d477565 100644
--- a/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
+++ b/geode-web/src/test/java/org/apache/geode/management/internal/security/GfshCommandsOverHttpSecurityTest.java
@@ -15,6 +15,7 @@
package org.apache.geode.management.internal.security;
+import org.apache.geode.test.dunit.rules.GfshShellConnectionRule;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
@@ -23,6 +24,6 @@ import org.junit.experimental.categories.Category;
@Category({IntegrationTest.class, SecurityTest.class})
public class GfshCommandsOverHttpSecurityTest extends GfshCommandsSecurityTest {
public GfshCommandsOverHttpSecurityTest() {
- gfshConnection = new GfshShellConnectionRule(jmxPort, httpPort, true);
+ gfshConnection = new GfshShellConnectionRule(httpPort, true);
}
}
[96/98] [abbrv] incubator-geode git commit: Revert "GEODE-2012:
always write stat types to archive"
Posted by ds...@apache.org.
Revert "GEODE-2012: always write stat types to archive"
This reverts commit 3ff33be200484ff4c8614a0d97e3612e1ca85ac4.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/765a55a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/765a55a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/765a55a0
Branch: refs/heads/feature/GEM-983
Commit: 765a55a0e6d5155c352c6c199e660cfb1a5b4f6d
Parents: fa88520
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Oct 28 10:40:19 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Fri Oct 28 10:40:19 2016 -0700
----------------------------------------------------------------------
.../org/apache/geode/internal/NanoTimer.java | 6 +-
.../geode/internal/i18n/LocalizedStrings.java | 2 +-
.../internal/statistics/HostStatSampler.java | 31 +--
.../internal/statistics/SampleCollector.java | 10 +-
.../internal/statistics/SimpleStatSampler.java | 7 +-
.../concurrent/StoppableCountDownLatch.java | 8 +-
.../DiskSpaceLimitIntegrationTest.java | 139 ------------
.../FileSizeLimitIntegrationTest.java | 128 ------------
.../StatTypesAreRolledOverRegressionTest.java | 209 -------------------
9 files changed, 16 insertions(+), 524 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
index 247f9a9..12e91f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
@@ -38,7 +38,7 @@ package org.apache.geode.internal;
* </pre>
*
*/
-public class NanoTimer {
+public final class NanoTimer {
public static final long NANOS_PER_MILLISECOND = 1000000;
@@ -73,7 +73,7 @@ public class NanoTimer {
/**
* For unit testing
*/
- protected NanoTimer(TimeService ts) {
+ NanoTimer(TimeService ts) {
this.timeService = ts;
this.lastResetTime = ts.getTime();
this.constructionTime = this.lastResetTime;
@@ -164,7 +164,7 @@ public class NanoTimer {
/**
* Allows unit tests to insert a deterministic clock for testing.
*/
- public interface TimeService {
+ interface TimeService {
/**
* Returns the current time.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index 7638cb3..210539b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -1265,7 +1265,7 @@ public class LocalizedStrings {
"Could not free space in {0} directory. The space used is {1} which exceeds the configured limit of {2}.");
public static final StringId ManagerLogWriter_DELETED_INACTIVE__0___1_ =
- new StringId(1797, "Deleted inactive {0} \"{1}\".");
+ new StringId(1797, "Deleted inactive {0} \"{1}\".");
public static final StringId ManagerLogWriter_SWITCHING_TO_LOG__0 =
new StringId(1798, "Switching to log {0}");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
index 494362c..6d7b967 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
@@ -89,20 +89,12 @@ public abstract class HostStatSampler
private final CallbackSampler callbackSampler;
- private final NanoTimer timer;
-
protected HostStatSampler(CancelCriterion stopper, StatSamplerStats samplerStats) {
- this(stopper, samplerStats, new NanoTimer());
- }
-
- protected HostStatSampler(CancelCriterion stopper, StatSamplerStats samplerStats,
- NanoTimer timer) {
this.stopper = stopper;
this.statSamplerInitializedLatch = new StoppableCountDownLatch(this.stopper, 1);
this.samplerStats = samplerStats;
this.fileSizeLimitInKB = Boolean.getBoolean(TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY);
this.callbackSampler = new CallbackSampler(stopper, samplerStats);
- this.timer = timer;
}
public final StatSamplerStats getStatSamplerStats() {
@@ -179,6 +171,8 @@ public abstract class HostStatSampler
*/
@Override
public final void run() {
+ NanoTimer timer = new NanoTimer();
+
final boolean isDebugEnabled_STATISTICS = logger.isTraceEnabled(LogMarker.STATISTICS);
if (isDebugEnabled_STATISTICS) {
logger.trace(LogMarker.STATISTICS, "HostStatSampler started");
@@ -188,7 +182,7 @@ public abstract class HostStatSampler
initSpecialStats();
this.sampleCollector = new SampleCollector(this);
- this.sampleCollector.initialize(this, timer.getTime());
+ this.sampleCollector.initialize(this, NanoTimer.getTime());
this.statSamplerInitializedLatch.countDown();
latchCountedDown = true;
@@ -203,7 +197,7 @@ public abstract class HostStatSampler
}
final long nanosBeforeSleep = timer.getLastResetTime();
final long nanosToDelay = nanosLastTimeStamp + getNanoRate();
- delay(nanosToDelay);
+ delay(timer, nanosToDelay);
nanosLastTimeStamp = timer.getLastResetTime();
if (!stopRequested() && isSamplingEnabled()) {
final long nanosTimeStamp = timer.getLastResetTime();
@@ -377,21 +371,11 @@ public abstract class HostStatSampler
* @since GemFire 7.0
*/
public final boolean waitForInitialization(long ms) throws InterruptedException {
- return awaitInitialization(ms, TimeUnit.MILLISECONDS);
- }
-
- /**
- * Awaits the initialization of special statistics.
- *
- * @see #initSpecialStats
- */
- public final boolean awaitInitialization(final long timeout, final TimeUnit unit)
- throws InterruptedException {
- return this.statSamplerInitializedLatch.await(timeout, unit);
+ return this.statSamplerInitializedLatch.await(ms);
}
public final void changeArchive(File newFile) {
- this.sampleCollector.changeArchive(newFile, timer.getTime());
+ this.sampleCollector.changeArchive(newFile, NanoTimer.getTime());
}
/**
@@ -492,9 +476,10 @@ public abstract class HostStatSampler
}
/**
+ * @param timer a NanoTimer used to compute the elapsed delay
* @param nanosToDelay the timestamp to delay until it is the current time
*/
- private void delay(final long nanosToDelay) throws InterruptedException {
+ private void delay(NanoTimer timer, final long nanosToDelay) throws InterruptedException {
timer.reset();
long now = timer.getLastResetTime();
long remainingNanos = nanosToDelay - now;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
index 4892226..610e848 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
@@ -366,8 +366,7 @@ public class SampleCollector {
}
// notify unmarked/new handlers but not marked/old handlers
- notifyNewHandlersOfResources(handlers, this.resourceTypeMap.values(),
- this.resourceInstMap.values());
+ notifyNewHandlersOfResources(handlers, this.resourceInstMap.values());
}
private ResourceType getResourceType(List<MarkableSampleHandler> handlers, Statistics statistics)
@@ -490,7 +489,7 @@ public class SampleCollector {
}
private void notifyNewHandlersOfResources(List<MarkableSampleHandler> handlers,
- Collection<ResourceType> types, Collection<ResourceInstance> resources) {
+ Collection<ResourceInstance> resources) {
final boolean isDebugEnabled_STATISTICS = logger.isTraceEnabled(LogMarker.STATISTICS);
if (isDebugEnabled_STATISTICS) {
logger.trace(LogMarker.STATISTICS,
@@ -510,11 +509,6 @@ public class SampleCollector {
// allocatedResourceInstance...
handler.allocatedResourceInstance(resourceInstance);
}
- for (ResourceType resourceType : types) {
- if (!allocatedResourceTypes.contains(resourceType)) {
- handler.allocatedResourceType(resourceType);
- }
- }
handler.mark();
count++;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
index 1707397..7eaa1e0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
@@ -19,7 +19,6 @@ import java.io.File;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
@@ -59,11 +58,7 @@ public class SimpleStatSampler extends HostStatSampler {
private final StatisticsManager sm;
public SimpleStatSampler(CancelCriterion stopper, StatisticsManager sm) {
- this(stopper, sm, new NanoTimer());
- }
-
- public SimpleStatSampler(CancelCriterion stopper, StatisticsManager sm, NanoTimer timer) {
- super(stopper, new StatSamplerStats(sm, sm.getId()), timer);
+ super(stopper, new StatSamplerStats(sm, sm.getId()));
this.sm = sm;
logger.info(LogMarker.STATISTICS, LocalizedMessage
.create(LocalizedStrings.SimpleStatSampler_STATSSAMPLERATE_0, getSampleRate()));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
index 4726e51..740fd7f 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
@@ -46,7 +46,6 @@ public class StoppableCountDownLatch {
/**
* @param count the number of times {@link #countDown} must be invoked before threads can pass
* through {@link #await()}
- *
* @throws IllegalArgumentException if {@code count} is negative
*/
public StoppableCountDownLatch(CancelCriterion stopper, int count) {
@@ -69,19 +68,14 @@ public class StoppableCountDownLatch {
/**
* @param msTimeout how long to wait in milliseconds
- *
* @return true if it was unlatched
+ * @throws InterruptedException
*/
public boolean await(long msTimeout) throws InterruptedException {
stopper.checkCancelInProgress(null);
return latch.await(msTimeout, TimeUnit.MILLISECONDS);
}
- public boolean await(final long timeout, final TimeUnit unit) throws InterruptedException {
- stopper.checkCancelInProgress(null);
- return latch.await(timeout, unit);
- }
-
public synchronized void countDown() {
latch.countDown();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
deleted file mode 100644
index 541bf54..0000000
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal.statistics;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.io.File;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
-
-import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
-@Category(IntegrationTest.class)
-public class DiskSpaceLimitIntegrationTest {
-
- private static final long FILE_SIZE_LIMIT = 1024 * 1;
- private static final long DISK_SPACE_LIMIT = Long.MAX_VALUE;
-
- private File dir;
- private String archiveFileName;
-
- private LocalStatisticsFactory factory;
- private StatisticDescriptor[] statisticDescriptors;
- private StatisticsType statisticsType;
- private Statistics statistics;
-
- private SampleCollector sampleCollector;
- private StatArchiveHandlerConfig config;
-
- @Rule
- public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void setUp() throws Exception {
- this.dir = this.temporaryFolder.getRoot();
- this.archiveFileName =
- new File(this.dir, this.testName.getMethodName() + ".gfs").getAbsolutePath();
-
- this.factory = new LocalStatisticsFactory(null);
- this.statisticDescriptors = new StatisticDescriptor[] {
- this.factory.createIntCounter("stat1", "description of stat1", "units", true),};
- this.statisticsType =
- factory.createType("statisticsType1", "statisticsType1", this.statisticDescriptors);
- this.statistics = factory.createAtomicStatistics(this.statisticsType, "statistics1", 1);
-
- StatisticsSampler sampler = mock(StatisticsSampler.class);
- when(sampler.getStatistics()).thenReturn(this.factory.getStatistics());
-
- this.config = mock(StatArchiveHandlerConfig.class);
- when(this.config.getArchiveFileName()).thenReturn(new File(this.archiveFileName));
- when(this.config.getArchiveFileSizeLimit()).thenReturn(FILE_SIZE_LIMIT);
- when(this.config.getSystemId()).thenReturn(1L);
- when(this.config.getSystemStartTime()).thenReturn(System.currentTimeMillis());
- when(this.config.getSystemDirectoryPath())
- .thenReturn(this.temporaryFolder.getRoot().getAbsolutePath());
- when(this.config.getProductDescription()).thenReturn(this.testName.getMethodName());
- when(this.config.getArchiveDiskSpaceLimit()).thenReturn(DISK_SPACE_LIMIT);
-
- this.sampleCollector = new SampleCollector(sampler);
- this.sampleCollector.initialize(this.config, NanoTimer.getTime());
- }
-
- @After
- public void tearDown() throws Exception {
- StatisticsTypeFactoryImpl.clear();
- }
-
- @Test
- public void zeroKeepsAllFiles() throws Exception {
- when(this.config.getArchiveDiskSpaceLimit()).thenReturn(0L);
- sampleUntilFileExists(archiveFile(1));
- sampleUntilFileExists(archiveFile(2));
- assertThat(archiveFile(1)).exists();
- assertThat(archiveFile(2)).exists();
- }
-
- @Test
- public void sameKeepsOneFile() throws Exception {
- when(this.config.getArchiveDiskSpaceLimit()).thenReturn(FILE_SIZE_LIMIT * 2);
- sampleUntilFileExists(archiveFile(1));
- sampleUntilFileExists(archiveFile(2));
- assertThat(archiveFile(1)).doesNotExist();
- assertThat(archiveFile(2)).exists();
- }
-
- private File archiveFile(final int child) {
- return new File(this.dir,
- this.testName.getMethodName() + "-01-" + String.format("%02d", child) + ".gfs");
- }
-
- private void sampleUntilFileExists(final File file)
- throws InterruptedException, TimeoutException {
- long end = System.nanoTime() + MINUTES.toNanos(1);
- while (!file.exists() && System.nanoTime() < end) {
- sample();
- }
- if (!file.exists()) {
- throw new TimeoutException("File " + file + " does not exist within " + 1 + " " + MINUTES);
- }
- }
-
- private void sample() {
- getSampleCollector().sample(System.nanoTime());
- }
-
- private SampleCollector getSampleCollector() {
- return this.sampleCollector;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
deleted file mode 100644
index 5bf31b7..0000000
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal.statistics;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.io.File;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
-
-import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
-@Category(IntegrationTest.class)
-public class FileSizeLimitIntegrationTest {
-
- private static final long FILE_SIZE_LIMIT = 1024 * 1;
-
- private File dir;
- private String archiveFileName;
-
- private LocalStatisticsFactory factory;
- private StatisticDescriptor[] statisticDescriptors;
- private StatisticsType statisticsType;
- private Statistics statistics;
-
- private SampleCollector sampleCollector;
-
- @Rule
- public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void setUp() throws Exception {
- this.dir = this.temporaryFolder.getRoot();
- this.archiveFileName =
- new File(this.dir, this.testName.getMethodName() + ".gfs").getAbsolutePath();
-
- this.factory = new LocalStatisticsFactory(null);
- this.statisticDescriptors = new StatisticDescriptor[] {
- this.factory.createIntCounter("stat1", "description of stat1", "units", true),};
- this.statisticsType =
- factory.createType("statisticsType1", "statisticsType1", this.statisticDescriptors);
- this.statistics = factory.createAtomicStatistics(this.statisticsType, "statistics1", 1);
-
- StatisticsSampler sampler = mock(StatisticsSampler.class);
- when(sampler.getStatistics()).thenReturn(this.factory.getStatistics());
-
- StatArchiveHandlerConfig config = mock(StatArchiveHandlerConfig.class);
- when(config.getArchiveFileName()).thenReturn(new File(this.archiveFileName));
- when(config.getArchiveFileSizeLimit()).thenReturn(FILE_SIZE_LIMIT);
- when(config.getSystemId()).thenReturn(1L);
- when(config.getSystemStartTime()).thenReturn(System.currentTimeMillis());
- when(config.getSystemDirectoryPath())
- .thenReturn(this.temporaryFolder.getRoot().getAbsolutePath());
- when(config.getProductDescription()).thenReturn(this.testName.getMethodName());
- when(config.getArchiveDiskSpaceLimit()).thenReturn(0L);
-
- this.sampleCollector = new SampleCollector(sampler);
- this.sampleCollector.initialize(config, NanoTimer.getTime());
- }
-
- @After
- public void tearDown() throws Exception {
- StatisticsTypeFactoryImpl.clear();
- }
-
- private File archiveFile(final int child) {
- return new File(this.dir,
- this.testName.getMethodName() + "-01-" + String.format("%02d", child) + ".gfs");
- }
-
- @Test
- public void rollsWhenLimitIsReached() throws Exception { // TODO: add test to assert size is
- // correct
- sampleUntilFileExists(archiveFile(1));
- sampleUntilFileExists(archiveFile(2));
- assertThat(archiveFile(1)).exists();
- assertThat(archiveFile(2)).exists();
- }
-
- private void sampleUntilFileExists(final File file)
- throws InterruptedException, TimeoutException {
- long end = System.nanoTime() + MINUTES.toNanos(1);
- while (!file.exists() && System.nanoTime() < end) {
- sample();
- }
- if (!file.exists()) {
- throw new TimeoutException("File " + file + " does not exist within " + 1 + " " + MINUTES);
- }
- }
-
- private void sample() {
- getSampleCollector().sample(System.nanoTime());
- }
-
- private SampleCollector getSampleCollector() {
- return this.sampleCollector;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
deleted file mode 100644
index 9896ec2..0000000
--- a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.internal.statistics;
-
-import static java.util.concurrent.TimeUnit.*;
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.TimeoutException;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TemporaryFolder;
-import org.junit.rules.TestName;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
-
-import org.apache.geode.StatisticDescriptor;
-import org.apache.geode.Statistics;
-import org.apache.geode.StatisticsType;
-import org.apache.geode.internal.NanoTimer;
-import org.apache.geode.internal.statistics.StatArchiveReader.ResourceInst;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
-@Category(IntegrationTest.class)
-public class StatTypesAreRolledOverRegressionTest {
-
- private static final long FILE_SIZE_LIMIT = 1024 * 1;
-
- private File dir;
- private String archiveFileName;
-
- private LocalStatisticsFactory factory;
- private StatisticDescriptor[] statisticDescriptors;
- private StatisticsType statisticsType;
- private Statistics statistics;
-
- private SampleCollector sampleCollector;
-
- private NanoTimer timer = new NanoTimer();
- private long nanosTimeStamp;
-
- @Rule
- public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
- @Rule
- public TemporaryFolder temporaryFolder = new TemporaryFolder();
- @Rule
- public TestName testName = new TestName();
-
- @Before
- public void setUp() throws Exception {
- this.dir = this.temporaryFolder.getRoot();
- this.archiveFileName =
- new File(this.dir, this.testName.getMethodName() + ".gfs").getAbsolutePath();
-
- this.factory = new LocalStatisticsFactory(null);
- this.statisticDescriptors = new StatisticDescriptor[] {
- this.factory.createIntCounter("stat1", "description of stat1", "units", true),};
- this.statisticsType =
- factory.createType("statisticsType1", "statisticsType1", this.statisticDescriptors);
- this.statistics = factory.createAtomicStatistics(this.statisticsType, "statistics1", 1);
-
- Answer<Statistics[]> statisticsAnswer = new Answer<Statistics[]>() {
- public Statistics[] answer(InvocationOnMock invocation) throws Throwable {
- return factory.getStatistics();
- }
- };
-
- Answer<Integer> modCountAnswer = new Answer<Integer>() {
- public Integer answer(InvocationOnMock invocation) throws Throwable {
- return factory.getStatListModCount();
- }
- };
-
- StatisticsSampler sampler = mock(StatisticsSampler.class);
- when(sampler.getStatistics()).thenAnswer(statisticsAnswer);
- when(sampler.getStatisticsModCount()).thenAnswer(modCountAnswer);
-
- StatArchiveHandlerConfig config = mock(StatArchiveHandlerConfig.class);
- when(config.getArchiveFileName()).thenReturn(new File(this.archiveFileName));
- when(config.getArchiveFileSizeLimit()).thenReturn(FILE_SIZE_LIMIT);
- when(config.getSystemId()).thenReturn(1L);
- when(config.getSystemStartTime()).thenReturn(System.currentTimeMillis());
- when(config.getSystemDirectoryPath())
- .thenReturn(this.temporaryFolder.getRoot().getAbsolutePath());
- when(config.getProductDescription()).thenReturn(this.testName.getMethodName());
- when(config.getArchiveDiskSpaceLimit()).thenReturn(0L);
-
- this.sampleCollector = new SampleCollector(sampler);
- this.sampleCollector.initialize(config, this.timer.getTime());
-
- this.timer.reset();
- this.nanosTimeStamp = this.timer.getLastResetTime() - getNanoRate();
- }
-
- @After
- public void tearDown() throws Exception {
- StatisticsTypeFactoryImpl.clear();
- }
-
- @Test
- public void closedInstanceShouldHaveTypeInRolledArchives() throws Exception {
- // initial state
- verifyStatisticsTypeIsInArchiveFile(archiveFile(), 0);
-
- // one sample
- sample(advanceNanosTimeStamp());
- verifyStatisticsTypeIsInArchiveFile(archiveFile(), 1);
-
- // close stats
- this.statistics.close();
-
- assertThat(archiveFile(1)).doesNotExist();
-
- // cause roll
- sampleUntilFileExists(archiveFile(1));
-
- sample(advanceNanosTimeStamp());
- verifyStatisticsTypeIsInArchiveFile(archiveFile(), 0);
-
- this.statistics = factory.createAtomicStatistics(this.statisticsType, "statistics1", 2);
-
- sample(advanceNanosTimeStamp());
- verifyStatisticsTypeIsInArchiveFile(archiveFile(), 1); // should be corrupt?
-
- }
-
- private void verifyStatisticsTypeIsInArchiveFile(final File archiveFile,
- final int expectedResources) throws IOException {
- StatArchiveReader reader = new StatArchiveReader(new File[] {archiveFile}, null, false);
-
- // compare all resourceInst values against what was printed above
-
- List<ResourceInst> resources = reader.getResourceInstList();
- if (expectedResources > 0) {
- assertThat(resources).hasAtLeastOneElementOfType(ResourceInst.class);
- }
-
- for (ResourceInst resourceInstance : resources) {
- if (resourceInstance == null)
- continue;
- assertThat(resourceInstance.getName()).isNotNull();
- assertThat(resourceInstance.getType()).isNotNull();
- assertThat(resourceInstance.getType().getName()).isEqualTo(this.statisticsType.getName());
- }
- }
-
- private void sampleUntilFileExists(final File file)
- throws InterruptedException, TimeoutException {
- long timeout = System.nanoTime() + MINUTES.toNanos(1);
- int count = 0;
- do {
- sample(advanceNanosTimeStamp());
- count++;
- } while (!file.exists() && System.nanoTime() < timeout);
- if (!file.exists()) {
- throw new TimeoutException("File " + file + " does not exist within " + 1 + " " + MINUTES);
- }
- }
-
- private void sample(final long time) {
- getSampleCollector().sample(time);
- }
-
- private SampleCollector getSampleCollector() {
- return this.sampleCollector;
- }
-
- private File archiveFile(final int child) {
- return new File(this.dir,
- this.testName.getMethodName() + "-01-" + String.format("%02d", child) + ".gfs");
- }
-
- private File archiveFile() {
- return new File(this.archiveFileName);
- }
-
- private long advanceNanosTimeStamp() {
- this.nanosTimeStamp += getNanoRate();
- return this.nanosTimeStamp;
- }
-
- private long getNanoRate() {
- return NanoTimer.millisToNanos(getSampleRate());
- }
-
- private long getSampleRate() {
- return 1000; // 1 second
- }
-}
[16/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
index 07a95df..4e53b07 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -46,19 +44,19 @@ import org.apache.geode.internal.util.IOUtils;
/**
* Provides the JMX Agent configuration properties.
* <p>
- * Supports importing of persisted properties from an external configuration
- * file.
+ * Supports importing of persisted properties from an external configuration file.
* <p>
- * Select values can also be overridden with command line arguments. See
- * remarks on individual properties for further information.
+ * Select values can also be overridden with command line arguments. See remarks on individual
+ * properties for further information.
* <p>
* Extends and implements DistributedSystemConfig.
- * @since GemFire 3.5 (in which it was named AgentConfig)
+ *
+ * @since GemFire 3.5 (in which it was named AgentConfig)
*/
public class AgentConfigImpl extends DistributedSystemConfigImpl implements AgentConfig {
// -------------------------------------------------------------------------
- // Static class variable(s)
+ // Static class variable(s)
// -------------------------------------------------------------------------
/**
@@ -77,7 +75,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
public static final String AGENT_PROPSFILE_PROPERTY_NAME = "gfAgentPropertyFile";
// -------------------------------------------------------------------------
- // DistributionLocator properties...
+ // DistributionLocator properties...
// -------------------------------------------------------------------------
/**
@@ -112,44 +110,42 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* The default log file for stand-alone JMX agents
*/
- /*package scope*/
+ /* package scope */
static final String DEFAULT_LOG_FILE = "agent.log";
/**
* The default startup log file to be used by agent launcher
*/
- /*package scope*/
+ /* package scope */
static final String DEFAULT_STARTUP_LOG_FILE = "start_agent.log";
private static String OBFUSCATED_STRING = "********";
- ////////////////////// Static Methods //////////////////////
+ ////////////////////// Static Methods //////////////////////
/**
- * The <code>propertyFile</code> is the name of the property file that will
- * be loaded on startup of the Agent.
+ * The <code>propertyFile</code> is the name of the property file that will be loaded on startup
+ * of the Agent.
* <p>
* The file will be searched for, in order, in the following directories:
* <ol>
- * <li> the current directory
- * <li> the home directory
- * <li> the class path
+ * <li>the current directory
+ * <li>the home directory
+ * <li>the class path
* </ol>
* Only the first file found will be used.
* <p>
- * The default value of propertyFile is <code>"agent.properties"</code>. However
- * if the "gfAgentPropertyFile" system property is set then its value is the
- * value of propertyFile. If this value is a relative file system path then
- * the above search is done. If its an absolute file system path then that
- * file must exist; no search for it is done.
+ * The default value of propertyFile is <code>"agent.properties"</code>. However if the
+ * "gfAgentPropertyFile" system property is set then its value is the value of propertyFile. If
+ * this value is a relative file system path then the above search is done. If its an absolute
+ * file system path then that file must exist; no search for it is done.
*/
static String retrievePropertyFile() {
return System.getProperty(AGENT_PROPSFILE_PROPERTY_NAME, DEFAULT_PROPERTY_FILE);
}
/**
- * Creates a new <code>Properties</code> object that contains all of
- * the default values.
+ * Creates a new <code>Properties</code> object that contains all of the default values.
*/
private static Properties getDefaultProperties() {
Properties props = new Properties();
@@ -159,9 +155,12 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
props.setProperty(HTTP_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_ENABLED));
props.setProperty(HTTP_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_HTTP_BIND_ADDRESS));
props.setProperty(HTTP_PORT_NAME, String.valueOf(DEFAULT_HTTP_PORT));
- props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
- props.setProperty(HTTP_AUTHENTICATION_USER_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
- props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
+ props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME,
+ String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
+ props.setProperty(HTTP_AUTHENTICATION_USER_NAME,
+ String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
+ props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME,
+ String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
props.setProperty(RMI_ENABLED_NAME, String.valueOf(DEFAULT_RMI_ENABLED));
props.setProperty(RMI_REGISTRY_ENABLED_NAME, String.valueOf(DEFAULT_RMI_REGISTRY_ENABLED));
@@ -175,15 +174,17 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
props.setProperty(AGENT_SSL_ENABLED_NAME, String.valueOf(DEFAULT_AGENT_SSL_ENABLED));
props.setProperty(AGENT_SSL_PROTOCOLS_NAME, String.valueOf(DEFAULT_AGENT_SSL_PROTOCOLS));
props.setProperty(AGENT_SSL_CIPHERS_NAME, String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
- props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME,
+ String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME,
+ String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
return props;
}
/**
- * Returns default values for all valid agent properties as a Properties
- * object.
+ * Returns default values for all valid agent properties as a Properties object.
+ *
* @return default values for all valid agent properties
*/
static Properties getDefaultValuesForAllProperties() {
@@ -197,11 +198,14 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
props.setProperty(HTTP_PORT_NAME, String.valueOf(DEFAULT_HTTP_PORT));
- props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
+ props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME,
+ String.valueOf(DEFAULT_HTTP_AUTHENTICATION_ENABLED));
- props.setProperty(HTTP_AUTHENTICATION_USER_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
+ props.setProperty(HTTP_AUTHENTICATION_USER_NAME,
+ String.valueOf(DEFAULT_HTTP_AUTHENTICATION_USER));
- props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME, String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
+ props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME,
+ String.valueOf(DEFAULT_HTTP_AUTHENTICATION_PASSWORD));
props.setProperty(RMI_ENABLED_NAME, String.valueOf(DEFAULT_RMI_ENABLED));
@@ -223,13 +227,16 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
props.setProperty(AGENT_SSL_CIPHERS_NAME, String.valueOf(DEFAULT_AGENT_SSL_CIPHERS));
- props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME,
+ String.valueOf(DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION));
- props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME,
+ String.valueOf(DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION));
props.setProperty(SNMP_BIND_ADDRESS_NAME, String.valueOf(DEFAULT_SNMP_BIND_ADDRESS));
- props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME, String.valueOf(DEFAULT_EMAIL_NOTIFICATIONS_ENABLED));
+ props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME,
+ String.valueOf(DEFAULT_EMAIL_NOTIFICATIONS_ENABLED));
props.setProperty(EMAIL_NOTIFICATIONS_HOST_NAME, String.valueOf(DEFAULT_EMAIL_HOST));
@@ -245,7 +252,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
props.setProperty(CLUSTER_SSL_CIPHERS, String.valueOf(DEFAULT_SSL_CIPHERS));
- props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, String.valueOf(DEFAULT_SSL_REQUIRE_AUTHENTICATION));
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION,
+ String.valueOf(DEFAULT_SSL_REQUIRE_AUTHENTICATION));
props.setProperty(ENTITY_CONFIG_XML_FILE_NAME, String.valueOf(DEFAULT_ENTITY_CONFIG_XML_FILE));
@@ -274,7 +282,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
// -------------------------------------------------------------------------
- // Member variable(s)
+ // Member variable(s)
// -------------------------------------------------------------------------
/**
@@ -303,9 +311,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
private boolean agentSSLRequireAuth;
/**
- * HttpAdaptor won't work with ssl authentication required, so this attribute
- * allows this option to be turned on for RMI but off for HTTP in the event
- * that both adaptors are being used with ssl.
+ * HttpAdaptor won't work with ssl authentication required, so this attribute allows this option
+ * to be turned on for RMI but off for HTTP in the event that both adaptors are being used with
+ * ssl.
*/
private boolean httpSSLRequireAuth;
@@ -405,8 +413,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
private String stateSaveFile;
/**
- * Describes the property file used to load configuration from.
- * Null if no file was found.
+ * Describes the property file used to load configuration from. Null if no file was found.
*/
private URL url;
@@ -416,27 +423,25 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
private String[] originalCmdLineArgs = null;
/**
- * The <code>Agent</code> that is configured by this
- * <code>AgentConfigImpl</code>
+ * The <code>Agent</code> that is configured by this <code>AgentConfigImpl</code>
*/
private Agent agent;
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
/**
- * Constructs new instance of <code>AgentConfigImpl</code> with the
- * default configuration.
+ * Constructs new instance of <code>AgentConfigImpl</code> with the default configuration.
*/
public AgentConfigImpl() {
this(getDefaultProperties());
}
/**
- * Constructs new instance of AgentConfig. Supplied command-line arguments
- * are used to create a set of non-default properties for initializing this
- * AgentConfig.
+ * Constructs new instance of AgentConfig. Supplied command-line arguments are used to create a
+ * set of non-default properties for initializing this AgentConfig.
+ *
* @param args array of non-default configuration arguments
*/
public AgentConfigImpl(String[] args) {
@@ -445,13 +450,14 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
/**
- * Creates a new <code>AgentConfig</code> with the given non-default
- * configuration properties.
+ * Creates a new <code>AgentConfig</code> with the given non-default configuration properties.
+ *
* @param props overriding non-default configuration properties
*/
public AgentConfigImpl(Properties props) {
// for admin bug #40434
- super(filterOutAgentProperties(appendOptionalPropertyFileProperties(props)), true/*ignore gemfire.properties*/);
+ super(filterOutAgentProperties(appendOptionalPropertyFileProperties(props)),
+ true/* ignore gemfire.properties */);
// first get any property values set in the optional property file
this.url = getPropertyFileURL(retrievePropertyFile());
@@ -461,6 +467,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Constructs new instance of AgentConfig using the specified property file.
+ *
* @param propFile the file to load configuration properties from
*/
public AgentConfigImpl(File propFile) {
@@ -474,62 +481,68 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
props.load(in);
in.close();
} catch (java.io.IOException e) {
- throw new GemFireIOException(LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(propFile), e);
+ throw new GemFireIOException(
+ LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(propFile), e);
}
} else {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_SPECIFIED_PROPERTIES_FILE_DOES_NOT_EXIST_0.toLocalizedString(propFile));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_SPECIFIED_PROPERTIES_FILE_DOES_NOT_EXIST_0
+ .toLocalizedString(propFile));
}
initialize(props);
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Sets the <code>Agent</code> associated with this
- * <code>AgentConfigImpl</code>.
+ * Sets the <code>Agent</code> associated with this <code>AgentConfigImpl</code>.
*/
void setAgent(Agent agent) {
this.agent = agent;
}
/**
- * Checks to see if this config object is "read only". If it is,
- * then an {@link IllegalStateException} is thrown.
+ * Checks to see if this config object is "read only". If it is, then an
+ * {@link IllegalStateException} is thrown.
+ *
* @since GemFire 4.0
*/
@Override
protected void checkReadOnly() {
if (this.agent != null) {
- throw new IllegalStateException(LocalizedStrings.AgentConfigImpl_AN_AGENTCONFIG_OBJECT_CANNOT_BE_MODIFIED_AFTER_IT_HAS_BEEN_USED_TO_CREATE_AN_AGENT.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.AgentConfigImpl_AN_AGENTCONFIG_OBJECT_CANNOT_BE_MODIFIED_AFTER_IT_HAS_BEEN_USED_TO_CREATE_AN_AGENT
+ .toLocalizedString());
}
super.checkReadOnly();
}
// -------------------------------------------------------------------------
- // Methods for handling Properties and the Properties file
+ // Methods for handling Properties and the Properties file
// -------------------------------------------------------------------------
/**
- * Returns a description of the property file used to load this config.
- * If no property file was used then the description will say so.
+ * Returns a description of the property file used to load this config. If no property file was
+ * used then the description will say so.
*/
public String getPropertyFileDescription() {
/*
- * Checking if the specified or the default properties file exists. If not,
- * just log this as an information.
+ * Checking if the specified or the default properties file exists. If not, just log this as an
+ * information.
*/
if (this.url == null) {
- return LocalizedStrings.AgentConfigImpl_USING_DEFAULT_CONFIGURATION_BECAUSE_PROPERTY_FILE_WAS_FOUND.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_USING_DEFAULT_CONFIGURATION_BECAUSE_PROPERTY_FILE_WAS_FOUND
+ .toLocalizedString();
} else {
- return LocalizedStrings.AgentConfigImpl_CONFIGURATION_LOADED_FROM_0.toLocalizedString(this.url);
+ return LocalizedStrings.AgentConfigImpl_CONFIGURATION_LOADED_FROM_0
+ .toLocalizedString(this.url);
}
}
/**
- * Returns the default property file that will be used when configuration
- * is saved.
+ * Returns the default property file that will be used when configuration is saved.
*/
public File getPropertyFile() {
File f;
@@ -546,8 +559,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
/**
- * Converts the contents of this config to a property instance and Stringifies
- * it
+ * Converts the contents of this config to a property instance and Stringifies it
+ *
* @return contents of this config as String
*/
public String toPropertiesAsString() {
@@ -569,6 +582,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Converts the contents of this config to a property instance.
+ *
* @return contents of this config as java.util.Properties
*/
public Properties toProperties() {
@@ -577,8 +591,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Converts the contents of this config to a property instance.
+ *
* @param includeDSProperties Should distributed system properties be included in the
- * <code>Properties</code> object? See bug 32682.
+ * <code>Properties</code> object? See bug 32682.
*
* @return contents of this config as java.util.Properties
*/
@@ -588,50 +603,70 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
props.setProperty(AUTO_CONNECT_NAME, toString(AUTO_CONNECT_NAME, getAutoConnect()));
props.setProperty(HTTP_ENABLED_NAME, toString(HTTP_ENABLED_NAME, isHttpEnabled()));
- props.setProperty(HTTP_BIND_ADDRESS_NAME, toString(HTTP_BIND_ADDRESS_NAME, getHttpBindAddress()));
+ props.setProperty(HTTP_BIND_ADDRESS_NAME,
+ toString(HTTP_BIND_ADDRESS_NAME, getHttpBindAddress()));
props.setProperty(HTTP_PORT_NAME, toString(HTTP_PORT_NAME, getHttpPort()));
props.setProperty(RMI_ENABLED_NAME, toString(RMI_ENABLED_NAME, isRmiEnabled()));
- props.setProperty(RMI_REGISTRY_ENABLED_NAME, toString(RMI_REGISTRY_ENABLED_NAME, isRmiRegistryEnabled()));
+ props.setProperty(RMI_REGISTRY_ENABLED_NAME,
+ toString(RMI_REGISTRY_ENABLED_NAME, isRmiRegistryEnabled()));
props.setProperty(RMI_BIND_ADDRESS_NAME, toString(RMI_BIND_ADDRESS_NAME, getRmiBindAddress()));
props.setProperty(RMI_PORT_NAME, toString(RMI_PORT_NAME, getRmiPort()));
props.setProperty(RMI_SERVER_PORT_NAME, toString(RMI_SERVER_PORT_NAME, getRmiServerPort()));
props.setProperty(SNMP_ENABLED_NAME, toString(SNMP_ENABLED_NAME, isSnmpEnabled()));
- props.setProperty(SNMP_BIND_ADDRESS_NAME, toString(SNMP_BIND_ADDRESS_NAME, getSnmpBindAddress()));
+ props.setProperty(SNMP_BIND_ADDRESS_NAME,
+ toString(SNMP_BIND_ADDRESS_NAME, getSnmpBindAddress()));
props.setProperty(SNMP_DIRECTORY_NAME, toString(SNMP_DIRECTORY_NAME, getSnmpDirectory()));
- props.setProperty(AGENT_SSL_ENABLED_NAME, toString(AGENT_SSL_ENABLED_NAME, isAgentSSLEnabled()));
- props.setProperty(AGENT_SSL_PROTOCOLS_NAME, toString(AGENT_SSL_PROTOCOLS_NAME, getAgentSSLProtocols()));
- props.setProperty(AGENT_SSL_CIPHERS_NAME, toString(AGENT_SSL_CIPHERS_NAME, getAgentSSLCiphers()));
- props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME, toString(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME, isAgentSSLRequireAuth()));
- props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME, toString(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME, isHttpSSLRequireAuth()));
-
- props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME, toString(HTTP_AUTHENTICATION_ENABLED_NAME, isHttpAuthEnabled()));
- props.setProperty(HTTP_AUTHENTICATION_USER_NAME, toString(HTTP_AUTHENTICATION_USER_NAME, getHttpAuthUser()));
- props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME, toString(HTTP_AUTHENTICATION_PASSWORD_NAME, getHttpAuthPassword()));
-
- props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME, toString(EMAIL_NOTIFICATIONS_ENABLED_NAME, isEmailNotificationEnabled()));
- props.setProperty(EMAIL_NOTIFICATIONS_HOST_NAME, toString(EMAIL_NOTIFICATIONS_HOST_NAME, getEmailNotificationHost()));
- props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME, toString(EMAIL_NOTIFICATIONS_FROM_NAME, getEmailNotificationFrom()));
- props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME, toString(EMAIL_NOTIFICATIONS_TO_LIST_NAME, getEmailNotificationToList()));
+ props.setProperty(AGENT_SSL_ENABLED_NAME,
+ toString(AGENT_SSL_ENABLED_NAME, isAgentSSLEnabled()));
+ props.setProperty(AGENT_SSL_PROTOCOLS_NAME,
+ toString(AGENT_SSL_PROTOCOLS_NAME, getAgentSSLProtocols()));
+ props.setProperty(AGENT_SSL_CIPHERS_NAME,
+ toString(AGENT_SSL_CIPHERS_NAME, getAgentSSLCiphers()));
+ props.setProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME,
+ toString(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME, isAgentSSLRequireAuth()));
+ props.setProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME,
+ toString(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME, isHttpSSLRequireAuth()));
+
+ props.setProperty(HTTP_AUTHENTICATION_ENABLED_NAME,
+ toString(HTTP_AUTHENTICATION_ENABLED_NAME, isHttpAuthEnabled()));
+ props.setProperty(HTTP_AUTHENTICATION_USER_NAME,
+ toString(HTTP_AUTHENTICATION_USER_NAME, getHttpAuthUser()));
+ props.setProperty(HTTP_AUTHENTICATION_PASSWORD_NAME,
+ toString(HTTP_AUTHENTICATION_PASSWORD_NAME, getHttpAuthPassword()));
+
+ props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME,
+ toString(EMAIL_NOTIFICATIONS_ENABLED_NAME, isEmailNotificationEnabled()));
+ props.setProperty(EMAIL_NOTIFICATIONS_HOST_NAME,
+ toString(EMAIL_NOTIFICATIONS_HOST_NAME, getEmailNotificationHost()));
+ props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME,
+ toString(EMAIL_NOTIFICATIONS_FROM_NAME, getEmailNotificationFrom()));
+ props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME,
+ toString(EMAIL_NOTIFICATIONS_TO_LIST_NAME, getEmailNotificationToList()));
props.setProperty(STATE_SAVE_FILE_NAME, toString(STATE_SAVE_FILE_NAME, getStateSaveFile()));
- props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME, toString(EMAIL_NOTIFICATIONS_ENABLED_NAME, isEmailNotificationEnabled()));
- props.setProperty(EMAIL_NOTIFICATIONS_HOST_NAME, toString(EMAIL_NOTIFICATIONS_HOST_NAME, getEmailNotificationHost()));
- props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME, toString(EMAIL_NOTIFICATIONS_FROM_NAME, getEmailNotificationFrom()));
- props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME, toString(EMAIL_NOTIFICATIONS_TO_LIST_NAME, getEmailNotificationToList()));
+ props.setProperty(EMAIL_NOTIFICATIONS_ENABLED_NAME,
+ toString(EMAIL_NOTIFICATIONS_ENABLED_NAME, isEmailNotificationEnabled()));
+ props.setProperty(EMAIL_NOTIFICATIONS_HOST_NAME,
+ toString(EMAIL_NOTIFICATIONS_HOST_NAME, getEmailNotificationHost()));
+ props.setProperty(EMAIL_NOTIFICATIONS_FROM_NAME,
+ toString(EMAIL_NOTIFICATIONS_FROM_NAME, getEmailNotificationFrom()));
+ props.setProperty(EMAIL_NOTIFICATIONS_TO_LIST_NAME,
+ toString(EMAIL_NOTIFICATIONS_TO_LIST_NAME, getEmailNotificationToList()));
props.setProperty(CLUSTER_SSL_ENABLED, toString(CLUSTER_SSL_ENABLED, isSSLEnabled()));
props.setProperty(CLUSTER_SSL_PROTOCOLS, toString(CLUSTER_SSL_PROTOCOLS, getSSLProtocols()));
props.setProperty(CLUSTER_SSL_CIPHERS, toString(CLUSTER_SSL_CIPHERS, getSSLCiphers()));
- props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION, toString(CLUSTER_SSL_REQUIRE_AUTHENTICATION, isSSLAuthenticationRequired()));
+ props.setProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION,
+ toString(CLUSTER_SSL_REQUIRE_AUTHENTICATION, isSSLAuthenticationRequired()));
Properties sslProps = getSSLProperties();
if (sslProps.size() > 0) {
int sequence = 0;
- for (Iterator iter = sslProps.keySet().iterator(); iter.hasNext(); ) {
+ for (Iterator iter = sslProps.keySet().iterator(); iter.hasNext();) {
String key = (String) iter.next();
String value = sslProps.getProperty(key);
props.setProperty("ssl-property-" + sequence, key + "=" + OBFUSCATED_STRING);
@@ -645,19 +680,24 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
DistributionLocatorConfig locator = configs[i];
props.setProperty(LOCATOR_HOST_NAME + i, toString(LOCATOR_HOST_NAME, locator.getHost()));
props.setProperty(LOCATOR_PORT_NAME + i, toString(LOCATOR_PORT_NAME, locator.getPort()));
- props.setProperty(LOCATOR_PRODUCT_DIRECTORY_NAME + i, toString(LOCATOR_PRODUCT_DIRECTORY_NAME, locator.getProductDirectory()));
- props.setProperty(LOCATOR_WORKING_DIRECTORY_NAME + i, toString(LOCATOR_WORKING_DIRECTORY_NAME, locator.getWorkingDirectory()));
- props.setProperty(LOCATOR_REMOTE_COMMAND + i, toString(LOCATOR_REMOTE_COMMAND, locator.getRemoteCommand()));
- props.setProperty(LOCATOR_BIND_ADDRESS + i, toString(LOCATOR_BIND_ADDRESS, locator.getBindAddress()));
- // props.setProperty(LOCATOR_DS_PROPERTIES + i,
- // getdsPropertiesString(locator));
+ props.setProperty(LOCATOR_PRODUCT_DIRECTORY_NAME + i,
+ toString(LOCATOR_PRODUCT_DIRECTORY_NAME, locator.getProductDirectory()));
+ props.setProperty(LOCATOR_WORKING_DIRECTORY_NAME + i,
+ toString(LOCATOR_WORKING_DIRECTORY_NAME, locator.getWorkingDirectory()));
+ props.setProperty(LOCATOR_REMOTE_COMMAND + i,
+ toString(LOCATOR_REMOTE_COMMAND, locator.getRemoteCommand()));
+ props.setProperty(LOCATOR_BIND_ADDRESS + i,
+ toString(LOCATOR_BIND_ADDRESS, locator.getBindAddress()));
+ // props.setProperty(LOCATOR_DS_PROPERTIES + i,
+ // getdsPropertiesString(locator));
}
}
if (includeDSProperties) {
- props.setProperty(ENTITY_CONFIG_XML_FILE_NAME, toString(ENTITY_CONFIG_XML_FILE_NAME, getEntityConfigXMLFile()));
+ props.setProperty(ENTITY_CONFIG_XML_FILE_NAME,
+ toString(ENTITY_CONFIG_XML_FILE_NAME, getEntityConfigXMLFile()));
// This could be different each time agent is started
- // props.setProperty(SYSTEM_ID_NAME, toString(getSystemId()));
+ // props.setProperty(SYSTEM_ID_NAME, toString(getSystemId()));
props.setProperty(MCAST_PORT, toString(MCAST_PORT, getMcastPort()));
props.setProperty(MCAST_ADDRESS, toString(MCAST_ADDRESS, getMcastAddress()));
props.setProperty(LOCATORS, toString(LOCATORS, getLocators()));
@@ -667,9 +707,12 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
props.setProperty(REMOTE_COMMAND_NAME, toString(REMOTE_COMMAND_NAME, getRemoteCommand()));
props.setProperty(LOG_FILE_NAME, toString(LOG_FILE_NAME, getLogFile()));
props.setProperty(LOG_LEVEL_NAME, toString(LOG_LEVEL_NAME, getLogLevel()));
- props.setProperty(LOG_DISK_SPACE_LIMIT_NAME, toString(LOG_DISK_SPACE_LIMIT_NAME, getLogDiskSpaceLimit()));
- props.setProperty(LOG_FILE_SIZE_LIMIT_NAME, toString(LOG_FILE_SIZE_LIMIT_NAME, getLogFileSizeLimit()));
- props.setProperty(REFRESH_INTERVAL_NAME, toString(REFRESH_INTERVAL_NAME, getRefreshInterval()));
+ props.setProperty(LOG_DISK_SPACE_LIMIT_NAME,
+ toString(LOG_DISK_SPACE_LIMIT_NAME, getLogDiskSpaceLimit()));
+ props.setProperty(LOG_FILE_SIZE_LIMIT_NAME,
+ toString(LOG_FILE_SIZE_LIMIT_NAME, getLogFileSizeLimit()));
+ props.setProperty(REFRESH_INTERVAL_NAME,
+ toString(REFRESH_INTERVAL_NAME, getRefreshInterval()));
}
return props;
@@ -677,7 +720,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
// -------------------------------------------------------------------------
- // Agent specific properties
+ // Agent specific properties
// -------------------------------------------------------------------------
public boolean isAgentSSLEnabled() {
@@ -834,6 +877,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
* Returns the port of the RMI Connector Server.
* <p>
* See <a href="#rmi-server-port">description</a> above.
+ *
* @return the value set for rmi-server-port
*
* @since GemFire 6.5
@@ -844,6 +888,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Sets the port of the RMI Connector Server.
+ *
* @param port rmi-server-port to set.
*
* @since GemFire 6.5
@@ -901,11 +946,12 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
// -------------------------------------------------------------------------
- // Implementation methods
+ // Implementation methods
// -------------------------------------------------------------------------
/**
* Initialize the values of this AgentConfig.
+ *
* @param props the configuration values to use
*/
private void initialize(Properties props) {
@@ -916,7 +962,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
this.httpPort = validateHttpPort(props.getProperty(HTTP_PORT_NAME));
this.rmiEnabled = validateBoolean(props.getProperty(RMI_ENABLED_NAME), DEFAULT_RMI_ENABLED);
- this.rmiRegistryEnabled = validateBoolean(props.getProperty(RMI_REGISTRY_ENABLED_NAME), DEFAULT_RMI_REGISTRY_ENABLED);
+ this.rmiRegistryEnabled =
+ validateBoolean(props.getProperty(RMI_REGISTRY_ENABLED_NAME), DEFAULT_RMI_REGISTRY_ENABLED);
this.rmiBindAddress = validateRmiBindAddress(props.getProperty(RMI_BIND_ADDRESS_NAME));
this.rmiPort = validateRmiPort(props.getProperty(RMI_PORT_NAME));
@@ -925,20 +972,33 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
this.snmpEnabled = validateBoolean(props.getProperty(SNMP_ENABLED_NAME), DEFAULT_SNMP_ENABLED);
this.snmpDirectory = validateSnmpDirectory(props.getProperty(SNMP_DIRECTORY_NAME));
- this.agentSSLEnabled = validateBoolean(props.getProperty(AGENT_SSL_ENABLED_NAME), DEFAULT_AGENT_SSL_ENABLED);
- this.agentSSLProtocols = validateNonEmptyString(props.getProperty(AGENT_SSL_PROTOCOLS_NAME), DEFAULT_AGENT_SSL_PROTOCOLS);
- this.agentSSLCiphers = validateNonEmptyString(props.getProperty(AGENT_SSL_CIPHERS_NAME), DEFAULT_AGENT_SSL_CIPHERS);
- this.agentSSLRequireAuth = validateBoolean(props.getProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME), DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION);
- this.httpSSLRequireAuth = validateBoolean(props.getProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME), DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION);
-
- this.httpAuthEnabled = validateBoolean(props.getProperty(HTTP_AUTHENTICATION_ENABLED_NAME), DEFAULT_HTTP_AUTHENTICATION_ENABLED);
- this.httpAuthUser = validateNonEmptyString(props.getProperty(HTTP_AUTHENTICATION_USER_NAME), DEFAULT_HTTP_AUTHENTICATION_USER);
- this.httpAuthPassword = validateNonEmptyString(props.getProperty(HTTP_AUTHENTICATION_PASSWORD_NAME), DEFAULT_HTTP_AUTHENTICATION_PASSWORD);
+ this.agentSSLEnabled =
+ validateBoolean(props.getProperty(AGENT_SSL_ENABLED_NAME), DEFAULT_AGENT_SSL_ENABLED);
+ this.agentSSLProtocols = validateNonEmptyString(props.getProperty(AGENT_SSL_PROTOCOLS_NAME),
+ DEFAULT_AGENT_SSL_PROTOCOLS);
+ this.agentSSLCiphers = validateNonEmptyString(props.getProperty(AGENT_SSL_CIPHERS_NAME),
+ DEFAULT_AGENT_SSL_CIPHERS);
+ this.agentSSLRequireAuth =
+ validateBoolean(props.getProperty(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME),
+ DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION);
+ this.httpSSLRequireAuth =
+ validateBoolean(props.getProperty(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME),
+ DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION);
+
+ this.httpAuthEnabled = validateBoolean(props.getProperty(HTTP_AUTHENTICATION_ENABLED_NAME),
+ DEFAULT_HTTP_AUTHENTICATION_ENABLED);
+ this.httpAuthUser = validateNonEmptyString(props.getProperty(HTTP_AUTHENTICATION_USER_NAME),
+ DEFAULT_HTTP_AUTHENTICATION_USER);
+ this.httpAuthPassword = validateNonEmptyString(
+ props.getProperty(HTTP_AUTHENTICATION_PASSWORD_NAME), DEFAULT_HTTP_AUTHENTICATION_PASSWORD);
this.sslEnabled = validateBoolean(props.getProperty(CLUSTER_SSL_ENABLED), DEFAULT_SSL_ENABLED);
- this.sslProtocols = validateNonEmptyString(props.getProperty(CLUSTER_SSL_PROTOCOLS), DEFAULT_SSL_PROTOCOLS);
- this.sslCiphers = validateNonEmptyString(props.getProperty(CLUSTER_SSL_CIPHERS), DEFAULT_SSL_CIPHERS);
- this.sslAuthenticationRequired = validateBoolean(props.getProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION), DEFAULT_SSL_REQUIRE_AUTHENTICATION);
+ this.sslProtocols =
+ validateNonEmptyString(props.getProperty(CLUSTER_SSL_PROTOCOLS), DEFAULT_SSL_PROTOCOLS);
+ this.sslCiphers =
+ validateNonEmptyString(props.getProperty(CLUSTER_SSL_CIPHERS), DEFAULT_SSL_CIPHERS);
+ this.sslAuthenticationRequired = validateBoolean(
+ props.getProperty(CLUSTER_SSL_REQUIRE_AUTHENTICATION), DEFAULT_SSL_REQUIRE_AUTHENTICATION);
this.sslProperties = new Properties();
for (int i = 0; true; i++) {
String key = "ssl-property-" + i;
@@ -958,12 +1018,18 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
this.sslProperties.put(propKey, propValue);
}
- this.isEmailNotificationEnabled = validateBoolean(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_ENABLED_NAME), DEFAULT_EMAIL_NOTIFICATIONS_ENABLED);
- this.emailNotificationHostName = validateNonEmptyString(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_HOST_NAME), DEFAULT_EMAIL_HOST);
- this.emailNotificationFrom = validateNonEmptyString(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_FROM_NAME), DEFAULT_EMAIL_FROM);
- this.emailNotificationToList = validateNonEmptyString(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_TO_LIST_NAME), DEFAULT_EMAIL_TO_LIST);
+ this.isEmailNotificationEnabled =
+ validateBoolean(props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_ENABLED_NAME),
+ DEFAULT_EMAIL_NOTIFICATIONS_ENABLED);
+ this.emailNotificationHostName = validateNonEmptyString(
+ props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_HOST_NAME), DEFAULT_EMAIL_HOST);
+ this.emailNotificationFrom = validateNonEmptyString(
+ props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_FROM_NAME), DEFAULT_EMAIL_FROM);
+ this.emailNotificationToList = validateNonEmptyString(
+ props.getProperty(AgentConfig.EMAIL_NOTIFICATIONS_TO_LIST_NAME), DEFAULT_EMAIL_TO_LIST);
- this.stateSaveFile = validateNonEmptyString(props.getProperty(AgentConfig.STATE_SAVE_FILE_NAME), DEFAULT_STATE_SAVE_FILE);
+ this.stateSaveFile = validateNonEmptyString(props.getProperty(AgentConfig.STATE_SAVE_FILE_NAME),
+ DEFAULT_STATE_SAVE_FILE);
try {
for (int i = 0; true; i++) {
@@ -973,8 +1039,10 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
String host = hostProp;
int port = Integer.parseInt(props.getProperty(LOCATOR_PORT_NAME + i));
- File workDir = validateWorkingDirectory(props.getProperty(LOCATOR_WORKING_DIRECTORY_NAME + i));
- File prodDir = new File(validateProductDirectory(props.getProperty(LOCATOR_PRODUCT_DIRECTORY_NAME + i)));
+ File workDir =
+ validateWorkingDirectory(props.getProperty(LOCATOR_WORKING_DIRECTORY_NAME + i));
+ File prodDir = new File(
+ validateProductDirectory(props.getProperty(LOCATOR_PRODUCT_DIRECTORY_NAME + i)));
String remoteCmd = props.getProperty(LOCATOR_REMOTE_COMMAND + i);
String bindAddr = props.getProperty(LOCATOR_BIND_ADDRESS + i);
@@ -987,10 +1055,10 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
config.setRemoteCommand(remoteCmd);
}
} catch (IllegalArgumentException e) {
- // This is how we break out of the loop? Yuck!
+ // This is how we break out of the loop? Yuck!
/*
- * LogWriter is initialized afterwards. Hence printing the stack trace.
- * This is done to avoid creation of duplicate log writer.
+ * LogWriter is initialized afterwards. Hence printing the stack trace. This is done to avoid
+ * creation of duplicate log writer.
*/
e.printStackTrace();
}
@@ -999,7 +1067,9 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Filter all agent configuration attributes out of the given <code>Properties</code> object.
* <p/>
- * @param props the <code>Properties</code> object of filter agent configuration attributes out of.
+ *
+ * @param props the <code>Properties</code> object of filter agent configuration attributes out
+ * of.
*
* @see AgentConfigImpl#_getPropertyDescription(String)
*/
@@ -1021,22 +1091,25 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
/**
- * Appends the log-file property to the Properties object if set of properties does not already define the
- * log-file property or the gemfire.agent.log-file property.
+ * Appends the log-file property to the Properties object if set of properties does not already
+ * define the log-file property or the gemfire.agent.log-file property.
* <p/>
- * @param props the <code>Properties</code> to append the log-file property to if the property does not exist.
+ *
+ * @param props the <code>Properties</code> to append the log-file property to if the property
+ * does not exist.
*/
private static void appendLogFileProperty(final Properties props) {
- if (!(props.containsKey(DistributedSystemConfig.LOG_FILE_NAME) || props.containsKey(SYSTEM_PROPERTY_PREFIX + DistributedSystemConfig.LOG_FILE_NAME))) {
+ if (!(props.containsKey(DistributedSystemConfig.LOG_FILE_NAME)
+ || props.containsKey(SYSTEM_PROPERTY_PREFIX + DistributedSystemConfig.LOG_FILE_NAME))) {
props.put(DistributedSystemConfig.LOG_FILE_NAME, DEFAULT_LOG_FILE);
}
}
/**
- * Appends any additional property-file specified properties to the supplied
- * Properties. If the supplied property overrides the property in the
- * property-file, then property-file value is ignored. System Properties always
- * override the supplied properties
+ * Appends any additional property-file specified properties to the supplied Properties. If the
+ * supplied property overrides the property in the property-file, then property-file value is
+ * ignored. System Properties always override the supplied properties
+ *
* @return appendedProps Properties appened to from the property-file if any
*/
private static Properties appendOptionalPropertyFileProperties(final Properties props) {
@@ -1059,11 +1132,13 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
// don't let any properties from the file override those on the command-line
for (final Object key : agentPropertyFileProperties.keySet()) {
if (props.getProperty(key.toString()) == null) {
- appendedProps.setProperty(key.toString(), agentPropertyFileProperties.getProperty(key.toString()));
+ appendedProps.setProperty(key.toString(),
+ agentPropertyFileProperties.getProperty(key.toString()));
}
}
} catch (IOException e) {
- throw new GemFireIOException(LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(url.toString()), e);
+ throw new GemFireIOException(
+ LocalizedStrings.AgentConfigImpl_FAILED_READING_0.toLocalizedString(url.toString()), e);
} finally {
IOUtils.close(in);
}
@@ -1085,53 +1160,70 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
/**
* Returns a description of the given agent config property
- * @throws IllegalArgumentException If <code>prop</code> is not a recognized agent
- * configuration property
+ *
+ * @throws IllegalArgumentException If <code>prop</code> is not a recognized agent configuration
+ * property
*/
public static String getPropertyDescription(String prop) {
if (prop.equals(LOG_FILE_NAME)) {
return LocalizedStrings.AgentConfigImpl_NAME_OF_THE_AGENTS_LOG_FILE.toLocalizedString();
} else if (prop.equals(LOG_LEVEL_NAME)) {
- return LocalizedStrings.AgentConfigImpl_MINIMUM_LEVEL_OF_LOGGING_PERFORMED_BY_AGENT.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_MINIMUM_LEVEL_OF_LOGGING_PERFORMED_BY_AGENT
+ .toLocalizedString();
} else if (prop.equals(AGENT_DEBUG)) {
- return LocalizedStrings.AgentConfigImpl_WHETHER_THE_AGENT_SHOULD_PRINT_DEBUGGING_INFORMATION.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WHETHER_THE_AGENT_SHOULD_PRINT_DEBUGGING_INFORMATION
+ .toLocalizedString();
} else if (prop.equals(LOG_DISK_SPACE_LIMIT_NAME)) {
- return LocalizedStrings.AgentConfigImpl_LIMIT_IN_MEGABYTES_OF_HOW_MUCH_DISK_SPACE_CAN_BE_CONSUMED_BY_OLD_INACTIVE_LOG_FILES.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_LIMIT_IN_MEGABYTES_OF_HOW_MUCH_DISK_SPACE_CAN_BE_CONSUMED_BY_OLD_INACTIVE_LOG_FILES
+ .toLocalizedString();
} else if (prop.equals(LOG_FILE_SIZE_LIMIT_NAME)) {
return LocalizedStrings.AgentConfigImpl_LIMIT_IN_MEGABYTES_OF_HOW_LARGE_THE_CURRENT_STATISTIC_ARCHIVE_FILE_CAN_GROW_BEFORE_IT_IS_CLOSED_AND_ARCHIVAL_ROLLS_ON_TO_A_NEW_FILE
- .toLocalizedString();
+ .toLocalizedString();
} else if (prop.equals(MCAST_PORT)) {
- return LocalizedStrings.AgentConfigImpl_MULTICAST_PORT_USED_TO_CONNECT_TO_DISTRIBUTED_SYSTEM.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_MULTICAST_PORT_USED_TO_CONNECT_TO_DISTRIBUTED_SYSTEM
+ .toLocalizedString();
} else if (prop.equals(MCAST_ADDRESS)) {
- return LocalizedStrings.AgentConfigImpl_MULTICAST_ADDRESS_USED_TO_CONNECT_TO_DISTRIBUTED_SYSTEM.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_MULTICAST_ADDRESS_USED_TO_CONNECT_TO_DISTRIBUTED_SYSTEM
+ .toLocalizedString();
} else if (prop.equals(BIND_ADDRESS)) {
- return LocalizedStrings.AgentConfigImpl_IP_ADDRESS_OF_THE_AGENTS_DISTRIBUTED_SYSTEM.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_IP_ADDRESS_OF_THE_AGENTS_DISTRIBUTED_SYSTEM
+ .toLocalizedString();
} else if (prop.equals(TCP_PORT)) {
return LocalizedStrings.AgentConfigImpl_TCP_PORT.toLocalizedString();
} else if (prop.equals(LOCATORS)) {
- return LocalizedStrings.AgentConfigImpl_ADDRESSES_OF_THE_LOCATORS_OF_THE_DISTRIBUTED_SYSTEM.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_ADDRESSES_OF_THE_LOCATORS_OF_THE_DISTRIBUTED_SYSTEM
+ .toLocalizedString();
} else if (prop.equals(MEMBERSHIP_PORT_RANGE_NAME)) {
- return LocalizedStrings.AgentConfigImpl_ALLOWED_RANGE_OF_UDP_PORTS_TO_FORM_UNIQUE_MEMBERSHIP_ID.toLocalizedString();
- // } else if (prop.equals(SYSTEM_ID_NAME)) {
- // return "The id of the distributed system";
+ return LocalizedStrings.AgentConfigImpl_ALLOWED_RANGE_OF_UDP_PORTS_TO_FORM_UNIQUE_MEMBERSHIP_ID
+ .toLocalizedString();
+ // } else if (prop.equals(SYSTEM_ID_NAME)) {
+ // return "The id of the distributed system";
} else if (prop.equals(ENTITY_CONFIG_XML_FILE_NAME)) {
- return LocalizedStrings.AgentConfigImpl_XML_CONFIGURATION_FILE_FOR_MANAGED_ENTITIES.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_XML_CONFIGURATION_FILE_FOR_MANAGED_ENTITIES
+ .toLocalizedString();
} else if (prop.equals(REFRESH_INTERVAL_NAME)) {
- return LocalizedStrings.AgentConfigImpl_REFRESH_INTERVAL_IN_SECONDS_FOR_AUTOREFRESH_OF_MEMBERS_AND_STATISTIC_RESOURCES.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_REFRESH_INTERVAL_IN_SECONDS_FOR_AUTOREFRESH_OF_MEMBERS_AND_STATISTIC_RESOURCES
+ .toLocalizedString();
} else if (prop.equals(REMOTE_COMMAND_NAME)) {
- return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_FOR_LAUNCHING_MEMBERS_OF_THE_DISTRIBUTED_SYSTEM.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_FOR_LAUNCHING_MEMBERS_OF_THE_DISTRIBUTED_SYSTEM
+ .toLocalizedString();
} else if (prop.equals(CLUSTER_SSL_ENABLED)) {
- return LocalizedStrings.AgentConfigImpl_DOES_THE_DISTRIBUTED_SYSTEM_COMMUNICATE_USING_SSL.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_DOES_THE_DISTRIBUTED_SYSTEM_COMMUNICATE_USING_SSL
+ .toLocalizedString();
} else if (prop.equals(CLUSTER_SSL_PROTOCOLS)) {
- return LocalizedStrings.AgentConfigImpl_SSL_PROTOCOLS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_SSL_PROTOCOLS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM
+ .toLocalizedString();
} else if (prop.equals(CLUSTER_SSL_CIPHERS)) {
- return LocalizedStrings.AgentConfigImpl_SSL_CIPHERS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_SSL_CIPHERS_USED_TO_COMMUNICATE_WITH_DISTRIBUTED_SYSTEM
+ .toLocalizedString();
} else if (prop.equals(CLUSTER_SSL_REQUIRE_AUTHENTICATION)) {
- return LocalizedStrings.AgentConfigImpl_DOES_CONNECTING_TO_THE_DISTRIBUTED_SYSTEM_REQUIRE_SSL_AUTHENTICATION.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_DOES_CONNECTING_TO_THE_DISTRIBUTED_SYSTEM_REQUIRE_SSL_AUTHENTICATION
+ .toLocalizedString();
} else {
String description = _getPropertyDescription(prop);
if (description == null) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_UNKNOWN_CONFIG_PROPERTY_0.toLocalizedString(prop));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_UNKNOWN_CONFIG_PROPERTY_0.toLocalizedString(prop));
} else {
return description;
@@ -1140,112 +1232,143 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
/**
- * Returns a description of the given agent config property or
- * <code>null</code> if <code>prop</code> is not a recognized agent
- * property.
+ * Returns a description of the given agent config property or <code>null</code> if
+ * <code>prop</code> is not a recognized agent property.
*/
public static String _getPropertyDescription(String prop) {
if (prop.equals(AUTO_CONNECT_NAME)) {
- return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_AUTOMATICALLY_CONNECT_TO_THE_DISTRIBUTED_SYSTEM.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_AUTOMATICALLY_CONNECT_TO_THE_DISTRIBUTED_SYSTEM
+ .toLocalizedString();
- // } else if (prop.equals(SYSTEM_NAME_NAME)) {
- // return "The logical name of the distributed system";
+ // } else if (prop.equals(SYSTEM_NAME_NAME)) {
+ // return "The logical name of the distributed system";
} else if (prop.equals(HTTP_ENABLED_NAME)) {
- return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_START_THE_HTTP_JMX_ADAPTER.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_START_THE_HTTP_JMX_ADAPTER
+ .toLocalizedString();
} else if (prop.equals(HTTP_BIND_ADDRESS_NAME)) {
- return LocalizedStrings.AgentConfigImpl_BIND_ADDRESS_OF_HTTP_ADAPTERS_SOCKETS.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_BIND_ADDRESS_OF_HTTP_ADAPTERS_SOCKETS
+ .toLocalizedString();
} else if (prop.equals(HTTP_PORT_NAME)) {
- return LocalizedStrings.AgentConfigImpl_THE_PORT_ON_WHICH_THE_HTTP_ADAPTER_WILL_BE_STARTED.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_THE_PORT_ON_WHICH_THE_HTTP_ADAPTER_WILL_BE_STARTED
+ .toLocalizedString();
} else if (prop.equals(RMI_ENABLED_NAME)) {
- return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_START_THE_RMI_JMX_ADAPTER.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_START_THE_RMI_JMX_ADAPTER
+ .toLocalizedString();
} else if (prop.equals(RMI_REGISTRY_ENABLED_NAME)) {
- return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_HOST_AN_RMI_REGISTRY.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_HOST_AN_RMI_REGISTRY
+ .toLocalizedString();
} else if (prop.equals(RMI_BIND_ADDRESS_NAME)) {
- return LocalizedStrings.AgentConfigImpl_BIND_ADDRESS_OF_RMI_ADAPTERS_SOCKETS.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_BIND_ADDRESS_OF_RMI_ADAPTERS_SOCKETS
+ .toLocalizedString();
} else if (prop.equals(RMI_PORT_NAME)) {
- return LocalizedStrings.AgentConfigImpl_THE_PORT_ON_WHICH_TO_CONTACT_THE_RMI_REGISTER.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_THE_PORT_ON_WHICH_TO_CONTACT_THE_RMI_REGISTER
+ .toLocalizedString();
} else if (prop.equals(RMI_SERVER_PORT_NAME)) {
- return LocalizedStrings.AgentConfigImpl_THE_PORT_USED_TO_CONFIGURE_RMI_CONNECTOR_SERVER.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_THE_PORT_USED_TO_CONFIGURE_RMI_CONNECTOR_SERVER
+ .toLocalizedString();
} else if (prop.equals(SNMP_ENABLED_NAME)) {
- return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_START_THE_SNMP_JMX_ADAPTER.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_START_THE_SNMP_JMX_ADAPTER
+ .toLocalizedString();
} else if (prop.equals(SNMP_BIND_ADDRESS_NAME)) {
- return LocalizedStrings.AgentConfigImpl_BIND_ADDRESS_OF_SNMP_ADAPTERS_SOCKETS.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_BIND_ADDRESS_OF_SNMP_ADAPTERS_SOCKETS
+ .toLocalizedString();
} else if (prop.equals(SNMP_DIRECTORY_NAME)) {
- return LocalizedStrings.AgentConfigImpl_THE_DIRECTORY_IN_WHICH_SNMP_CONFIGURATION_RESIDES.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_THE_DIRECTORY_IN_WHICH_SNMP_CONFIGURATION_RESIDES
+ .toLocalizedString();
} else if (prop.equals(AGENT_SSL_ENABLED_NAME)) {
- return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_COMMUNICATE_USING_SSL.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_COMMUNICATE_USING_SSL
+ .toLocalizedString();
} else if (prop.equals(AGENT_SSL_PROTOCOLS_NAME)) {
- return LocalizedStrings.AgentConfigImpl_THE_SSL_PROTOCOLS_USED_BY_THE_AGENT.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_THE_SSL_PROTOCOLS_USED_BY_THE_AGENT
+ .toLocalizedString();
} else if (prop.equals(AGENT_SSL_CIPHERS_NAME)) {
return LocalizedStrings.AgentConfigImpl_THE_SSL_CIPHERS_USED_BY_THE_AGENT.toLocalizedString();
} else if (prop.equals(AGENT_SSL_REQUIRE_AUTHENTICATION_NAME)) {
- return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_REQUIRE_SSL_AUTHENTICATION.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WILL_THE_AGENT_REQUIRE_SSL_AUTHENTICATION
+ .toLocalizedString();
} else if (prop.equals(HTTP_SSL_REQUIRE_AUTHENTICATION_NAME)) {
- return LocalizedStrings.AgentConfigImpl_WILL_THE_HTTP_ADAPTER_REQUIRE_SSL_AUTHENTICATION.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WILL_THE_HTTP_ADAPTER_REQUIRE_SSL_AUTHENTICATION
+ .toLocalizedString();
} else if (prop.equals(HTTP_AUTHENTICATION_ENABLED_NAME)) {
- return LocalizedStrings.AgentConfigImpl_WILL_THE_HTTP_JMX_ADAPTER_USE_HTTP_AUTHENTICATION.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_WILL_THE_HTTP_JMX_ADAPTER_USE_HTTP_AUTHENTICATION
+ .toLocalizedString();
} else if (prop.equals(HTTP_AUTHENTICATION_USER_NAME)) {
- return LocalizedStrings.AgentConfigImpl_THE_USER_NAME_FOR_AUTHENTICATION_IN_THE_HTTP_JMX_ADAPTER.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_THE_USER_NAME_FOR_AUTHENTICATION_IN_THE_HTTP_JMX_ADAPTER
+ .toLocalizedString();
} else if (prop.equals(HTTP_AUTHENTICATION_PASSWORD_NAME)) {
- return LocalizedStrings.AgentConfigImpl_THE_PASSWORD_FOR_AUTHENTICATION_IN_THE_HTTP_JMX_ADAPTER.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_THE_PASSWORD_FOR_AUTHENTICATION_IN_THE_HTTP_JMX_ADAPTER
+ .toLocalizedString();
} else if (prop.equals(PROPERTY_FILE_NAME)) {
- return LocalizedStrings.AgentConfigImpl_PROPERTY_FILE_FROM_WHICH_AGENT_READS_CONFIGURATION.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_PROPERTY_FILE_FROM_WHICH_AGENT_READS_CONFIGURATION
+ .toLocalizedString();
} else if (prop.equals(LOCATOR_HOST_NAME)) {
- return LocalizedStrings.AgentConfigImpl_HOST_ON_WHICH_THE_DISTRIBUTED_SYSTEMS_LOCATOR_RUNS.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_HOST_ON_WHICH_THE_DISTRIBUTED_SYSTEMS_LOCATOR_RUNS
+ .toLocalizedString();
} else if (prop.equals(LOCATOR_PORT_NAME)) {
- return LocalizedStrings.AgentConfigImpl_HOST_ON_WHICH_THE_DISTRIBUTED_SYSTEMS_LOCATOR_RUNS.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_HOST_ON_WHICH_THE_DISTRIBUTED_SYSTEMS_LOCATOR_RUNS
+ .toLocalizedString();
} else if (prop.equals(LOCATOR_PRODUCT_DIRECTORY_NAME)) {
- return LocalizedStrings.AgentConfigImpl_GEMFIRE_PRODUCT_DIRECTORY_USED_TO_LAUNCH_A_LOCATOR.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_GEMFIRE_PRODUCT_DIRECTORY_USED_TO_LAUNCH_A_LOCATOR
+ .toLocalizedString();
} else if (prop.equals(LOCATOR_WORKING_DIRECTORY_NAME)) {
- return LocalizedStrings.AgentConfigImpl_DIRECTORY_IN_WHICH_A_LOCATOR_WILL_BE_LAUNCHED.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_DIRECTORY_IN_WHICH_A_LOCATOR_WILL_BE_LAUNCHED
+ .toLocalizedString();
} else if (prop.equals(LOCATOR_REMOTE_COMMAND)) {
- return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_WHEN_LAUNCHING_A_LOCATOR.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_COMMAND_PREFIX_USED_WHEN_LAUNCHING_A_LOCATOR
+ .toLocalizedString();
} else if (prop.equals(LOCATOR_BIND_ADDRESS)) {
- return LocalizedStrings.AgentConfigImpl_IP_ADDRESS_TO_USE_WHEN_CONTACTING_LOCATOR.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_IP_ADDRESS_TO_USE_WHEN_CONTACTING_LOCATOR
+ .toLocalizedString();
} else if (prop.equals(LOCATOR_DS_PROPERTIES)) {
- return LocalizedStrings.AgentConfigImpl_PROPERTIES_FOR_CONFIGURING_A_LOCATORS_DISTRIBUTED_SYSTEM.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_PROPERTIES_FOR_CONFIGURING_A_LOCATORS_DISTRIBUTED_SYSTEM
+ .toLocalizedString();
} else if (prop.equals(EMAIL_NOTIFICATIONS_ENABLED_NAME)) {
- return LocalizedStrings.AgentConfigImpl_IDENTIFY_IF_EMAIL_NOTIFICATIONS_ARE_ENABLED_OR_NOT.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_IDENTIFY_IF_EMAIL_NOTIFICATIONS_ARE_ENABLED_OR_NOT
+ .toLocalizedString();
} else if (prop.equals(EMAIL_NOTIFICATIONS_FROM_NAME)) {
- return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_EMAIL_ADDRESS_USING_WHICH_EMAIL_NOTIFICATIONS_ARE_SENT.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_EMAIL_ADDRESS_USING_WHICH_EMAIL_NOTIFICATIONS_ARE_SENT
+ .toLocalizedString();
} else if (prop.equals(EMAIL_NOTIFICATIONS_HOST_NAME)) {
- return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_EMAIL_SERVER_HOST_USING_WHICH_EMAIL_NOTIFICATIONS_ARE_SENT.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_EMAIL_SERVER_HOST_USING_WHICH_EMAIL_NOTIFICATIONS_ARE_SENT
+ .toLocalizedString();
} else if (prop.equals(EMAIL_NOTIFICATIONS_TO_LIST_NAME)) {
- return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_COMMA_SEPARATED_EMAIL_ADDRESSES_LIST_TO_WHICH_EMAIL_NOTIFICATIONS_ARE_SENT.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_COMMA_SEPARATED_EMAIL_ADDRESSES_LIST_TO_WHICH_EMAIL_NOTIFICATIONS_ARE_SENT
+ .toLocalizedString();
} else if (prop.equals(STATE_SAVE_FILE_NAME)) {
- return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_NAME_OF_THE_FILE_TO_BE_USED_FOR_SAVING_AGENT_STATE.toLocalizedString();
+ return LocalizedStrings.AgentConfigImpl_IDENTIFY_THE_NAME_OF_THE_FILE_TO_BE_USED_FOR_SAVING_AGENT_STATE
+ .toLocalizedString();
} else {
return null;
@@ -1253,8 +1376,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
/**
- * Parses the array of command-line arguments (format: key=value) into an
- * instance of Properties.
+ * Parses the array of command-line arguments (format: key=value) into an instance of Properties.
+ *
* @param args the command-line arguments to convert into a Properties
*/
private static Properties toProperties(String[] args) {
@@ -1294,12 +1417,12 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
// -------------------------------------------------------------------------
- // Validation methods for configuration options
+ // Validation methods for configuration options
// -------------------------------------------------------------------------
/**
- * Makes sure that the mcast port and locators are correct and
- * consistent.
+ * Makes sure that the mcast port and locators are correct and consistent.
+ *
* @throws IllegalArgumentException If configuration is not valid
*/
@Override
@@ -1307,21 +1430,24 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
super.validate();
if (this.httpPort < 0 || this.httpPort > MAX_HTTP_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
- HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT)
- }));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
+ .toLocalizedString(new Object[] {HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT),
+ Integer.valueOf(MAX_HTTP_PORT)}));
}
if (this.rmiPort < 0 || this.rmiPort > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
- RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
- }));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
+ .toLocalizedString(new Object[] {RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
+ Integer.valueOf(MAX_RMI_PORT)}));
}
if (this.rmiServerPort < 0 || this.rmiServerPort > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
- RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
- }));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
+ .toLocalizedString(new Object[] {RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
+ Integer.valueOf(MAX_RMI_PORT)}));
}
}
@@ -1363,10 +1489,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
// HttpAdaptor property validators...
/**
- * Returns {@link
- * org.apache.geode.admin.jmx.AgentConfig#DEFAULT_HTTP_PORT}
- * if httpPort is empty; else validates
- * that it's an integer and returns the int form.
+ * Returns {@link org.apache.geode.admin.jmx.AgentConfig#DEFAULT_HTTP_PORT} if httpPort is empty;
+ * else validates that it's an integer and returns the int form.
*/
private int validateHttpPort(String val) {
if (isEmpty(val)) {
@@ -1377,24 +1501,23 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
/**
- * Validates that httpPort is either zero or within the {@link
- * org.apache.geode.admin.jmx.AgentConfig#MIN_HTTP_PORT} and {@link
- * org.apache.geode.admin.jmx.AgentConfig#MAX_HTTP_PORT} values.
+ * Validates that httpPort is either zero or within the
+ * {@link org.apache.geode.admin.jmx.AgentConfig#MIN_HTTP_PORT} and
+ * {@link org.apache.geode.admin.jmx.AgentConfig#MAX_HTTP_PORT} values.
*/
private int validateHttpPort(int val) {
if (val < 0 || val > MAX_HTTP_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
- HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT), Integer.valueOf(MAX_HTTP_PORT)
- }));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
+ .toLocalizedString(new Object[] {HTTP_PORT_NAME, Integer.valueOf(MIN_HTTP_PORT),
+ Integer.valueOf(MAX_HTTP_PORT)}));
}
return val;
}
/**
- * Returns {@link
- * org.apache.geode.admin.jmx.AgentConfig#DEFAULT_HTTP_BIND_ADDRESS}
- * unless httpBindAddress can be used to
- * create a valid InetAddress.
+ * Returns {@link org.apache.geode.admin.jmx.AgentConfig#DEFAULT_HTTP_BIND_ADDRESS} unless
+ * httpBindAddress can be used to create a valid InetAddress.
*/
private String validateHttpBindAddress(String val) {
String value = InetAddressUtil.validateHost(val);
@@ -1410,7 +1533,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
*/
private String validateHttpBindAddress(InetAddress val) {
if (val == null) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_HTTPBINDADDRESS_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_HTTPBINDADDRESS_MUST_NOT_BE_NULL.toLocalizedString());
}
return toString("", val);
}
@@ -1418,10 +1542,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
// SnmpAdaptor property validators...
/**
- * Returns {@link
- * org.apache.geode.admin.jmx.AgentConfig#DEFAULT_SNMP_BIND_ADDRESS}
- * unless snmpBindAddress can be used to
- * create a valid InetAddress.
+ * Returns {@link org.apache.geode.admin.jmx.AgentConfig#DEFAULT_SNMP_BIND_ADDRESS} unless
+ * snmpBindAddress can be used to create a valid InetAddress.
*/
private String validateSnmpBindAddress(String val) {
String value = InetAddressUtil.validateHost(val);
@@ -1432,28 +1554,28 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
}
- // /**
- // * Validates that snmpBindAddress is not null and then returns the string form of it.
- // */
- // private String validateSnmpBindAddress(InetAddress snmpBindAddress) {
- // if (snmpBindAddress == null) {
- // throw new IllegalArgumentException("SnmpBindAddress must not be null");
- // }
- // return toString(snmpBindAddress);
- // }
+ // /**
+ // * Validates that snmpBindAddress is not null and then returns the string form of it.
+ // */
+ // private String validateSnmpBindAddress(InetAddress snmpBindAddress) {
+ // if (snmpBindAddress == null) {
+ // throw new IllegalArgumentException("SnmpBindAddress must not be null");
+ // }
+ // return toString(snmpBindAddress);
+ // }
/**
- * SnmpDirectory must be specified if SNMP is enabled. This directory must
- * also exist.
+ * SnmpDirectory must be specified if SNMP is enabled. This directory must also exist.
*/
private String validateSnmpDirectory(String snmpDir) {
- /*if (isSnmpEnabled() && isEmpty(snmpDir)) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_SNMPDIRECTORY_MUST_BE_SPECIFIED_BECAUSE_SNMP_IS_ENABLED.toLocalizedString());
- }
- File root new File(snmpDir);
- if (!root.exists())
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_SNMPDIRECTORY_DOES_NOT_EXIST.toLocalizedString());
- */
+ /*
+ * if (isSnmpEnabled() && isEmpty(snmpDir)) { throw new
+ * IllegalArgumentException(LocalizedStrings.
+ * AgentConfigImpl_SNMPDIRECTORY_MUST_BE_SPECIFIED_BECAUSE_SNMP_IS_ENABLED.toLocalizedString());
+ * } File root new File(snmpDir); if (!root.exists()) throw new
+ * IllegalArgumentException(LocalizedStrings.AgentConfigImpl_SNMPDIRECTORY_DOES_NOT_EXIST.
+ * toLocalizedString());
+ */
return snmpDir;
}
@@ -1461,9 +1583,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
// RMIConnectorServer property validators...
/**
- * Returns {@link org.apache.geode.admin.jmx.AgentConfig#DEFAULT_RMI_PORT}
- * if rmiPort is empty; else validates
- * that it's an integer and returns the int form.
+ * Returns {@link org.apache.geode.admin.jmx.AgentConfig#DEFAULT_RMI_PORT} if rmiPort is empty;
+ * else validates that it's an integer and returns the int form.
*/
private int validateRmiPort(String val) {
if (isEmpty(val)) {
@@ -1474,24 +1595,24 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
/**
- * Validates that rmiPort is either zero or within the {@link
- * org.apache.geode.admin.jmx.AgentConfig#MIN_RMI_PORT}
- * and {@link org.apache.geode.admin.jmx.AgentConfig#MAX_RMI_PORT}
- * values.
+ * Validates that rmiPort is either zero or within the
+ * {@link org.apache.geode.admin.jmx.AgentConfig#MIN_RMI_PORT} and
+ * {@link org.apache.geode.admin.jmx.AgentConfig#MAX_RMI_PORT} values.
*/
private int validateRmiPort(int val) {
if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
- RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
- }));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
+ .toLocalizedString(new Object[] {RMI_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
+ Integer.valueOf(MAX_RMI_PORT)}));
}
return val;
}
/**
- * Returns {@link org.apache.geode.admin.jmx.AgentConfig#DEFAULT_RMI_SERVER_PORT}
- * if rmi-server-port is empty; else validates that it's an integer within the
- * allowed range and returns the int form.
+ * Returns {@link org.apache.geode.admin.jmx.AgentConfig#DEFAULT_RMI_SERVER_PORT} if
+ * rmi-server-port is empty; else validates that it's an integer within the allowed range and
+ * returns the int form.
*/
private int validateRmiServerPort(String val) {
if (isEmpty(val)) {
@@ -1502,25 +1623,23 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
/**
- * Validates that rmiPort is either zero or within the {@link
- * org.apache.geode.admin.jmx.AgentConfig#MIN_RMI_PORT}
- * and {@link org.apache.geode.admin.jmx.AgentConfig#MAX_RMI_PORT}
- * values.
+ * Validates that rmiPort is either zero or within the
+ * {@link org.apache.geode.admin.jmx.AgentConfig#MIN_RMI_PORT} and
+ * {@link org.apache.geode.admin.jmx.AgentConfig#MAX_RMI_PORT} values.
*/
private int validateRmiServerPort(int val) {
if (val < MIN_RMI_PORT || val > MAX_RMI_PORT) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2.toLocalizedString(new Object[] {
- RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT), Integer.valueOf(MAX_RMI_PORT)
- }));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_0_MUST_BE_ZERO_OR_AN_INTEGER_BETWEEN_1_AND_2
+ .toLocalizedString(new Object[] {RMI_SERVER_PORT_NAME, Integer.valueOf(MIN_RMI_PORT),
+ Integer.valueOf(MAX_RMI_PORT)}));
}
return val;
}
/**
- * Returns {@link
- * org.apache.geode.admin.jmx.AgentConfig#DEFAULT_RMI_BIND_ADDRESS}
- * unless rmiBindAddress can be used to create a
- * valid InetAddress.
+ * Returns {@link org.apache.geode.admin.jmx.AgentConfig#DEFAULT_RMI_BIND_ADDRESS} unless
+ * rmiBindAddress can be used to create a valid InetAddress.
*/
private String validateRmiBindAddress(String val) {
String value = InetAddressUtil.validateHost(val);
@@ -1530,44 +1649,46 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
return value;
}
}
- // /**
- // * Validates that rmiBindAddress is not null and then returns the string form of it.
- // */
- // private String validateRmiBindAddress(InetAddress rmiBindAddress) {
- // if (rmiBindAddress == null) {
- // throw new IllegalArgumentException("RmiBindAddress must not be null");
- // }
- // return toString(rmiBindAddress);
- // }
+ // /**
+ // * Validates that rmiBindAddress is not null and then returns the string form of it.
+ // */
+ // private String validateRmiBindAddress(InetAddress rmiBindAddress) {
+ // if (rmiBindAddress == null) {
+ // throw new IllegalArgumentException("RmiBindAddress must not be null");
+ // }
+ // return toString(rmiBindAddress);
+ // }
/**
* Validates working directory is not null or empty.
*/
private File validateWorkingDirectory(String workingDir) {
if (isEmpty(workingDir)) {
- throw new IllegalArgumentException(LocalizedStrings.AgentConfigImpl_LOCATOR_WORKINGDIRECTORY_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentConfigImpl_LOCATOR_WORKINGDIRECTORY_MUST_NOT_BE_NULL
+ .toLocalizedString());
}
return new File(workingDir);
}
// -------------------------------------------------------------------------
- // Static utility methods
+ // Static utility methods
// -------------------------------------------------------------------------
/**
- * Gets an <code>URL</code> for the property file, if one can be found,
- * that the create method would use to determine the systemName and
- * product home.
+ * Gets an <code>URL</code> for the property file, if one can be found, that the create method
+ * would use to determine the systemName and product home.
* <p>
* The file will be searched for, in order, in the following locations:
* <ol>
- * <li> the current directory
- * <li> the home directory
- * <li> the class path
+ * <li>the current directory
+ * <li>the home directory
+ * <li>the class path
* </ol>
* Only the first file found will be used.
- * @return a <code>URL</code> that names the property file;
- * otherwise Null if no property file was found.
+ *
+ * @return a <code>URL</code> that names the property file; otherwise Null if no property file was
+ * found.
*/
public static URL getPropertyFileURL(final String propFileLocation) {
File propFile = new File(propFileLocation);
@@ -1623,8 +1744,8 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
/**
- * Returns string representation of the specified object with special
- * handling for InetAddress.
+ * Returns string representation of the specified object with special handling for InetAddress.
+ *
* @param obj the object to convert to string
*
* @return string representation of the specified object
@@ -1673,7 +1794,7 @@ public class AgentConfigImpl extends DistributedSystemConfigImpl implements Agen
}
// -------------------------------------------------------------------------
- // SSL support...
+ // SSL support...
// -------------------------------------------------------------------------
private boolean sslEnabled = DEFAULT_SSL_ENABLED;
private String sslProtocols = DEFAULT_SSL_PROTOCOLS;
[46/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
index c1677a1..c31afc6 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
import static org.junit.Assert.*;
@@ -42,8 +40,8 @@ import org.junit.Ignore;
import org.junit.Test;
/**
- * This servlet tests the effects of the downstream SessionCachingFilter filter.
- * When these tests are performed, the filter would already have taken effect.
+ * This servlet tests the effects of the downstream SessionCachingFilter filter. When these tests
+ * are performed, the filter would already have taken effect.
*/
public abstract class CommonTests extends BasicServletTestCaseAdapter {
@@ -52,10 +50,8 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
@Test
public void testGetSession1() throws Exception {
doFilter();
- HttpSession session1 =
- ((HttpServletRequest) getFilteredRequest()).getSession();
- HttpSession session2 =
- ((HttpServletRequest) getFilteredRequest()).getSession();
+ HttpSession session1 = ((HttpServletRequest) getFilteredRequest()).getSession();
+ HttpSession session2 = ((HttpServletRequest) getFilteredRequest()).getSession();
assertSame("Session should be the same", session1, session2);
}
@@ -84,8 +80,7 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
getFilteredRequest().setAttribute("foo", "bar");
assertEquals("bar", getFilteredRequest().getAttribute("foo"));
- assertNull("Unknown attribute should be null",
- getFilteredRequest().getAttribute("baz"));
+ assertNull("Unknown attribute should be null", getFilteredRequest().getAttribute("baz"));
}
@Test
@@ -101,8 +96,7 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
doFilter();
assertEquals("bar", getFilteredRequest().getAttribute("foo"));
- assertNull("Unknown attribute should be null",
- getFilteredRequest().getAttribute("baz"));
+ assertNull("Unknown attribute should be null", getFilteredRequest().getAttribute("baz"));
}
@Test
@@ -166,8 +160,7 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
/**
- * Test that various methods throw the appropriate exception when the session is
- * invalid.
+ * Test that various methods throw the appropriate exception when the session is invalid.
*/
@Test
public void testInvalidate1() throws Exception {
@@ -342,7 +335,9 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
doFilter();
// Ugh
- MockHttpSession session = (MockHttpSession) ((GemfireHttpSession) ((HttpServletRequest) getFilteredRequest()).getSession()).getNativeSession();
+ MockHttpSession session =
+ (MockHttpSession) ((GemfireHttpSession) ((HttpServletRequest) getFilteredRequest())
+ .getSession()).getNativeSession();
session.addAttributeListener((HttpSessionAttributeListener) listener);
session.setAttribute("foo", "bar");
session.setAttribute("foo", "baz");
@@ -350,10 +345,8 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
assertTrue("Event timeout", listener.await(1, TimeUnit.SECONDS));
assertEquals(ListenerEventType.SESSION_ATTRIBUTE_ADDED, listener.getEvents().get(0));
- assertEquals(ListenerEventType.SESSION_ATTRIBUTE_REPLACED,
- listener.getEvents().get(1));
- assertEquals(ListenerEventType.SESSION_ATTRIBUTE_REMOVED,
- listener.getEvents().get(2));
+ assertEquals(ListenerEventType.SESSION_ATTRIBUTE_REPLACED, listener.getEvents().get(1));
+ assertEquals(ListenerEventType.SESSION_ATTRIBUTE_REMOVED, listener.getEvents().get(2));
}
/**
@@ -363,13 +356,10 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
public void testHttpSessionBindingListener1() throws Exception {
doFilter();
- HttpSession session =
- ((HttpServletRequest) getFilteredRequest()).getSession();
+ HttpSession session = ((HttpServletRequest) getFilteredRequest()).getSession();
- HttpSessionBindingListenerImpl listener1 =
- new HttpSessionBindingListenerImpl(2);
- HttpSessionBindingListenerImpl listener2 =
- new HttpSessionBindingListenerImpl(2);
+ HttpSessionBindingListenerImpl listener1 = new HttpSessionBindingListenerImpl(2);
+ HttpSessionBindingListenerImpl listener2 = new HttpSessionBindingListenerImpl(2);
session.setAttribute("foo", listener1);
session.setAttribute("foo", listener2);
@@ -381,11 +371,9 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
assertEquals("Event list size incorrect", 2, listener1.getEvents().size());
assertEquals("Event list size incorrect", 2, listener2.getEvents().size());
assertEquals(ListenerEventType.SESSION_VALUE_BOUND, listener1.getEvents().get(0));
- assertEquals(ListenerEventType.SESSION_VALUE_UNBOUND,
- listener1.getEvents().get(1));
+ assertEquals(ListenerEventType.SESSION_VALUE_UNBOUND, listener1.getEvents().get(1));
assertEquals(ListenerEventType.SESSION_VALUE_BOUND, listener2.getEvents().get(0));
- assertEquals(ListenerEventType.SESSION_VALUE_UNBOUND,
- listener2.getEvents().get(1));
+ assertEquals(ListenerEventType.SESSION_VALUE_UNBOUND, listener2.getEvents().get(1));
}
@Test
@@ -581,8 +569,7 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
HttpServletRequest request = (HttpServletRequest) getFilteredRequest();
request.getSession();
- assertFalse("Session ID should not be from cookie",
- request.isRequestedSessionIdFromCookie());
+ assertFalse("Session ID should not be from cookie", request.isRequestedSessionIdFromCookie());
assertTrue("Session ID should be from URL", request.isRequestedSessionIdFromURL());
}
@@ -598,14 +585,14 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
public static class RequestWrappingFilter implements Filter {
- @Override public void init(final FilterConfig filterConfig) throws ServletException {
+ @Override
+ public void init(final FilterConfig filterConfig) throws ServletException {
}
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
- throws IOException, ServletException
- {
+ throws IOException, ServletException {
final HttpServletRequest httpRequest = (HttpServletRequest) request;
httpRequest.getSession();
httpRequest.setAttribute("original_session", httpRequest.getSession());
@@ -614,7 +601,8 @@ public abstract class CommonTests extends BasicServletTestCaseAdapter {
}
- @Override public void destroy() {
+ @Override
+ public void destroy() {
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
index e2f268f..ce688c3 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionAttributeListenerImpl.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
index 0aedcbb..092cf08 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionBindingListenerImpl.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -21,8 +19,8 @@ import java.io.Serializable;
import javax.servlet.http.HttpSessionBindingEvent;
import javax.servlet.http.HttpSessionBindingListener;
-public class HttpSessionBindingListenerImpl extends AbstractListener implements
- HttpSessionBindingListener, Serializable {
+public class HttpSessionBindingListenerImpl extends AbstractListener
+ implements HttpSessionBindingListener, Serializable {
public HttpSessionBindingListenerImpl(int i) {
super(i);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl.java
index 08eacfb..fbf0d13 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -23,12 +21,10 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
-public class HttpSessionListenerImpl extends AbstractListener
- implements HttpSessionListener {
+public class HttpSessionListenerImpl extends AbstractListener implements HttpSessionListener {
public synchronized void sessionCreated(HttpSessionEvent se) {
- HttpSession gfeSession = SessionCachingFilter.getWrappingSession(
- se.getSession());
+ HttpSession gfeSession = SessionCachingFilter.getWrappingSession(se.getSession());
gfeSession.setAttribute("gemfire-session-id", gfeSession.getId());
events.add(ListenerEventType.SESSION_CREATED);
latch.countDown();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl2.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl2.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl2.java
index fbe68b1..5fd2c27 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl2.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/HttpSessionListenerImpl2.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -23,8 +21,7 @@ import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
-public class HttpSessionListenerImpl2 extends AbstractListener
- implements HttpSessionListener {
+public class HttpSessionListenerImpl2 extends AbstractListener implements HttpSessionListener {
@Override
public void sessionCreated(HttpSessionEvent se) {
@@ -34,8 +31,7 @@ public class HttpSessionListenerImpl2 extends AbstractListener
@Override
public void sessionDestroyed(HttpSessionEvent se) {
- HttpSession gfeSession = SessionCachingFilter.getWrappingSession(
- se.getSession());
+ HttpSession gfeSession = SessionCachingFilter.getWrappingSession(se.getSession());
assert (gfeSession != null);
events.add(ListenerEventType.SESSION_DESTROYED);
latch.countDown();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
index 294df73..65d931e 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/MyServletTester.java
@@ -1,38 +1,35 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
import org.eclipse.jetty.servlet.ServletTester;
/**
- * Extend the base ServletTester class with a couple of helper methods. This
- * depends on a patched ServletTester class which exposes the _server variable
- * as package-private.
+ * Extend the base ServletTester class with a couple of helper methods. This depends on a patched
+ * ServletTester class which exposes the _server variable as package-private.
*/
public class MyServletTester extends ServletTester {
public boolean isStarted() {
-// return _server.isStarted();
+ // return _server.isStarted();
return false;
}
public boolean isStopped() {
-// return _server.isStopped();
+ // return _server.isStopped();
return false;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
index 39e00f9..e3b6c61 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/RendezvousManager.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
index 1f73df1..22d6842 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestAttributeListenerImpl.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -35,8 +33,7 @@ public class ServletRequestAttributeListenerImpl extends AbstractListener
latch.countDown();
}
- public synchronized void attributeReplaced(
- ServletRequestAttributeEvent srae) {
+ public synchronized void attributeReplaced(ServletRequestAttributeEvent srae) {
events.add(ListenerEventType.SERVLET_REQUEST_ATTRIBUTE_REPLACED);
latch.countDown();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
index a32793d..2e5076c 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/ServletRequestListenerImpl.java
@@ -1,27 +1,24 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
import javax.servlet.ServletRequestEvent;
import javax.servlet.ServletRequestListener;
-public class ServletRequestListenerImpl extends AbstractListener
- implements ServletRequestListener {
+public class ServletRequestListenerImpl extends AbstractListener implements ServletRequestListener {
public synchronized void requestDestroyed(ServletRequestEvent sre) {
events.add(ListenerEventType.SERVLET_REQUEST_DESTROYED);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
index bda2036..76ecab3 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationIntegrationJUnitTest.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
import org.apache.geode.cache.Region;
@@ -50,8 +48,8 @@ import java.util.concurrent.TimeUnit;
import static org.junit.Assert.*;
/**
- * In-container testing using Jetty. This allows us to test context listener
- * events as well as dispatching actions.
+ * In-container testing using Jetty. This allows us to test context listener events as well as
+ * dispatching actions.
*/
@Category(IntegrationTest.class)
@RunWith(PerTestClassLoaderRunner.class)
@@ -80,17 +78,19 @@ public class SessionReplicationIntegrationJUnitTest {
tester = new MyServletTester();
tester.setContextPath("/test");
- filterHolder = tester.addFilter(SessionCachingFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
+ filterHolder =
+ tester.addFilter(SessionCachingFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
filterHolder.setInitParameter(DistributionConfig.GEMFIRE_PREFIX + "property.mcast-port", "0");
- filterHolder.setInitParameter(DistributionConfig.GEMFIRE_PREFIX + "property.log-file", gemfireLogFile.getAbsolutePath());
+ filterHolder.setInitParameter(DistributionConfig.GEMFIRE_PREFIX + "property.log-file",
+ gemfireLogFile.getAbsolutePath());
filterHolder.setInitParameter("cache-type", "peer-to-peer");
servletHolder = tester.addServlet(BasicServlet.class, "/hello");
servletHolder.setInitParameter("test.callback", "callback_1");
/**
- * This starts the servlet. Our wrapped servlets *must* start
- * immediately otherwise the ServletContext is not captured correctly.
+ * This starts the servlet. Our wrapped servlets *must* start immediately otherwise the
+ * ServletContext is not captured correctly.
*/
servletHolder.setInitOrder(0);
}
@@ -113,8 +113,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -140,8 +140,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -150,16 +150,14 @@ public class SessionReplicationIntegrationJUnitTest {
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
- assertTrue("Not a correctly generated session id",
- response.getContent().endsWith("-GF"));
+ assertTrue("Not a correctly generated session id", response.getContent().endsWith("-GF"));
List<Cookie> cookies = getCookies(response);
- assertEquals("Session id != JSESSIONID from cookie",
- response.getContent(), cookies.get(0).getValue());
+ assertEquals("Session id != JSESSIONID from cookie", response.getContent(),
+ cookies.get(0).getValue());
Region r = getRegion();
- assertNotNull("Session not found in region",
- r.get(cookies.get(0).getValue()));
+ assertNotNull("Session not found in region", r.get(cookies.get(0).getValue()));
}
@@ -184,8 +182,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -194,8 +192,7 @@ public class SessionReplicationIntegrationJUnitTest {
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
- assertEquals("Session should not have been created", "OK",
- response.getContent());
+ assertEquals("Session should not have been created", "OK", response.getContent());
}
@@ -217,8 +214,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -227,8 +224,7 @@ public class SessionReplicationIntegrationJUnitTest {
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
- assertEquals("Unknown attribute should be null", "null",
- response.getContent());
+ assertEquals("Unknown attribute should be null", "null", response.getContent());
}
@@ -256,8 +252,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -280,8 +276,7 @@ public class SessionReplicationIntegrationJUnitTest {
cookies2.get(0).getValue());
Region r = getRegion();
- assertNotNull("Session object should exist in region",
- r.get(cookies.get(0).getValue()));
+ assertNotNull("Session object should exist in region", r.get(cookies.get(0).getValue()));
}
/**
@@ -315,8 +310,8 @@ public class SessionReplicationIntegrationJUnitTest {
sh2.setInitParameter("test.callback", "callback_2");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -327,22 +322,21 @@ public class SessionReplicationIntegrationJUnitTest {
List<Cookie> cookies = getCookies(response);
Region r = getRegion();
- assertEquals("bar",
- ((HttpSession) r.get(cookies.get(0).getValue())).getAttribute("foo"));
+ assertEquals("bar", ((HttpSession) r.get(cookies.get(0).getValue())).getAttribute("foo"));
request.setHeader("Cookie", "JSESSIONID=" + cookies.get(0).getValue());
request.setURI("/test/request2");
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
- assertEquals("baz",
- ((HttpSession) r.get(cookies.get(0).getValue())).getAttribute(
- "foo"));
+ assertEquals("baz", ((HttpSession) r.get(cookies.get(0).getValue())).getAttribute("foo"));
}
/**
* Test setting an attribute to null deletes it
- */
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class loader isolation, TODO: rewrite test with JUnit 4 rules including TemporaryFolder
+ */
+ @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class
+ // loader isolation, TODO: rewrite test with JUnit 4 rules including
+ // TemporaryFolder
@Test
public void testSetAttributeNullDeletesIt() throws Exception {
Callback c_1 = new Callback() {
@@ -371,8 +365,8 @@ public class SessionReplicationIntegrationJUnitTest {
sh2.setInitParameter("test.callback", "callback_2");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -383,96 +377,93 @@ public class SessionReplicationIntegrationJUnitTest {
List<Cookie> cookies = getCookies(response);
Region r = getRegion();
- assertEquals("bar",
- ((HttpSession) r.get(cookies.get(0).getValue())).getAttribute(
- "foo"));
+ assertEquals("bar", ((HttpSession) r.get(cookies.get(0).getValue())).getAttribute("foo"));
request.setHeader("Cookie", "JSESSIONID=" + cookies.get(0).getValue());
request.setURI("/test/request2");
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
- assertNull(
- ((HttpSession) r.get(cookies.get(0).getValue())).getAttribute(
- "foo"));
+ assertNull(((HttpSession) r.get(cookies.get(0).getValue())).getAttribute("foo"));
}
-// Don't see how to do this currently as the SessionListener needs a full
-// web context to work in.
-
-// /**
-// * Test that sessions expire correctly
-// */
-// public void testSessionExpiration() throws Exception {
-// Callback c_1 = new Callback() {
-// @Override
-// public void call(HttpServletRequest request, HttpServletResponse response)
-// throws IOException, ServletException {
-// HttpSession s = request.getSession();
-// s.setAttribute("foo", "bar");
-// s.setMaxInactiveInterval(1);
-//
-// PrintWriter out = response.getWriter();
-// out.write(s.getId());
-// }
-// };
-//
-// // This is the callback used to check if the session is still there
-// Callback c_2 = new Callback() {
-// @Override
-// public void call(HttpServletRequest request, HttpServletResponse response)
-// throws IOException, ServletException {
-// HttpSession s = request.getSession(false);
-// String output;
-// if (s == null) {
-// output = "null";
-// } else {
-// output = s.getId();
-// }
-//
-// PrintWriter out = response.getWriter();
-// out.write(output);
-// }
-// };
-//
-// tester.addEventListener(new SessionListener());
-// tester.setAttribute("callback_1", c_1);
-// tester.setAttribute("callback_2", c_2);
-//
-// servletHolder.setInitParameter("test.callback", "callback_1");
-//
-// ServletHolder sh2 = tester.addServlet(BasicServlet.class, "/request2");
-// sh2.setInitParameter("test.callback", "callback_2");
-//
-// tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
-//
-// request.setMethod("GET");
-// request.setURI("/test/hello");
-// request.setHeader("Host", "tester");
-// request.setVersion("HTTP/1.0");
-// response.parse(tester.getResponses(request.generate()));
-//
-// String id = response.getContent();
-//
-// // Wait for the session to expire
-// Thread.sleep(2000);
-//
-// request.setHeader("Cookie", "JSESSIONID=" + id);
-// request.setURI("/test/request2");
-// response.parse(tester.getResponses(request.generate()));
-//
-// assertIndexDetailsEquals("null", response.getContent());
-//
-// Region r = getRegion();
-// assertNull("Region should not contain session", r.get(id));
-// }
+ // Don't see how to do this currently as the SessionListener needs a full
+ // web context to work in.
+
+ // /**
+ // * Test that sessions expire correctly
+ // */
+ // public void testSessionExpiration() throws Exception {
+ // Callback c_1 = new Callback() {
+ // @Override
+ // public void call(HttpServletRequest request, HttpServletResponse response)
+ // throws IOException, ServletException {
+ // HttpSession s = request.getSession();
+ // s.setAttribute("foo", "bar");
+ // s.setMaxInactiveInterval(1);
+ //
+ // PrintWriter out = response.getWriter();
+ // out.write(s.getId());
+ // }
+ // };
+ //
+ // // This is the callback used to check if the session is still there
+ // Callback c_2 = new Callback() {
+ // @Override
+ // public void call(HttpServletRequest request, HttpServletResponse response)
+ // throws IOException, ServletException {
+ // HttpSession s = request.getSession(false);
+ // String output;
+ // if (s == null) {
+ // output = "null";
+ // } else {
+ // output = s.getId();
+ // }
+ //
+ // PrintWriter out = response.getWriter();
+ // out.write(output);
+ // }
+ // };
+ //
+ // tester.addEventListener(new SessionListener());
+ // tester.setAttribute("callback_1", c_1);
+ // tester.setAttribute("callback_2", c_2);
+ //
+ // servletHolder.setInitParameter("test.callback", "callback_1");
+ //
+ // ServletHolder sh2 = tester.addServlet(BasicServlet.class, "/request2");
+ // sh2.setInitParameter("test.callback", "callback_2");
+ //
+ // tester.start();
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
+ //
+ // request.setMethod("GET");
+ // request.setURI("/test/hello");
+ // request.setHeader("Host", "tester");
+ // request.setVersion("HTTP/1.0");
+ // response.parse(tester.getResponses(request.generate()));
+ //
+ // String id = response.getContent();
+ //
+ // // Wait for the session to expire
+ // Thread.sleep(2000);
+ //
+ // request.setHeader("Cookie", "JSESSIONID=" + id);
+ // request.setURI("/test/request2");
+ // response.parse(tester.getResponses(request.generate()));
+ //
+ // assertIndexDetailsEquals("null", response.getContent());
+ //
+ // Region r = getRegion();
+ // assertNull("Region should not contain session", r.get(id));
+ // }
/**
- * Test that invalidating a session destroys it as well as the backend
- * object.
+ * Test that invalidating a session destroys it as well as the backend object.
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class loader isolation, TODO: rewrite test with JUnit 4 rules including TemporaryFolder
+ @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class
+ // loader isolation, TODO: rewrite test with JUnit 4 rules including
+ // TemporaryFolder
@Test
public void testInvalidateSession1() throws Exception {
Callback c_1 = new Callback() {
@@ -501,8 +492,8 @@ public class SessionReplicationIntegrationJUnitTest {
sh2.setInitParameter("test.callback", "callback_2");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -512,15 +503,13 @@ public class SessionReplicationIntegrationJUnitTest {
List<Cookie> cookies = getCookies(response);
Region r = getRegion();
- assertEquals("bar",
- ((HttpSession) r.get(cookies.get(0).getValue())).getAttribute("foo"));
+ assertEquals("bar", ((HttpSession) r.get(cookies.get(0).getValue())).getAttribute("foo"));
request.setHeader("Cookie", "JSESSIONID=" + cookies.get(0).getValue());
request.setURI("/test/request2");
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
- assertNull("Region should not contain session",
- r.get(cookies.get(0).getValue()));
+ assertNull("Region should not contain session", r.get(cookies.get(0).getValue()));
}
/**
@@ -548,8 +537,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -563,7 +552,9 @@ public class SessionReplicationIntegrationJUnitTest {
/**
* Test that invalidating a session throws an exception on subsequent access.
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class loader isolation, TODO: rewrite test with JUnit 4 rules including TemporaryFolder
+ @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class
+ // loader isolation, TODO: rewrite test with JUnit 4 rules including
+ // TemporaryFolder
@Test
public void testInvalidateSession3() throws Exception {
Callback c_1 = new Callback() {
@@ -586,8 +577,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -623,8 +614,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -636,8 +627,7 @@ public class SessionReplicationIntegrationJUnitTest {
}
/**
- * Test that invalidating a session does not throw an exception for subsequent
- * getId calls.
+ * Test that invalidating a session does not throw an exception for subsequent getId calls.
*/
@Test
public void testInvalidateSession5() throws Exception {
@@ -658,8 +648,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -695,8 +685,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -708,18 +698,18 @@ public class SessionReplicationIntegrationJUnitTest {
}
/**
- * Test that invalidating a session does not throw an exception for
- * subsequent getMaxInactiveInterval calls.
+ * Test that invalidating a session does not throw an exception for subsequent
+ * getMaxInactiveInterval calls.
*/
-// I've commented this out for now as Jetty seems to want to throw an
-// Exception here where the HttpServlet api doesn't specify that.
+ // I've commented this out for now as Jetty seems to want to throw an
+ // Exception here where the HttpServlet api doesn't specify that.
@Test
public void testInvalidateSession7() throws Exception {
Callback c_1 = new Callback() {
@Override
- public void call(HttpServletRequest request,
- HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
HttpSession s = request.getSession();
s.invalidate();
s.getMaxInactiveInterval();
@@ -733,8 +723,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -746,8 +736,8 @@ public class SessionReplicationIntegrationJUnitTest {
}
/**
- * Test that invalidating a session does not throw an exception for subsequent
- * getServletContext calls.
+ * Test that invalidating a session does not throw an exception for subsequent getServletContext
+ * calls.
*/
@Test
public void testInvalidateSession8() throws Exception {
@@ -768,8 +758,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -806,8 +796,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -843,8 +833,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -880,8 +870,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -915,8 +905,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -928,8 +918,8 @@ public class SessionReplicationIntegrationJUnitTest {
}
/**
- * Test that invalidating a session results in null being returned on
- * subsequent getSession(false) calls.
+ * Test that invalidating a session results in null being returned on subsequent getSession(false)
+ * calls.
*/
@Test
public void testInvalidateSession13() throws Exception {
@@ -954,8 +944,8 @@ public class SessionReplicationIntegrationJUnitTest {
servletHolder.setInitParameter("test.callback", "callback_1");
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1001,8 +991,8 @@ public class SessionReplicationIntegrationJUnitTest {
sh.setInitParameter("test.callback", "callback_2");
tester.start();
-// ContextManager.getInstance().putContext(
-// sh.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // sh.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1039,8 +1029,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1062,8 +1052,7 @@ public class SessionReplicationIntegrationJUnitTest {
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
long time2 = Long.parseLong(response.getContent());
- assertTrue("Creation time should be the same across requests",
- time1 == time2);
+ assertTrue("Creation time should be the same across requests", time1 == time2);
}
/**
@@ -1083,8 +1072,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1094,7 +1083,7 @@ public class SessionReplicationIntegrationJUnitTest {
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
long time1 = Long.parseLong(response.getContent());
-// assertTrue("Last accessed time should be positive", time1 > 0);
+ // assertTrue("Last accessed time should be positive", time1 > 0);
List<Cookie> cookies = getCookies(response);
request.setHeader("Cookie", "JSESSIONID=" + cookies.get(0).getValue());
@@ -1103,8 +1092,7 @@ public class SessionReplicationIntegrationJUnitTest {
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
long time2 = Long.parseLong(response.getContent());
- assertTrue("Last accessed time should be increasing across requests",
- time2 > time1);
+ assertTrue("Last accessed time should be increasing across requests", time2 > time1);
}
/**
@@ -1124,8 +1112,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1139,17 +1127,13 @@ public class SessionReplicationIntegrationJUnitTest {
String sessionId = cookies.get(0).getValue();
Region r = getRegion();
- assertEquals(
- "Cached native session id does not match servlet returned native session id",
- nativeSessionId,
- ((GemfireHttpSession) r.get(sessionId)).getNativeSession().getId());
+ assertEquals("Cached native session id does not match servlet returned native session id",
+ nativeSessionId, ((GemfireHttpSession) r.get(sessionId)).getNativeSession().getId());
request.setHeader("Cookie", "JSESSIONID=" + cookies.get(0).getValue());
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
- assertEquals(
- "Underlying native sessions must remain the same across requests",
- nativeSessionId,
+ assertEquals("Underlying native sessions must remain the same across requests", nativeSessionId,
((GemfireHttpSession) r.get(sessionId)).getNativeSession().getId());
}
@@ -1170,8 +1154,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1181,22 +1165,22 @@ public class SessionReplicationIntegrationJUnitTest {
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
List<Cookie> cookies = getCookies(response);
String sessionId = response.getContent();
- assertEquals("Session ids should be the same", sessionId,
- cookies.get(0).getValue());
+ assertEquals("Session ids should be the same", sessionId, cookies.get(0).getValue());
request.setURI("/test/hello;jsessionid=" + sessionId);
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
cookies = getCookies(response);
- assertEquals("Session ids should be the same", sessionId,
- cookies.get(0).getValue());
+ assertEquals("Session ids should be the same", sessionId, cookies.get(0).getValue());
}
/**
* Test that request forward dispatching works
*/
- @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class loader isolation, TODO: rewrite test with JUnit 4 rules including TemporaryFolder
+ @Category(FlakyTest.class) // GEODE-1015: uses Jetty HttpTester, uses static vars with class
+ // loader isolation, TODO: rewrite test with JUnit 4 rules including
+ // TemporaryFolder
@Test
public void testDispatchingForward1() throws Exception {
Callback c_1 = new Callback() {
@@ -1229,8 +1213,8 @@ public class SessionReplicationIntegrationJUnitTest {
sh.setInitParameter("test.callback", "callback_2");
tester.start();
-// ContextManager.getInstance().putContext(
-// sh.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // sh.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1240,8 +1224,8 @@ public class SessionReplicationIntegrationJUnitTest {
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
assertEquals("dispatched", response.getContent());
-// ContextManager.getInstance().removeContext(
-// sh.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().removeContext(
+ // sh.getServlet().getServletConfig().getServletContext());
}
@@ -1280,8 +1264,8 @@ public class SessionReplicationIntegrationJUnitTest {
sh.setInitParameter("test.callback", "callback_2");
tester.start();
-// ContextManager.getInstance().putContext(
-// sh.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // sh.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1291,8 +1275,8 @@ public class SessionReplicationIntegrationJUnitTest {
response = HttpTester.parseResponse(tester.getResponses(request.generate()));
assertEquals("dispatched_bang", response.getContent());
-// ContextManager.getInstance().removeContext(
-// sh.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().removeContext(
+ // sh.getServlet().getServletConfig().getServletContext());
}
@@ -1331,8 +1315,8 @@ public class SessionReplicationIntegrationJUnitTest {
sh.setInitParameter("test.callback", "callback_2");
tester.start();
-// ContextManager.getInstance().putContext(
-// sh.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // sh.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1375,8 +1359,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1389,15 +1373,12 @@ public class SessionReplicationIntegrationJUnitTest {
List<Cookie> cookies = getCookies(response);
-// AbstractListener listener = RendezvousManager.getListener();
+ // AbstractListener listener = RendezvousManager.getListener();
tester.stop();
- assertTrue("Timeout waiting for events",
- listener.await(1, TimeUnit.SECONDS));
- assertEquals(ListenerEventType.SESSION_CREATED,
- listener.events.get(0));
- assertEquals(ListenerEventType.SESSION_DESTROYED,
- listener.events.get(1));
+ assertTrue("Timeout waiting for events", listener.await(1, TimeUnit.SECONDS));
+ assertEquals(ListenerEventType.SESSION_CREATED, listener.events.get(0));
+ assertEquals(ListenerEventType.SESSION_DESTROYED, listener.events.get(1));
assertEquals(cookies.get(0).getValue(), response.getContent());
}
@@ -1420,8 +1401,8 @@ public class SessionReplicationIntegrationJUnitTest {
tester.setAttribute("callback_1", c);
tester.start();
-// ContextManager.getInstance().putContext(
-// servletHolder.getServlet().getServletConfig().getServletContext());
+ // ContextManager.getInstance().putContext(
+ // servletHolder.getServlet().getServletConfig().getServletContext());
request.setMethod("GET");
request.setURI("/test/hello");
@@ -1436,19 +1417,15 @@ public class SessionReplicationIntegrationJUnitTest {
tester.stop();
- assertTrue("Timeout waiting for events",
- listener.await(1, TimeUnit.SECONDS));
- assertEquals(ListenerEventType.SESSION_CREATED,
- listener.events.get(0));
- assertEquals(ListenerEventType.SESSION_DESTROYED,
- listener.events.get(1));
+ assertTrue("Timeout waiting for events", listener.await(1, TimeUnit.SECONDS));
+ assertEquals(ListenerEventType.SESSION_CREATED, listener.events.get(0));
+ assertEquals(ListenerEventType.SESSION_DESTROYED, listener.events.get(1));
assertEquals(cookies.get(0).getValue(), response.getContent());
}
-
-// @Test
+ // @Test
public void testJsp() throws Exception {
tester.setResourceBase("target/test-classes");
ServletHolder jspHolder = tester.addServlet(JspServlet.class, "/test/*");
@@ -1462,8 +1439,7 @@ public class SessionReplicationIntegrationJUnitTest {
throws IOException, ServletException {
request.getSession().setAttribute("foo", "bar");
request.setAttribute("foo", "baz");
- RequestDispatcher dispatcher = request.getRequestDispatcher(
- "pagecontext.jsp");
+ RequestDispatcher dispatcher = request.getRequestDispatcher("pagecontext.jsp");
dispatcher.forward(request, response);
}
};
@@ -1543,7 +1519,7 @@ public class SessionReplicationIntegrationJUnitTest {
private Region getRegion() {
// Yuck...
- return ((GemfireSessionManager) ((SessionCachingFilter) filterHolder.getFilter()).getSessionManager()).getCache().getCache().getRegion(
- "gemfire_modules_sessions");
+ return ((GemfireSessionManager) ((SessionCachingFilter) filterHolder.getFilter())
+ .getSessionManager()).getCache().getCache().getRegion("gemfire_modules_sessions");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
index 1d60795..4db3849 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationJUnitTest.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
index 8f24459..cb072da 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/SessionReplicationLocalCacheJUnitTest.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
index 95ca509..723ce44 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/ChildFirstClassLoader.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.junit;
@@ -23,7 +21,7 @@ import java.net.URLClassLoader;
public class ChildFirstClassLoader extends URLClassLoader {
public ChildFirstClassLoader() {
- super(new URL[]{});
+ super(new URL[] {});
}
public ChildFirstClassLoader(URL[] urls) {
@@ -45,12 +43,10 @@ public class ChildFirstClassLoader extends URLClassLoader {
}
/**
- * We override the parent-first behavior established by
- * java.lang.Classloader.
+ * We override the parent-first behavior established by java.lang.Classloader.
*/
@Override
- protected Class loadClass(String name, boolean resolve)
- throws ClassNotFoundException {
+ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
Class c = null;
if (name.startsWith("org.apache")) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/NamedRunner.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/NamedRunner.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/NamedRunner.java
index fea9833..87e43c1 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/NamedRunner.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/NamedRunner.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.junit;
@@ -23,9 +21,8 @@ import org.junit.runners.model.FrameworkMethod;
import org.junit.runners.model.InitializationError;
/**
- * A Junit 4 runner that stores the name of the method that runs. The methods
- * marked with @After and @Before (but also the Test method itself) can request
- * this name for which it is running.
+ * A Junit 4 runner that stores the name of the method that runs. The methods marked with @After
+ * and @Before (but also the Test method itself) can request this name for which it is running.
*
* @author Rudy De Busscher
*/
@@ -75,7 +72,8 @@ public class NamedRunner extends BlockJUnit4ClassRunner {
* @return the string
*/
private static String retrieveTestMethodName() {
- // We can't use a ThreadLocal variable in the case the TestPerClassLoader runner is used. Then this
+ // We can't use a ThreadLocal variable in the case the TestPerClassLoader runner is used. Then
+ // this
// Method is accessed from another classloader and thus reinitialized variables.
String result = null;
String storedName = System.getProperty(getKey());
@@ -89,7 +87,8 @@ public class NamedRunner extends BlockJUnit4ClassRunner {
* Removes the test method name.
*/
private static void removeTestMethodName() {
- // We can't use a ThreadLocal variable in the case the TestPerClassLoader runner is used. Then this
+ // We can't use a ThreadLocal variable in the case the TestPerClassLoader runner is used. Then
+ // this
// Method is accessed from another classloader and thus reinitialized variables.
System.setProperty(getKey(), NO_NAME);
@@ -102,7 +101,8 @@ public class NamedRunner extends BlockJUnit4ClassRunner {
*/
private static void storeTestMethodName(String name) {
- // We can't use a ThreadLocal variable in the case the TestPerClassLoader runner is used. Then this
+ // We can't use a ThreadLocal variable in the case the TestPerClassLoader runner is used. Then
+ // this
// Method is accessed from another classloader and thus reinitialized variables.
System.setProperty(getKey(), name);
}
[25/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
index b1d6afe..eed5578 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
@@ -1,29 +1,29 @@
/*
- * 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
+ * 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.admin;
/**
- * A listener whose callback methods are invoked when members join or
- * leave the GemFire distributed system.
+ * A listener whose callback methods are invoked when members join or leave the GemFire distributed
+ * system.
*
* @see AdminDistributedSystem#addMembershipListener
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface SystemMembershipListener {
@@ -33,29 +33,27 @@ public interface SystemMembershipListener {
public void memberJoined(SystemMembershipEvent event);
/**
- * Invoked when a member has gracefully left the distributed system. This
- * occurs when the member took action to remove itself from the distributed
- * system.
+ * Invoked when a member has gracefully left the distributed system. This occurs when the member
+ * took action to remove itself from the distributed system.
*/
public void memberLeft(SystemMembershipEvent event);
/**
- * Invoked when a member has unexpectedly left the distributed
- * system. This occurs when a member is forcibly removed from the
- * distributed system by another process, such as from
- * <a href=../distributed/DistributedSystem.html#member-timeout> failure detection</a>, or
- * <a href=../distributed/DistributedSystem.html#enable-network-partition-detection>
- * network partition detection</a> processing.
+ * Invoked when a member has unexpectedly left the distributed system. This occurs when a member
+ * is forcibly removed from the distributed system by another process, such as from <a
+ * href=../distributed/DistributedSystem.html#member-timeout> failure detection</a>, or <a
+ * href=../distributed/DistributedSystem.html#enable-network-partition-detection> network
+ * partition detection</a> processing.
*/
public void memberCrashed(SystemMembershipEvent event);
-// /**
-// * Invoked when a member broadcasts an informational message.
-// *
-// * @see org.apache.geode.distributed.DistributedSystem#fireInfoEvent
-// *
-// * @since GemFire 4.0
-// */
-// public void memberInfo(SystemMembershipEvent event);
+ // /**
+ // * Invoked when a member broadcasts an informational message.
+ // *
+ // * @see org.apache.geode.distributed.DistributedSystem#fireInfoEvent
+ // *
+ // * @since GemFire 4.0
+ // */
+ // public void memberInfo(SystemMembershipEvent event);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java b/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
index e89fc96..758dbd7 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
@@ -1,88 +1,81 @@
/*
- * 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
+ * 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.admin;
/**
- * An <code>UnmodifiableConfigurationException</code> is thrown when an attempt
- * is made to modify the value of an unmodifiable
- * {@link ConfigurationParameter}.
+ * An <code>UnmodifiableConfigurationException</code> is thrown when an attempt is made to modify
+ * the value of an unmodifiable {@link ConfigurationParameter}.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class UnmodifiableConfigurationException extends AdminException {
-private static final long serialVersionUID = -7653547392992060646L;
+ private static final long serialVersionUID = -7653547392992060646L;
/**
- * Constructs a new exception with <code>null</code> as its detail message.
- * The cause is not initialized, and may subsequently be initialized by a
- * call to {@link Throwable#initCause}.
+ * Constructs a new exception with <code>null</code> as its detail message. The cause is not
+ * initialized, and may subsequently be initialized by a call to {@link Throwable#initCause}.
*/
public UnmodifiableConfigurationException() {
super();
}
/**
- * Constructs a new exception with the specified detail message. The
- * cause is not initialized, and may subsequently be initialized by
- * a call to {@link Throwable#initCause}.
+ * Constructs a new exception with the specified detail message. The cause is not initialized, and
+ * may subsequently be initialized by a call to {@link Throwable#initCause}.
*
- * @param message the detail message. The detail message is saved for
- * later retrieval by the {@link #getMessage()} method.
+ * @param message the detail message. The detail message is saved for later retrieval by the
+ * {@link #getMessage()} method.
*/
public UnmodifiableConfigurationException(String message) {
super(message);
}
/**
- * Constructs a new exception with the specified detail message and
- * cause. <p>Note that the detail message associated with
- * <code>cause</code> is <i>not</i> automatically incorporated in
- * this exception's detail message.
+ * Constructs a new exception with the specified detail message and cause.
+ * <p>
+ * Note that the detail message associated with <code>cause</code> is <i>not</i> automatically
+ * incorporated in this exception's detail message.
*
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
+ * @param message the detail message (which is saved for later retrieval by the
+ * {@link #getMessage()} method).
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or
+ * unknown.)
*/
public UnmodifiableConfigurationException(String message, Throwable cause) {
super(message, cause);
}
/**
- * Constructs a new exception with the specified cause and a detail
- * message of <tt>(cause==null ? null : cause.toString())</tt> (which
- * typically contains the class and detail message of <tt>cause</tt>).
- * This constructor is useful for exceptions that are little more than
- * wrappers for other throwables (for example, {@link
- * java.security.PrivilegedActionException}).
+ * Constructs a new exception with the specified cause and a detail message of
+ * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class and detail
+ * message of <tt>cause</tt>). This constructor is useful for exceptions that are little more than
+ * wrappers for other throwables (for example, {@link java.security.PrivilegedActionException}).
*
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or
+ * unknown.)
*/
public UnmodifiableConfigurationException(Throwable cause) {
super(cause);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
index 1a98c99..57b42a8 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AbstractHealthEvaluator.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -28,57 +26,49 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- * The abstract superclass of all GemFire health evaluators.
- * Basically, this class specifies what the health evaluators need and
- * what they should do.
+ * The abstract superclass of all GemFire health evaluators. Basically, this class specifies what
+ * the health evaluators need and what they should do.
*
* <P>
*
- * Note that evaluators never reside in the administration VM, they
- * only in member VMs. They are not <code>Serializable</code> and
- * aren't meant to be.
+ * Note that evaluators never reside in the administration VM, they only in member VMs. They are not
+ * <code>Serializable</code> and aren't meant to be.
*
*
* @since GemFire 3.5
- * */
-public abstract class AbstractHealthEvaluator {
+ */
+public abstract class AbstractHealthEvaluator {
private static final Logger logger = LogService.getLogger();
-
- /** The number of times this evaluator has been evaluated. Certain
- * checks are not made the first time an evaluation occurs. */
+
+ /**
+ * The number of times this evaluator has been evaluated. Certain checks are not made the first
+ * time an evaluation occurs.
+ */
private int numEvaluations;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>AbstractHealthEvaluator</code> with the given
- * <code>GemFireHealthConfig</code> and
- * <code>DistributionManager</code>.
+ * <code>GemFireHealthConfig</code> and <code>DistributionManager</code>.
*
- * Originally, this method took an
- * <code>InternalDistributedSystem</code>, but we found there were
- * race conditions during initialization. Namely, that a
- * <code>DistributionMessage</code> can be processed before the
- * <code>InternalDistributedSystem</code>'s
- * <code>DistributionManager</code> is set.
+ * Originally, this method took an <code>InternalDistributedSystem</code>, but we found there were
+ * race conditions during initialization. Namely, that a <code>DistributionMessage</code> can be
+ * processed before the <code>InternalDistributedSystem</code>'s <code>DistributionManager</code>
+ * is set.
*/
- protected AbstractHealthEvaluator(GemFireHealthConfig config,
- DM dm)
- {
+ protected AbstractHealthEvaluator(GemFireHealthConfig config, DM dm) {
this.numEvaluations = 0;
}
- ///////////////////// Instance Methods /////////////////////
+ ///////////////////// Instance Methods /////////////////////
/**
- * Evaluates the health of a component of a GemFire distributed
- * system.
+ * Evaluates the health of a component of a GemFire distributed system.
*
- * @param status
- * A list of {@link AbstractHealthEvaluator.HealthStatus
- * HealthStatus} objects that is populated when ill health is
- * detected.
+ * @param status A list of {@link AbstractHealthEvaluator.HealthStatus HealthStatus} objects that
+ * is populated when ill health is detected.
*/
public final void evaluate(List status) {
this.numEvaluations++;
@@ -86,8 +76,7 @@ public abstract class AbstractHealthEvaluator {
}
/**
- * Checks the health of a component of a GemFire distributed
- * system.
+ * Checks the health of a component of a GemFire distributed system.
*
* @see #evaluate
*/
@@ -101,28 +90,28 @@ public abstract class AbstractHealthEvaluator {
}
/**
- * A factory method that creates a {@link
- * AbstractHealthEvaluator.HealthStatus HealthStats} with
+ * A factory method that creates a {@link AbstractHealthEvaluator.HealthStatus HealthStats} with
* {@linkplain GemFireHealth#OKAY_HEALTH okay} status.
*/
protected HealthStatus okayHealth(String diagnosis) {
- logger.info(LocalizedMessage.create(LocalizedStrings.AbstractHealthEvaluator_OKAY_HEALTH__0, diagnosis));
+ logger.info(LocalizedMessage.create(LocalizedStrings.AbstractHealthEvaluator_OKAY_HEALTH__0,
+ diagnosis));
return new HealthStatus(GemFireHealth.OKAY_HEALTH, diagnosis);
}
/**
- * A factory method that creates a {@link
- * AbstractHealthEvaluator.HealthStatus HealthStats} with
+ * A factory method that creates a {@link AbstractHealthEvaluator.HealthStatus HealthStats} with
* {@linkplain GemFireHealth#POOR_HEALTH poor} status.
*/
protected HealthStatus poorHealth(String diagnosis) {
- logger.info(LocalizedMessage.create(LocalizedStrings.AbstractHealthEvaluator_POOR_HEALTH__0, diagnosis));
+ logger.info(LocalizedMessage.create(LocalizedStrings.AbstractHealthEvaluator_POOR_HEALTH__0,
+ diagnosis));
return new HealthStatus(GemFireHealth.POOR_HEALTH, diagnosis);
}
/**
- * Returns a <code>String</code> describing the component whose
- * health is evaluated by this evaluator.
+ * Returns a <code>String</code> describing the component whose health is evaluated by this
+ * evaluator.
*/
protected abstract String getDescription();
@@ -131,35 +120,33 @@ public abstract class AbstractHealthEvaluator {
*/
abstract void close();
- /////////////////////// Inner Classes //////////////////////
+ /////////////////////// Inner Classes //////////////////////
/**
* Represents the health of a GemFire component.
*/
- public class HealthStatus {
+ public class HealthStatus {
/** The health of a GemFire component */
private GemFireHealth.Health healthCode;
/** The diagnosis of the illness */
private String diagnosis;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
- * Creates a new <code>HealthStatus</code> with the give
- * <code>health</code> code and <code>dianosis</code> message.
+ * Creates a new <code>HealthStatus</code> with the give <code>health</code> code and
+ * <code>dianosis</code> message.
*
* @see GemFireHealth#OKAY_HEALTH
* @see GemFireHealth#POOR_HEALTH
*/
HealthStatus(GemFireHealth.Health healthCode, String diagnosis) {
this.healthCode = healthCode;
- this.diagnosis =
- "[" + AbstractHealthEvaluator.this.getDescription() + "] " +
- diagnosis;
+ this.diagnosis = "[" + AbstractHealthEvaluator.this.getDescription() + "] " + diagnosis;
}
- ///////////////////// Instance Methods /////////////////////
+ ///////////////////// Instance Methods /////////////////////
/**
* Returns the health code
@@ -172,8 +159,7 @@ public abstract class AbstractHealthEvaluator {
}
/**
- * Returns the diagnosis prepended with a description of the
- * component that is ill.
+ * Returns the diagnosis prepended with a description of the component that is ill.
*/
public String getDiagnosis() {
return this.diagnosis;
[89/98] [abbrv] incubator-geode git commit: GEODE-2027:
ParallelQueueRemovalMessage processing removes events from the region and
temp queue
Posted by ds...@apache.org.
GEODE-2027: ParallelQueueRemovalMessage processing removes events from the region and temp queue
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b10a171e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b10a171e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b10a171e
Branch: refs/heads/feature/GEM-983
Commit: b10a171e11990a566ed42560a903668908131390
Parents: 87f2fb5
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Fri Oct 21 12:40:41 2016 -0700
Committer: Barry Oglesby <bo...@pivotal.io>
Committed: Thu Oct 27 09:17:35 2016 -0700
----------------------------------------------------------------------
.../cache/wan/AbstractGatewaySender.java | 2 +-
.../parallel/ParallelQueueRemovalMessage.java | 22 +-
.../internal/cache/BucketRegionQueueHelper.java | 58 +++++
.../ParallelQueueRemovalMessageJUnitTest.java | 256 +++++++++++++++++++
.../java/org/apache/geode/test/fake/Fakes.java | 5 +-
5 files changed, 326 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b10a171e/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 33119bc..e1c9010 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -684,7 +684,7 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
return null;
}
- final public Set<RegionQueue> getQueues() {
+ public Set<RegionQueue> getQueues() {
if (this.eventProcessor != null) {
if (!(this.eventProcessor instanceof ConcurrentSerialGatewaySenderEventProcessor)) {
Set<RegionQueue> queues = new HashSet<RegionQueue>();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b10a171e/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
index a363b5d..bad3d3c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
@@ -135,22 +135,14 @@ public class ParallelQueueRemovalMessage extends PooledDistributionMessage {
afterAckForSecondary_EventInBucket(abstractSender, brq, key);
destroyKeyFromBucketQueue(brq, key, region);
isDestroyed = true;
- } else {
- // if BucketRegionQueue does not have the key, it
- // should be in tempQueue
- // remove it from there..defect #49196
- isDestroyed =
- destroyFromTempQueue(brq.getPartitionedRegion(), (Integer) bId, key);
- }
- if (!isDestroyed) {
- // event is neither destroyed from BucketRegionQueue nor from tempQueue
- brq.addToFailedBatchRemovalMessageKeys(key);
- if (isDebugEnabled) {
- logger.debug(
- "Event is neither destroyed from BucketRegionQueue not from tempQueue. Added to failedBatchRemovalMessageKeys: {}",
- key);
- }
}
+
+ // Even if BucketRegionQueue does not have the key, it could be in the tempQueue
+ // remove it from there..defect #49196
+ destroyFromTempQueue(brq.getPartitionedRegion(), (Integer) bId, key);
+
+ // Finally, add the key to the failed batch removal keys so that it is definitely removed from the bucket region queue
+ brq.addToFailedBatchRemovalMessageKeys(key);
} finally {
brq.getInitializationLock().readLock().unlock();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b10a171e/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
new file mode 100644
index 0000000..68b29c2
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
@@ -0,0 +1,58 @@
+/*
+ * 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.internal.cache;
+
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * Helper class in the internal cache package to access protected BucketRegionQueue methods.
+ */
+public class BucketRegionQueueHelper {
+
+ private BucketRegionQueue bucketRegionQueue;
+
+ public BucketRegionQueueHelper(GemFireCacheImpl cache, PartitionedRegion queueRegion, BucketRegionQueue bucketRegionQueue) {
+ this.bucketRegionQueue = bucketRegionQueue;
+ initialize(cache, queueRegion);
+ }
+
+ public GatewaySenderEventImpl addEvent(Object key) {
+ this.bucketRegionQueue.getEventTracker().setInitialized();
+ this.bucketRegionQueue.entries.disableLruUpdateCallback();
+ GatewaySenderEventImpl event = mock(GatewaySenderEventImpl.class);
+ this.bucketRegionQueue.entries.initialImagePut(key, 0, event, false, false, null, null, false);
+ this.bucketRegionQueue.entries.enableLruUpdateCallback();
+ return event;
+ }
+
+ public void cleanUpDestroyedTokensAndMarkGIIComplete() {
+ this.bucketRegionQueue.cleanUpDestroyedTokensAndMarkGIIComplete(InitialImageOperation.GIIStatus.NO_GII);
+ }
+
+ public void initialize(GemFireCacheImpl cache, PartitionedRegion queueRegion) {
+ InternalDistributedMember member = cache.getMyId();
+ when(queueRegion.getMyId()).thenReturn(member);
+ when(cache.getRegionByPath(this.bucketRegionQueue.getFullPath())).thenReturn(this.bucketRegionQueue);
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b10a171e/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
new file mode 100644
index 0000000..cc9caaf
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessageJUnitTest.java
@@ -0,0 +1,256 @@
+/*
+ * 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.internal.cache.wan.parallel;
+
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.cache.*;
+import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.lru.LRUAlgorithm;
+import org.apache.geode.internal.cache.partitioned.RegionAdvisor;
+import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
+import org.apache.geode.internal.cache.wan.GatewaySenderEventImpl;
+import org.apache.geode.test.fake.Fakes;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@Category(UnitTest.class)
+public class ParallelQueueRemovalMessageJUnitTest {
+
+ private GemFireCacheImpl cache;
+ private PartitionedRegion queueRegion;
+ private AbstractGatewaySender sender;
+ private PartitionedRegion rootRegion;
+ private BucketRegionQueue bucketRegionQueue;
+ private BucketRegionQueueHelper bucketRegionQueueHelper;
+
+ private static String GATEWAY_SENDER_ID = "ny";
+ private static int BUCKET_ID = 85;
+ private static long KEY = 198l;
+
+ @Before
+ public void setUpGemFire() {
+ createCache();
+ createQueueRegion();
+ createGatewaySender();
+ createRootRegion();
+ createBucketRegionQueue();
+ }
+
+ private void createCache() {
+ // Mock cache
+ this.cache = Fakes.cache();
+ GemFireCacheImpl.setInstanceForTests(this.cache);
+ }
+
+ private void createQueueRegion() {
+ // Mock queue region
+ this.queueRegion = mock(PartitionedRegion.class);
+ when(this.queueRegion.getFullPath()).thenReturn(getRegionQueueName());
+ when(this.queueRegion.getPrStats()).thenReturn(mock(PartitionedRegionStats.class));
+ when(this.queueRegion.getDataStore()).thenReturn(mock(PartitionedRegionDataStore.class));
+ when(this.queueRegion.getCache()).thenReturn(this.cache);
+ EvictionAttributesImpl ea = (EvictionAttributesImpl) EvictionAttributes.createLRUMemoryAttributes(100, null, EvictionAction.OVERFLOW_TO_DISK);
+ LRUAlgorithm algorithm = ea.createEvictionController(this.queueRegion, false);
+ algorithm.getLRUHelper().initStats(this.queueRegion, this.cache.getDistributedSystem());
+ when(this.queueRegion.getEvictionController()).thenReturn(algorithm);
+ }
+
+ private void createGatewaySender() {
+ // Mock gateway sender
+ this.sender = mock(AbstractGatewaySender.class);
+ when(this.queueRegion.getParallelGatewaySender()).thenReturn(this.sender);
+ when(this.sender.getQueues()).thenReturn(null);
+ when(this.sender.getDispatcherThreads()).thenReturn(1);
+ when(this.sender.getCache()).thenReturn(this.cache);
+ CancelCriterion cancelCriterion = mock(CancelCriterion.class);
+ when(sender.getCancelCriterion()).thenReturn(cancelCriterion);
+ }
+
+ private void createRootRegion() {
+ // Mock root region
+ this.rootRegion = mock(PartitionedRegion.class);
+ when(this.rootRegion.getFullPath()).thenReturn(Region.SEPARATOR+PartitionedRegionHelper.PR_ROOT_REGION_NAME);
+ when(this.cache.getRegion(PartitionedRegionHelper.PR_ROOT_REGION_NAME, true)).thenReturn(this.rootRegion);
+ when(this.cache.getRegion(getRegionQueueName(), false)).thenReturn(this.queueRegion);
+ }
+
+ private void createBucketRegionQueue() {
+ // Create InternalRegionArguments
+ InternalRegionArguments ira = new InternalRegionArguments();
+ ira.setPartitionedRegion(this.queueRegion);
+ ira.setPartitionedRegionBucketRedundancy(1);
+ BucketAdvisor ba = mock(BucketAdvisor.class);
+ ira.setBucketAdvisor(ba);
+ InternalRegionArguments pbrIra = new InternalRegionArguments();
+ RegionAdvisor ra = mock(RegionAdvisor.class);
+ when(ra.getPartitionedRegion()).thenReturn(this.queueRegion);
+ pbrIra.setPartitionedRegionAdvisor(ra);
+ PartitionAttributes pa = mock(PartitionAttributes.class);
+ when(this.queueRegion.getPartitionAttributes()).thenReturn(pa);
+ when(this.queueRegion.getDataPolicy()).thenReturn(DataPolicy.PARTITION);
+ when(pa.getColocatedWith()).thenReturn(null);
+ ProxyBucketRegion pbr = new ProxyBucketRegion(BUCKET_ID, this.queueRegion, pbrIra); // final classes cannot be mocked
+ when(ba.getProxyBucketRegion()).thenReturn(pbr);
+
+ // Create RegionAttributes
+ AttributesFactory factory = new AttributesFactory();
+ factory.setScope(Scope.DISTRIBUTED_ACK);
+ factory.setDataPolicy(DataPolicy.REPLICATE);
+ factory.setEvictionAttributes(EvictionAttributes.createLRUMemoryAttributes(100, null, EvictionAction.OVERFLOW_TO_DISK));
+ RegionAttributes attributes = factory.create();
+
+ // Create BucketRegionQueue
+ this.bucketRegionQueue = new BucketRegionQueue(this.queueRegion.getBucketName(BUCKET_ID), attributes, this.rootRegion, this.cache, ira);
+ this.bucketRegionQueueHelper = new BucketRegionQueueHelper(this.cache, this.queueRegion, this.bucketRegionQueue);
+ }
+
+ @After
+ public void tearDownGemFire() {
+ GemFireCacheImpl.setInstanceForTests(null);
+ }
+
+ @Test
+ public void validateFailedBatchRemovalMessageKeysInUninitializedBucketRegionQueue() throws Exception {
+ // Validate initial BucketRegionQueue state
+ assertFalse(this.bucketRegionQueue.isInitialized());
+ assertEquals(0, this.bucketRegionQueue.getFailedBatchRemovalMessageKeys().size());
+
+ // Create and process a ParallelQueueRemovalMessage (causes the failedBatchRemovalMessageKeys to add a key)
+ createAndProcessParallelQueueRemovalMessage();
+
+ // Validate BucketRegionQueue after processing ParallelQueueRemovalMessage
+ assertEquals(1, this.bucketRegionQueue.getFailedBatchRemovalMessageKeys().size());
+ }
+
+ @Test
+ public void validateDestroyKeyFromBucketQueueInUninitializedBucketRegionQueue() throws Exception {
+ // Validate initial BucketRegionQueue state
+ assertEquals(0, this.bucketRegionQueue.size());
+ assertFalse(this.bucketRegionQueue.isInitialized());
+
+ // Add an event to the BucketRegionQueue and verify BucketRegionQueue state
+ this.bucketRegionQueueHelper.addEvent(KEY);
+ assertEquals(1, this.bucketRegionQueue.size());
+
+ // Create and process a ParallelQueueRemovalMessage (causes the value of the entry to be set to DESTROYED)
+ when(this.queueRegion.getKeyInfo(KEY, null, null)).thenReturn(new KeyInfo(KEY, null, null));
+ createAndProcessParallelQueueRemovalMessage();
+
+ // Clean up destroyed tokens and validate BucketRegionQueue
+ this.bucketRegionQueueHelper.cleanUpDestroyedTokensAndMarkGIIComplete();
+ assertEquals(0, this.bucketRegionQueue.size());
+ }
+
+ @Test
+ public void validateDestroyFromTempQueueInUninitializedBucketRegionQueue() throws Exception {
+ // Validate initial BucketRegionQueue state
+ assertFalse(this.bucketRegionQueue.isInitialized());
+
+ // Create a real ConcurrentParallelGatewaySenderQueue
+ ParallelGatewaySenderEventProcessor pgsep = createConcurrentParallelGatewaySenderQueue();
+
+ // Add a mock GatewaySenderEventImpl to the temp queue
+ BlockingQueue<GatewaySenderEventImpl> tempQueue = createTempQueueAndAddEvent(pgsep, mock(GatewaySenderEventImpl.class));
+ assertEquals(1, tempQueue.size());
+
+ // Create and process a ParallelQueueRemovalMessage (causes the failedBatchRemovalMessageKeys to add a key)
+ createAndProcessParallelQueueRemovalMessage();
+
+ // Validate temp queue is empty after processing ParallelQueueRemovalMessage
+ assertEquals(0, tempQueue.size());
+ }
+
+ @Test
+ public void validateDestroyFromBucketQueueAndTempQueueInUninitializedBucketRegionQueue() {
+ // Validate initial BucketRegionQueue state
+ assertFalse(this.bucketRegionQueue.isInitialized());
+ assertEquals(0, this.bucketRegionQueue.size());
+
+ // Create a real ConcurrentParallelGatewaySenderQueue
+ ParallelGatewaySenderEventProcessor pgsep = createConcurrentParallelGatewaySenderQueue();
+
+ // Add an event to the BucketRegionQueue and verify BucketRegionQueue state
+ GatewaySenderEventImpl gsei = this.bucketRegionQueueHelper.addEvent(KEY);
+ assertEquals(1, this.bucketRegionQueue.size());
+
+ // Add a mock GatewaySenderEventImpl to the temp queue
+ BlockingQueue<GatewaySenderEventImpl> tempQueue = createTempQueueAndAddEvent(pgsep, gsei);
+ assertEquals(1, tempQueue.size());
+
+ // Create and process a ParallelQueueRemovalMessage (causes the value of the entry to be set to DESTROYED)
+ when(this.queueRegion.getKeyInfo(KEY, null, null)).thenReturn(new KeyInfo(KEY, null, null));
+ createAndProcessParallelQueueRemovalMessage();
+
+ // Validate temp queue is empty after processing ParallelQueueRemovalMessage
+ assertEquals(0, tempQueue.size());
+
+ // Clean up destroyed tokens
+ this.bucketRegionQueueHelper.cleanUpDestroyedTokensAndMarkGIIComplete();
+
+ // Validate BucketRegionQueue is empty after processing ParallelQueueRemovalMessage
+ assertEquals(0, this.bucketRegionQueue.size());
+ }
+
+ private void createAndProcessParallelQueueRemovalMessage() {
+ ParallelQueueRemovalMessage pqrm = new ParallelQueueRemovalMessage(createRegionToDispatchedKeysMap());
+ pqrm.process(null);
+ }
+
+ private HashMap<String, Map<Integer, List<Long>>> createRegionToDispatchedKeysMap() {
+ HashMap<String, Map<Integer, List<Long>>> regionToDispatchedKeys = new HashMap<>();
+ Map<Integer, List<Long>> bucketIdToDispatchedKeys = new HashMap<>();
+ List<Long> dispatchedKeys = new ArrayList<>();
+ dispatchedKeys.add(KEY);
+ bucketIdToDispatchedKeys.put(BUCKET_ID, dispatchedKeys);
+ regionToDispatchedKeys.put(getRegionQueueName(), bucketIdToDispatchedKeys);
+ return regionToDispatchedKeys;
+ }
+
+ private ParallelGatewaySenderEventProcessor createConcurrentParallelGatewaySenderQueue() {
+ ParallelGatewaySenderEventProcessor pgsep = new ParallelGatewaySenderEventProcessor(sender);
+ ConcurrentParallelGatewaySenderQueue cpgsq = new ConcurrentParallelGatewaySenderQueue(sender, new ParallelGatewaySenderEventProcessor[] {pgsep});
+ Set<RegionQueue> queues = new HashSet<>();
+ queues.add(cpgsq);
+ when(this.sender.getQueues()).thenReturn(queues);
+ return pgsep;
+ }
+
+ private BlockingQueue<GatewaySenderEventImpl> createTempQueueAndAddEvent(ParallelGatewaySenderEventProcessor pgsep, GatewaySenderEventImpl gsei) {
+ ParallelGatewaySenderQueue pgsq = (ParallelGatewaySenderQueue) pgsep.getQueue();
+ Map<Integer, BlockingQueue<GatewaySenderEventImpl>> tempQueueMap = pgsq.getBucketToTempQueueMap();
+ BlockingQueue<GatewaySenderEventImpl> tempQueue = new LinkedBlockingQueue();
+ when(gsei.getShadowKey()).thenReturn(KEY);
+ tempQueue.add(gsei);
+ tempQueueMap.put(BUCKET_ID, tempQueue);
+ return tempQueue;
+ }
+
+ private String getRegionQueueName() {
+ return Region.SEPARATOR+GATEWAY_SENDER_ID+ ParallelGatewaySenderQueue.QSTRING;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b10a171e/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
index 93195c1..2ab64dd 100644
--- a/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
+++ b/geode-core/src/test/java/org/apache/geode/test/fake/Fakes.java
@@ -26,7 +26,7 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.DistributionManager;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
-import org.apache.geode.internal.cache.AbstractRegion;
+import org.apache.geode.internal.cache.CachePerfStats;
import org.apache.geode.internal.cache.GemFireCacheImpl;
import java.io.File;
@@ -74,9 +74,11 @@ public class Fakes {
when(config.getDeployWorkingDir()).thenReturn(new File("."));
when(cache.getDistributedSystem()).thenReturn(system);
+ when(cache.getSystem()).thenReturn(system);
when(cache.getMyId()).thenReturn(member);
when(cache.getDistributionManager()).thenReturn(distributionManager);
when(cache.getCancelCriterion()).thenReturn(systemCancelCriterion);
+ when(cache.getCachePerfStats()).thenReturn(mock(CachePerfStats.class));
when(system.getDistributedMember()).thenReturn(member);
when(system.getConfig()).thenReturn(config);
@@ -88,6 +90,7 @@ public class Fakes {
when(system.createAtomicStatistics(any(), any())).thenReturn(stats);
when(distributionManager.getId()).thenReturn(member);
+ when(distributionManager.getDistributionManagerId()).thenReturn(member);
when(distributionManager.getConfig()).thenReturn(config);
when(distributionManager.getSystem()).thenReturn(system);
when(distributionManager.getCancelCriterion()).thenReturn(systemCancelCriterion);
[92/98] [abbrv] incubator-geode git commit: GEODE-2012: always write
stat types to archive
Posted by ds...@apache.org.
GEODE-2012: always write stat types to archive
* write additional tests for stat archive rolling
* expose bug GEODE-2012 in StatTypesAreRolledOverRegressionTest
* fix failure in StatTypesAreRolledOverRegressionTest
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3ff33be2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3ff33be2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3ff33be2
Branch: refs/heads/feature/GEM-983
Commit: 3ff33be200484ff4c8614a0d97e3612e1ca85ac4
Parents: e9b5095
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Oct 26 14:07:44 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Thu Oct 27 12:34:43 2016 -0700
----------------------------------------------------------------------
.../org/apache/geode/internal/NanoTimer.java | 6 +-
.../geode/internal/i18n/LocalizedStrings.java | 2 +-
.../internal/statistics/HostStatSampler.java | 31 ++-
.../internal/statistics/SampleCollector.java | 10 +-
.../internal/statistics/SimpleStatSampler.java | 7 +-
.../concurrent/StoppableCountDownLatch.java | 8 +-
.../DiskSpaceLimitIntegrationTest.java | 139 ++++++++++++
.../FileSizeLimitIntegrationTest.java | 128 ++++++++++++
.../StatTypesAreRolledOverRegressionTest.java | 209 +++++++++++++++++++
9 files changed, 524 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
index 12e91f8..247f9a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
@@ -38,7 +38,7 @@ package org.apache.geode.internal;
* </pre>
*
*/
-public final class NanoTimer {
+public class NanoTimer {
public static final long NANOS_PER_MILLISECOND = 1000000;
@@ -73,7 +73,7 @@ public final class NanoTimer {
/**
* For unit testing
*/
- NanoTimer(TimeService ts) {
+ protected NanoTimer(TimeService ts) {
this.timeService = ts;
this.lastResetTime = ts.getTime();
this.constructionTime = this.lastResetTime;
@@ -164,7 +164,7 @@ public final class NanoTimer {
/**
* Allows unit tests to insert a deterministic clock for testing.
*/
- interface TimeService {
+ public interface TimeService {
/**
* Returns the current time.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index 210539b..7638cb3 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -1265,7 +1265,7 @@ public class LocalizedStrings {
"Could not free space in {0} directory. The space used is {1} which exceeds the configured limit of {2}.");
public static final StringId ManagerLogWriter_DELETED_INACTIVE__0___1_ =
- new StringId(1797, "Deleted inactive {0} \"{1}\".");
+ new StringId(1797, "Deleted inactive {0} \"{1}\".");
public static final StringId ManagerLogWriter_SWITCHING_TO_LOG__0 =
new StringId(1798, "Switching to log {0}");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
index 6d7b967..494362c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
@@ -89,12 +89,20 @@ public abstract class HostStatSampler
private final CallbackSampler callbackSampler;
+ private final NanoTimer timer;
+
protected HostStatSampler(CancelCriterion stopper, StatSamplerStats samplerStats) {
+ this(stopper, samplerStats, new NanoTimer());
+ }
+
+ protected HostStatSampler(CancelCriterion stopper, StatSamplerStats samplerStats,
+ NanoTimer timer) {
this.stopper = stopper;
this.statSamplerInitializedLatch = new StoppableCountDownLatch(this.stopper, 1);
this.samplerStats = samplerStats;
this.fileSizeLimitInKB = Boolean.getBoolean(TEST_FILE_SIZE_LIMIT_IN_KB_PROPERTY);
this.callbackSampler = new CallbackSampler(stopper, samplerStats);
+ this.timer = timer;
}
public final StatSamplerStats getStatSamplerStats() {
@@ -171,8 +179,6 @@ public abstract class HostStatSampler
*/
@Override
public final void run() {
- NanoTimer timer = new NanoTimer();
-
final boolean isDebugEnabled_STATISTICS = logger.isTraceEnabled(LogMarker.STATISTICS);
if (isDebugEnabled_STATISTICS) {
logger.trace(LogMarker.STATISTICS, "HostStatSampler started");
@@ -182,7 +188,7 @@ public abstract class HostStatSampler
initSpecialStats();
this.sampleCollector = new SampleCollector(this);
- this.sampleCollector.initialize(this, NanoTimer.getTime());
+ this.sampleCollector.initialize(this, timer.getTime());
this.statSamplerInitializedLatch.countDown();
latchCountedDown = true;
@@ -197,7 +203,7 @@ public abstract class HostStatSampler
}
final long nanosBeforeSleep = timer.getLastResetTime();
final long nanosToDelay = nanosLastTimeStamp + getNanoRate();
- delay(timer, nanosToDelay);
+ delay(nanosToDelay);
nanosLastTimeStamp = timer.getLastResetTime();
if (!stopRequested() && isSamplingEnabled()) {
final long nanosTimeStamp = timer.getLastResetTime();
@@ -371,11 +377,21 @@ public abstract class HostStatSampler
* @since GemFire 7.0
*/
public final boolean waitForInitialization(long ms) throws InterruptedException {
- return this.statSamplerInitializedLatch.await(ms);
+ return awaitInitialization(ms, TimeUnit.MILLISECONDS);
+ }
+
+ /**
+ * Awaits the initialization of special statistics.
+ *
+ * @see #initSpecialStats
+ */
+ public final boolean awaitInitialization(final long timeout, final TimeUnit unit)
+ throws InterruptedException {
+ return this.statSamplerInitializedLatch.await(timeout, unit);
}
public final void changeArchive(File newFile) {
- this.sampleCollector.changeArchive(newFile, NanoTimer.getTime());
+ this.sampleCollector.changeArchive(newFile, timer.getTime());
}
/**
@@ -476,10 +492,9 @@ public abstract class HostStatSampler
}
/**
- * @param timer a NanoTimer used to compute the elapsed delay
* @param nanosToDelay the timestamp to delay until it is the current time
*/
- private void delay(NanoTimer timer, final long nanosToDelay) throws InterruptedException {
+ private void delay(final long nanosToDelay) throws InterruptedException {
timer.reset();
long now = timer.getLastResetTime();
long remainingNanos = nanosToDelay - now;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
index 610e848..4892226 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SampleCollector.java
@@ -366,7 +366,8 @@ public class SampleCollector {
}
// notify unmarked/new handlers but not marked/old handlers
- notifyNewHandlersOfResources(handlers, this.resourceInstMap.values());
+ notifyNewHandlersOfResources(handlers, this.resourceTypeMap.values(),
+ this.resourceInstMap.values());
}
private ResourceType getResourceType(List<MarkableSampleHandler> handlers, Statistics statistics)
@@ -489,7 +490,7 @@ public class SampleCollector {
}
private void notifyNewHandlersOfResources(List<MarkableSampleHandler> handlers,
- Collection<ResourceInstance> resources) {
+ Collection<ResourceType> types, Collection<ResourceInstance> resources) {
final boolean isDebugEnabled_STATISTICS = logger.isTraceEnabled(LogMarker.STATISTICS);
if (isDebugEnabled_STATISTICS) {
logger.trace(LogMarker.STATISTICS,
@@ -509,6 +510,11 @@ public class SampleCollector {
// allocatedResourceInstance...
handler.allocatedResourceInstance(resourceInstance);
}
+ for (ResourceType resourceType : types) {
+ if (!allocatedResourceTypes.contains(resourceType)) {
+ handler.allocatedResourceType(resourceType);
+ }
+ }
handler.mark();
count++;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
index 7eaa1e0..1707397 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/SimpleStatSampler.java
@@ -19,6 +19,7 @@ import java.io.File;
import org.apache.logging.log4j.Logger;
import org.apache.geode.CancelCriterion;
+import org.apache.geode.internal.NanoTimer;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
@@ -58,7 +59,11 @@ public class SimpleStatSampler extends HostStatSampler {
private final StatisticsManager sm;
public SimpleStatSampler(CancelCriterion stopper, StatisticsManager sm) {
- super(stopper, new StatSamplerStats(sm, sm.getId()));
+ this(stopper, sm, new NanoTimer());
+ }
+
+ public SimpleStatSampler(CancelCriterion stopper, StatisticsManager sm, NanoTimer timer) {
+ super(stopper, new StatSamplerStats(sm, sm.getId()), timer);
this.sm = sm;
logger.info(LogMarker.STATISTICS, LocalizedMessage
.create(LocalizedStrings.SimpleStatSampler_STATSSAMPLERATE_0, getSampleRate()));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
index 740fd7f..4726e51 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/concurrent/StoppableCountDownLatch.java
@@ -46,6 +46,7 @@ public class StoppableCountDownLatch {
/**
* @param count the number of times {@link #countDown} must be invoked before threads can pass
* through {@link #await()}
+ *
* @throws IllegalArgumentException if {@code count} is negative
*/
public StoppableCountDownLatch(CancelCriterion stopper, int count) {
@@ -68,14 +69,19 @@ public class StoppableCountDownLatch {
/**
* @param msTimeout how long to wait in milliseconds
+ *
* @return true if it was unlatched
- * @throws InterruptedException
*/
public boolean await(long msTimeout) throws InterruptedException {
stopper.checkCancelInProgress(null);
return latch.await(msTimeout, TimeUnit.MILLISECONDS);
}
+ public boolean await(final long timeout, final TimeUnit unit) throws InterruptedException {
+ stopper.checkCancelInProgress(null);
+ return latch.await(timeout, unit);
+ }
+
public synchronized void countDown() {
latch.countDown();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
new file mode 100644
index 0000000..541bf54
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/DiskSpaceLimitIntegrationTest.java
@@ -0,0 +1,139 @@
+/*
+ * 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.internal.statistics;
+
+import static java.util.concurrent.TimeUnit.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
+import java.util.concurrent.TimeoutException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
+
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class DiskSpaceLimitIntegrationTest {
+
+ private static final long FILE_SIZE_LIMIT = 1024 * 1;
+ private static final long DISK_SPACE_LIMIT = Long.MAX_VALUE;
+
+ private File dir;
+ private String archiveFileName;
+
+ private LocalStatisticsFactory factory;
+ private StatisticDescriptor[] statisticDescriptors;
+ private StatisticsType statisticsType;
+ private Statistics statistics;
+
+ private SampleCollector sampleCollector;
+ private StatArchiveHandlerConfig config;
+
+ @Rule
+ public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public TestName testName = new TestName();
+
+ @Before
+ public void setUp() throws Exception {
+ this.dir = this.temporaryFolder.getRoot();
+ this.archiveFileName =
+ new File(this.dir, this.testName.getMethodName() + ".gfs").getAbsolutePath();
+
+ this.factory = new LocalStatisticsFactory(null);
+ this.statisticDescriptors = new StatisticDescriptor[] {
+ this.factory.createIntCounter("stat1", "description of stat1", "units", true),};
+ this.statisticsType =
+ factory.createType("statisticsType1", "statisticsType1", this.statisticDescriptors);
+ this.statistics = factory.createAtomicStatistics(this.statisticsType, "statistics1", 1);
+
+ StatisticsSampler sampler = mock(StatisticsSampler.class);
+ when(sampler.getStatistics()).thenReturn(this.factory.getStatistics());
+
+ this.config = mock(StatArchiveHandlerConfig.class);
+ when(this.config.getArchiveFileName()).thenReturn(new File(this.archiveFileName));
+ when(this.config.getArchiveFileSizeLimit()).thenReturn(FILE_SIZE_LIMIT);
+ when(this.config.getSystemId()).thenReturn(1L);
+ when(this.config.getSystemStartTime()).thenReturn(System.currentTimeMillis());
+ when(this.config.getSystemDirectoryPath())
+ .thenReturn(this.temporaryFolder.getRoot().getAbsolutePath());
+ when(this.config.getProductDescription()).thenReturn(this.testName.getMethodName());
+ when(this.config.getArchiveDiskSpaceLimit()).thenReturn(DISK_SPACE_LIMIT);
+
+ this.sampleCollector = new SampleCollector(sampler);
+ this.sampleCollector.initialize(this.config, NanoTimer.getTime());
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ StatisticsTypeFactoryImpl.clear();
+ }
+
+ @Test
+ public void zeroKeepsAllFiles() throws Exception {
+ when(this.config.getArchiveDiskSpaceLimit()).thenReturn(0L);
+ sampleUntilFileExists(archiveFile(1));
+ sampleUntilFileExists(archiveFile(2));
+ assertThat(archiveFile(1)).exists();
+ assertThat(archiveFile(2)).exists();
+ }
+
+ @Test
+ public void sameKeepsOneFile() throws Exception {
+ when(this.config.getArchiveDiskSpaceLimit()).thenReturn(FILE_SIZE_LIMIT * 2);
+ sampleUntilFileExists(archiveFile(1));
+ sampleUntilFileExists(archiveFile(2));
+ assertThat(archiveFile(1)).doesNotExist();
+ assertThat(archiveFile(2)).exists();
+ }
+
+ private File archiveFile(final int child) {
+ return new File(this.dir,
+ this.testName.getMethodName() + "-01-" + String.format("%02d", child) + ".gfs");
+ }
+
+ private void sampleUntilFileExists(final File file)
+ throws InterruptedException, TimeoutException {
+ long end = System.nanoTime() + MINUTES.toNanos(1);
+ while (!file.exists() && System.nanoTime() < end) {
+ sample();
+ }
+ if (!file.exists()) {
+ throw new TimeoutException("File " + file + " does not exist within " + 1 + " " + MINUTES);
+ }
+ }
+
+ private void sample() {
+ getSampleCollector().sample(System.nanoTime());
+ }
+
+ private SampleCollector getSampleCollector() {
+ return this.sampleCollector;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
new file mode 100644
index 0000000..5bf31b7
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/FileSizeLimitIntegrationTest.java
@@ -0,0 +1,128 @@
+/*
+ * 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.internal.statistics;
+
+import static java.util.concurrent.TimeUnit.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
+import java.util.concurrent.TimeoutException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
+
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class FileSizeLimitIntegrationTest {
+
+ private static final long FILE_SIZE_LIMIT = 1024 * 1;
+
+ private File dir;
+ private String archiveFileName;
+
+ private LocalStatisticsFactory factory;
+ private StatisticDescriptor[] statisticDescriptors;
+ private StatisticsType statisticsType;
+ private Statistics statistics;
+
+ private SampleCollector sampleCollector;
+
+ @Rule
+ public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public TestName testName = new TestName();
+
+ @Before
+ public void setUp() throws Exception {
+ this.dir = this.temporaryFolder.getRoot();
+ this.archiveFileName =
+ new File(this.dir, this.testName.getMethodName() + ".gfs").getAbsolutePath();
+
+ this.factory = new LocalStatisticsFactory(null);
+ this.statisticDescriptors = new StatisticDescriptor[] {
+ this.factory.createIntCounter("stat1", "description of stat1", "units", true),};
+ this.statisticsType =
+ factory.createType("statisticsType1", "statisticsType1", this.statisticDescriptors);
+ this.statistics = factory.createAtomicStatistics(this.statisticsType, "statistics1", 1);
+
+ StatisticsSampler sampler = mock(StatisticsSampler.class);
+ when(sampler.getStatistics()).thenReturn(this.factory.getStatistics());
+
+ StatArchiveHandlerConfig config = mock(StatArchiveHandlerConfig.class);
+ when(config.getArchiveFileName()).thenReturn(new File(this.archiveFileName));
+ when(config.getArchiveFileSizeLimit()).thenReturn(FILE_SIZE_LIMIT);
+ when(config.getSystemId()).thenReturn(1L);
+ when(config.getSystemStartTime()).thenReturn(System.currentTimeMillis());
+ when(config.getSystemDirectoryPath())
+ .thenReturn(this.temporaryFolder.getRoot().getAbsolutePath());
+ when(config.getProductDescription()).thenReturn(this.testName.getMethodName());
+ when(config.getArchiveDiskSpaceLimit()).thenReturn(0L);
+
+ this.sampleCollector = new SampleCollector(sampler);
+ this.sampleCollector.initialize(config, NanoTimer.getTime());
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ StatisticsTypeFactoryImpl.clear();
+ }
+
+ private File archiveFile(final int child) {
+ return new File(this.dir,
+ this.testName.getMethodName() + "-01-" + String.format("%02d", child) + ".gfs");
+ }
+
+ @Test
+ public void rollsWhenLimitIsReached() throws Exception { // TODO: add test to assert size is
+ // correct
+ sampleUntilFileExists(archiveFile(1));
+ sampleUntilFileExists(archiveFile(2));
+ assertThat(archiveFile(1)).exists();
+ assertThat(archiveFile(2)).exists();
+ }
+
+ private void sampleUntilFileExists(final File file)
+ throws InterruptedException, TimeoutException {
+ long end = System.nanoTime() + MINUTES.toNanos(1);
+ while (!file.exists() && System.nanoTime() < end) {
+ sample();
+ }
+ if (!file.exists()) {
+ throw new TimeoutException("File " + file + " does not exist within " + 1 + " " + MINUTES);
+ }
+ }
+
+ private void sample() {
+ getSampleCollector().sample(System.nanoTime());
+ }
+
+ private SampleCollector getSampleCollector() {
+ return this.sampleCollector;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
new file mode 100644
index 0000000..9896ec2
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatTypesAreRolledOverRegressionTest.java
@@ -0,0 +1,209 @@
+/*
+ * 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.internal.statistics;
+
+import static java.util.concurrent.TimeUnit.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import org.apache.geode.StatisticDescriptor;
+import org.apache.geode.Statistics;
+import org.apache.geode.StatisticsType;
+import org.apache.geode.internal.NanoTimer;
+import org.apache.geode.internal.statistics.StatArchiveReader.ResourceInst;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class StatTypesAreRolledOverRegressionTest {
+
+ private static final long FILE_SIZE_LIMIT = 1024 * 1;
+
+ private File dir;
+ private String archiveFileName;
+
+ private LocalStatisticsFactory factory;
+ private StatisticDescriptor[] statisticDescriptors;
+ private StatisticsType statisticsType;
+ private Statistics statistics;
+
+ private SampleCollector sampleCollector;
+
+ private NanoTimer timer = new NanoTimer();
+ private long nanosTimeStamp;
+
+ @Rule
+ public RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
+ @Rule
+ public TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule
+ public TestName testName = new TestName();
+
+ @Before
+ public void setUp() throws Exception {
+ this.dir = this.temporaryFolder.getRoot();
+ this.archiveFileName =
+ new File(this.dir, this.testName.getMethodName() + ".gfs").getAbsolutePath();
+
+ this.factory = new LocalStatisticsFactory(null);
+ this.statisticDescriptors = new StatisticDescriptor[] {
+ this.factory.createIntCounter("stat1", "description of stat1", "units", true),};
+ this.statisticsType =
+ factory.createType("statisticsType1", "statisticsType1", this.statisticDescriptors);
+ this.statistics = factory.createAtomicStatistics(this.statisticsType, "statistics1", 1);
+
+ Answer<Statistics[]> statisticsAnswer = new Answer<Statistics[]>() {
+ public Statistics[] answer(InvocationOnMock invocation) throws Throwable {
+ return factory.getStatistics();
+ }
+ };
+
+ Answer<Integer> modCountAnswer = new Answer<Integer>() {
+ public Integer answer(InvocationOnMock invocation) throws Throwable {
+ return factory.getStatListModCount();
+ }
+ };
+
+ StatisticsSampler sampler = mock(StatisticsSampler.class);
+ when(sampler.getStatistics()).thenAnswer(statisticsAnswer);
+ when(sampler.getStatisticsModCount()).thenAnswer(modCountAnswer);
+
+ StatArchiveHandlerConfig config = mock(StatArchiveHandlerConfig.class);
+ when(config.getArchiveFileName()).thenReturn(new File(this.archiveFileName));
+ when(config.getArchiveFileSizeLimit()).thenReturn(FILE_SIZE_LIMIT);
+ when(config.getSystemId()).thenReturn(1L);
+ when(config.getSystemStartTime()).thenReturn(System.currentTimeMillis());
+ when(config.getSystemDirectoryPath())
+ .thenReturn(this.temporaryFolder.getRoot().getAbsolutePath());
+ when(config.getProductDescription()).thenReturn(this.testName.getMethodName());
+ when(config.getArchiveDiskSpaceLimit()).thenReturn(0L);
+
+ this.sampleCollector = new SampleCollector(sampler);
+ this.sampleCollector.initialize(config, this.timer.getTime());
+
+ this.timer.reset();
+ this.nanosTimeStamp = this.timer.getLastResetTime() - getNanoRate();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ StatisticsTypeFactoryImpl.clear();
+ }
+
+ @Test
+ public void closedInstanceShouldHaveTypeInRolledArchives() throws Exception {
+ // initial state
+ verifyStatisticsTypeIsInArchiveFile(archiveFile(), 0);
+
+ // one sample
+ sample(advanceNanosTimeStamp());
+ verifyStatisticsTypeIsInArchiveFile(archiveFile(), 1);
+
+ // close stats
+ this.statistics.close();
+
+ assertThat(archiveFile(1)).doesNotExist();
+
+ // cause roll
+ sampleUntilFileExists(archiveFile(1));
+
+ sample(advanceNanosTimeStamp());
+ verifyStatisticsTypeIsInArchiveFile(archiveFile(), 0);
+
+ this.statistics = factory.createAtomicStatistics(this.statisticsType, "statistics1", 2);
+
+ sample(advanceNanosTimeStamp());
+ verifyStatisticsTypeIsInArchiveFile(archiveFile(), 1); // should be corrupt?
+
+ }
+
+ private void verifyStatisticsTypeIsInArchiveFile(final File archiveFile,
+ final int expectedResources) throws IOException {
+ StatArchiveReader reader = new StatArchiveReader(new File[] {archiveFile}, null, false);
+
+ // compare all resourceInst values against what was printed above
+
+ List<ResourceInst> resources = reader.getResourceInstList();
+ if (expectedResources > 0) {
+ assertThat(resources).hasAtLeastOneElementOfType(ResourceInst.class);
+ }
+
+ for (ResourceInst resourceInstance : resources) {
+ if (resourceInstance == null)
+ continue;
+ assertThat(resourceInstance.getName()).isNotNull();
+ assertThat(resourceInstance.getType()).isNotNull();
+ assertThat(resourceInstance.getType().getName()).isEqualTo(this.statisticsType.getName());
+ }
+ }
+
+ private void sampleUntilFileExists(final File file)
+ throws InterruptedException, TimeoutException {
+ long timeout = System.nanoTime() + MINUTES.toNanos(1);
+ int count = 0;
+ do {
+ sample(advanceNanosTimeStamp());
+ count++;
+ } while (!file.exists() && System.nanoTime() < timeout);
+ if (!file.exists()) {
+ throw new TimeoutException("File " + file + " does not exist within " + 1 + " " + MINUTES);
+ }
+ }
+
+ private void sample(final long time) {
+ getSampleCollector().sample(time);
+ }
+
+ private SampleCollector getSampleCollector() {
+ return this.sampleCollector;
+ }
+
+ private File archiveFile(final int child) {
+ return new File(this.dir,
+ this.testName.getMethodName() + "-01-" + String.format("%02d", child) + ".gfs");
+ }
+
+ private File archiveFile() {
+ return new File(this.archiveFileName);
+ }
+
+ private long advanceNanosTimeStamp() {
+ this.nanosTimeStamp += getNanoRate();
+ return this.nanosTimeStamp;
+ }
+
+ private long getNanoRate() {
+ return NanoTimer.millisToNanos(getSampleRate());
+ }
+
+ private long getSampleRate() {
+ return 1000; // 1 second
+ }
+}
[79/98] [abbrv] incubator-geode git commit: Revert "GEODE-2000 Now
ClientMembershipListener returns host on which"
Posted by ds...@apache.org.
Revert "GEODE-2000 Now ClientMembershipListener returns host on which"
This reverts commit 8a080323070dbbc1d7037612d0d8e1188dcf1507.
This change caused some CI failures that folks suppressed. The fix needs
to be revisited.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/be2a4048
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/be2a4048
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/be2a4048
Branch: refs/heads/feature/GEM-983
Commit: be2a40488b44ebeccdac0d8b6c8a3810df00f9da
Parents: 60f8a80
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Tue Oct 25 14:08:10 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Tue Oct 25 14:51:58 2016 -0700
----------------------------------------------------------------------
.../membership/InternalDistributedMember.java | 6 +----
.../internal/cache/tier/sockets/HandShake.java | 9 +++----
.../AutoConnectionSourceImplJUnitTest.java | 27 --------------------
3 files changed, 4 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be2a4048/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index ac8379b..82dd055 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -1171,11 +1171,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
}
public String getHost() {
- return this.hostName;
- }
-
- public void setHost(String h) {
- this.hostName = h;
+ return this.netMbr.getInetAddress().getCanonicalHostName();
}
public int getProcessId() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be2a4048/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index 5e13be0..95e531d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -1253,7 +1253,7 @@ public class HandShake implements ClientHandShake {
int qSize = dis.readInt();
// Read the server member
- member = readServerMember(dis, location);
+ member = readServerMember(dis);
serverQStatus = new ServerQueueStatus(epType, qSize, member);
// Read the message (if any)
@@ -1368,8 +1368,7 @@ public class HandShake implements ClientHandShake {
return sqs;
}
- public static DistributedMember readServerMember(DataInputStream p_dis,
- ServerLocation serverLocation) throws IOException {
+ protected DistributedMember readServerMember(DataInputStream p_dis) throws IOException {
byte[] memberBytes = DataSerializer.readByteArray(p_dis);
ByteArrayInputStream bais = new ByteArrayInputStream(memberBytes);
@@ -1379,9 +1378,7 @@ public class HandShake implements ClientHandShake {
dis = new VersionedDataInputStream(dis, v);
}
try {
- InternalDistributedMember ids = (InternalDistributedMember) DataSerializer.readObject(dis);
- ids.setHost(serverLocation.getHostName());
- return ids;
+ return (DistributedMember) DataSerializer.readObject(dis);
} catch (EOFException e) {
throw e;
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be2a4048/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index 63fc8d5..913edf2 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -15,7 +15,6 @@
package org.apache.geode.cache.client.internal;
import org.apache.geode.CancelCriterion;
-import org.apache.geode.DataSerializer;
import org.apache.geode.cache.*;
import org.apache.geode.cache.client.NoAvailableLocatorsException;
import org.apache.geode.cache.client.SubscriptionNotEnabledException;
@@ -23,29 +22,22 @@ import org.apache.geode.cache.client.internal.locator.ClientConnectionRequest;
import org.apache.geode.cache.client.internal.locator.ClientConnectionResponse;
import org.apache.geode.cache.client.internal.locator.LocatorListResponse;
import org.apache.geode.cache.query.QueryService;
-import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.PoolStatHelper;
import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.SharedConfiguration;
-import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
import org.apache.geode.distributed.internal.tcpserver.TcpClient;
import org.apache.geode.distributed.internal.tcpserver.TcpHandler;
import org.apache.geode.distributed.internal.tcpserver.TcpServer;
import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.HeapDataOutputStream;
-import org.apache.geode.internal.Version;
import org.apache.geode.internal.cache.PoolStats;
-import org.apache.geode.internal.cache.tier.sockets.HandShake;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
import java.io.IOException;
import java.net.ConnectException;
import java.net.InetAddress;
@@ -146,25 +138,6 @@ public class AutoConnectionSourceImplJUnitTest {
}
@Test
- public void testClientMembershipListenerHostAtClient() throws IOException {
- String fakeHost = "fake.com";
- InternalDistributedMember member = new InternalDistributedMember("localhost", 54638);
- ServerLocation sl = new ServerLocation(fakeHost, 420);
-
- HeapDataOutputStream dos = new HeapDataOutputStream(Version.CURRENT);
- HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
- DataSerializer.writeObject(member, hdos);
- DataSerializer.writeByteArray(hdos.toByteArray(), dos);
- hdos.close();
-
- DataInputStream dis = new DataInputStream(new ByteArrayInputStream(dos.toByteArray()));
-
- DistributedMember ret = (DistributedMember) HandShake.readServerMember(dis, sl);
-
- assertEquals(fakeHost, ret.getHost());
- }
-
- @Test
public void testNoServers() throws Exception {
startFakeLocator();
handler.nextConnectionResponse = new ClientConnectionResponse(null);
[12/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
index 81f543d..d3f4ab2 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
@@ -1,9 +1,8 @@
/*
- * Copyright (C) MX4J.
- * All rights reserved.
+ * Copyright (C) MX4J. All rights reserved.
*
- * This software is distributed under the terms of the MX4J License version 1.0.
- * See the terms of the MX4J License in the documentation provided with this software.
+ * This software is distributed under the terms of the MX4J License version 1.0. See the terms of
+ * the MX4J License in the documentation provided with this software.
*/
package org.apache.geode.admin.jmx.internal;
@@ -64,1176 +63,1170 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* @author <a href="mailto:biorn_steedom@users.sourceforge.net">Simone Bordet</a>
* @version $Revision: 1.14 $
*/
-public class MX4JModelMBean implements ModelMBean, MBeanRegistration, NotificationEmitter
-{
- private static final String OBJECT_RESOURCE_TYPE = "ObjectReference";
-
- private static final int ALWAYS_STALE = 1;
- private static final int NEVER_STALE = 2;
- private static final int STALE = 3;
- private static final int NOT_STALE = 4;
-
- private static final int PERSIST_NEVER = -1;
- private static final int PERSIST_ON_TIMER = -2;
- private static final int PERSIST_ON_UPDATE = -3;
- private static final int PERSIST_NO_MORE_OFTEN_THAN = -4;
-
- private MBeanServer m_mbeanServer;
- private Object m_managedResource;
- private boolean m_canBeRegistered;
- private ModelMBeanInfo m_modelMBeanInfo;
- private NotificationBroadcasterSupport m_attributeChangeBroadcaster = new NotificationBroadcasterSupport();
- private NotificationBroadcasterSupport m_generalBroadcaster = new NotificationBroadcasterSupport();
-
- public MX4JModelMBean() throws MBeanException, RuntimeOperationsException
- {
- try
- {
- load();
+public class MX4JModelMBean implements ModelMBean, MBeanRegistration, NotificationEmitter {
+ private static final String OBJECT_RESOURCE_TYPE = "ObjectReference";
+
+ private static final int ALWAYS_STALE = 1;
+ private static final int NEVER_STALE = 2;
+ private static final int STALE = 3;
+ private static final int NOT_STALE = 4;
+
+ private static final int PERSIST_NEVER = -1;
+ private static final int PERSIST_ON_TIMER = -2;
+ private static final int PERSIST_ON_UPDATE = -3;
+ private static final int PERSIST_NO_MORE_OFTEN_THAN = -4;
+
+ private MBeanServer m_mbeanServer;
+ private Object m_managedResource;
+ private boolean m_canBeRegistered;
+ private ModelMBeanInfo m_modelMBeanInfo;
+ private NotificationBroadcasterSupport m_attributeChangeBroadcaster =
+ new NotificationBroadcasterSupport();
+ private NotificationBroadcasterSupport m_generalBroadcaster =
+ new NotificationBroadcasterSupport();
+
+ public MX4JModelMBean() throws MBeanException, RuntimeOperationsException {
+ try {
+ load();
+ } catch (Exception x) {
+ Logger logger = getLogger();
+ logger.warn(LocalizedStrings.MX4JModelMBean_CANNOT_RESTORE_PREVIOUSLY_SAVED_STATUS
+ .toLocalizedString(), x);
+ }
+ }
+
+ public MX4JModelMBean(ModelMBeanInfo info) throws MBeanException, RuntimeOperationsException {
+ if (info == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_PARAMETER_CANT_BE_NULL
+ .toLocalizedString()));
+ else
+ setModelMBeanInfo(info);
+ }
+
+ private Logger getLogger() {
+ return Log.getLogger(getClass().getName());
+ }
+
+ public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception {
+ if (m_canBeRegistered) {
+ m_mbeanServer = server;
+ return name;
+ } else {
+ throw new MBeanRegistrationException(new IllegalStateException(
+ LocalizedStrings.MX4JModelMBean_MODELMBEAN_CANNOT_BE_REGISTERED_UNTIL_SETMODELMBEANINFO_HAS_BEEN_CALLED
+ .toLocalizedString()));
+ }
+ }
+
+ public void postRegister(Boolean registrationDone) {
+ if (!registrationDone.booleanValue())
+ clear();
+ }
+
+ public void preDeregister() throws Exception {}
+
+ public void postDeregister() {
+ clear();
+ }
+
+ private void clear() {
+ m_mbeanServer = null;
+ m_managedResource = null;
+ m_modelMBeanInfo = null;
+ m_generalBroadcaster = null;
+ m_attributeChangeBroadcaster = null;
+ // PENDING: also remove generic listeners, attribute change listeners, log4j appenders...
+ }
+
+ public void setModelMBeanInfo(ModelMBeanInfo modelMBeanInfo)
+ throws MBeanException, RuntimeOperationsException {
+ if (modelMBeanInfo == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_CANNOT_BE_NULL.toLocalizedString()));
+ if (!isModelMBeanInfoValid(modelMBeanInfo))
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_INVALID.toLocalizedString()));
+
+ m_modelMBeanInfo = (ModelMBeanInfo) modelMBeanInfo.clone();
+
+ Logger logger = getLogger();
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("ModelMBeanInfo successfully set to: " + m_modelMBeanInfo);
+ // Only now the MBean can be registered in the MBeanServer
+ m_canBeRegistered = true;
+ }
+
+ private boolean isModelMBeanInfoValid(ModelMBeanInfo info) {
+ if (info == null || info.getClassName() == null)
+ return false;
+ // PENDING: maybe more checks are needed
+ return true;
+ }
+
+ public void setManagedResource(Object resource, String resourceType) throws MBeanException,
+ RuntimeOperationsException, InstanceNotFoundException, InvalidTargetObjectTypeException {
+ if (resource == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_MANAGED_RESOURCE_CANNOT_BE_NULL.toLocalizedString()));
+ if (!isResourceTypeSupported(resourceType))
+ throw new InvalidTargetObjectTypeException(resourceType);
+
+ Logger logger = getLogger();
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Setting managed resource to be: " + resource);
+ m_managedResource = resource;
+ }
+
+ private boolean isResourceTypeSupported(String resourceType) {
+ // For now only object reference is supported
+ return OBJECT_RESOURCE_TYPE.equals(resourceType);
+ }
+
+ private Object getManagedResource() {
+ return m_managedResource;
+ }
+
+ public MBeanInfo getMBeanInfo() {
+ return m_modelMBeanInfo == null ? null : (MBeanInfo) m_modelMBeanInfo.clone();
+ }
+
+ public void addAttributeChangeNotificationListener(NotificationListener listener,
+ String attributeName, Object handback)
+ throws MBeanException, RuntimeOperationsException, IllegalArgumentException {
+ if (listener == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_LISTENER_CANNOT_BE_NULL.toLocalizedString()));
+ AttributeChangeNotificationFilter filter = new AttributeChangeNotificationFilter();
+ if (attributeName != null) {
+ filter.enableAttribute(attributeName);
+ } else {
+ MBeanAttributeInfo[] ai = m_modelMBeanInfo.getAttributes();
+ for (int i = 0; i < ai.length; i++) {
+ Descriptor d = ((ModelMBeanAttributeInfo) ai[i]).getDescriptor();
+ filter.enableAttribute((String) d.getFieldValue("name"));
}
- catch (Exception x)
- {
- Logger logger = getLogger();
- logger.warn(LocalizedStrings.MX4JModelMBean_CANNOT_RESTORE_PREVIOUSLY_SAVED_STATUS.toLocalizedString(), x);
+ }
+
+ getAttributeChangeBroadcaster().addNotificationListener(listener, filter, handback);
+
+ Logger logger = getLogger();
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Listener " + listener + " for attribute " + attributeName
+ + " added successfully, handback is " + handback);
+ }
+
+ public void addNotificationListener(NotificationListener listener, NotificationFilter filter,
+ Object handback) throws IllegalArgumentException {
+ m_generalBroadcaster.addNotificationListener(listener, filter, handback);
+ }
+
+ public MBeanNotificationInfo[] getNotificationInfo() {
+ return m_modelMBeanInfo.getNotifications();
+ }
+
+ public void removeAttributeChangeNotificationListener(NotificationListener listener,
+ String attributeName) throws RuntimeOperationsException, ListenerNotFoundException {
+ try {
+ removeAttributeChangeNotificationListener(listener, attributeName, null);
+ } catch (MBeanException e) {
+ throw new RuntimeOperationsException(new RuntimeException(e.getMessage()));
+ }
+ }
+
+ // Not in the spec but needed
+ private void removeAttributeChangeNotificationListener(NotificationListener listener,
+ String attributeName, Object handback)
+ throws MBeanException, RuntimeOperationsException, ListenerNotFoundException {
+ if (listener == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_LISTENER_CANNOT_BE_NULL.toLocalizedString()));
+ AttributeChangeNotificationFilter filter = new AttributeChangeNotificationFilter();
+ if (attributeName != null) {
+ filter.enableAttribute(attributeName);
+ } else {
+ MBeanAttributeInfo[] ai = m_modelMBeanInfo.getAttributes();
+ for (int i = 0; i < ai.length; i++) {
+ Descriptor d = ((ModelMBeanAttributeInfo) ai[i]).getDescriptor();
+ filter.enableAttribute((String) d.getFieldValue("name"));
}
- }
-
- public MX4JModelMBean(ModelMBeanInfo info) throws MBeanException, RuntimeOperationsException
- {
- if (info == null)
- throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_PARAMETER_CANT_BE_NULL.toLocalizedString()));
- else
- setModelMBeanInfo(info);
- }
-
- private Logger getLogger()
- {
- return Log.getLogger(getClass().getName());
- }
-
- public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception
- {
- if (m_canBeRegistered)
- {
- m_mbeanServer = server;
- return name;
+ }
+
+ getAttributeChangeBroadcaster().removeNotificationListener(listener, filter, handback);
+
+ Logger logger = getLogger();
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Listener " + listener + " for attribute " + attributeName
+ + " removed successfully, handback is " + handback);
+ }
+
+ public void removeNotificationListener(NotificationListener listener)
+ throws RuntimeOperationsException, ListenerNotFoundException {
+ m_generalBroadcaster.removeNotificationListener(listener);
+ }
+
+ public void removeNotificationListener(NotificationListener listener, NotificationFilter filter,
+ Object handback) throws RuntimeOperationsException, ListenerNotFoundException {
+ m_generalBroadcaster.removeNotificationListener(listener, filter, handback);
+ }
+
+ public void sendAttributeChangeNotification(Attribute oldAttribute, Attribute newAttribute)
+ throws MBeanException, RuntimeOperationsException {
+ if (oldAttribute == null || newAttribute == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_CANNOT_BE_NULL.toLocalizedString()));
+ if (!oldAttribute.getName().equals(newAttribute.getName()))
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_NAMES_CANNOT_BE_DIFFERENT.toLocalizedString()));
+
+ // TODO: the source must be the object name of the MBean if the listener was registered through
+ // MBeanServer
+ Object oldValue = oldAttribute.getValue();
+ AttributeChangeNotification n = new AttributeChangeNotification(this, 1,
+ System.currentTimeMillis(), "Attribute value changed", oldAttribute.getName(),
+ oldValue == null ? null : oldValue.getClass().getName(), oldValue, newAttribute.getValue());
+ sendAttributeChangeNotification(n);
+ }
+
+ public void sendAttributeChangeNotification(AttributeChangeNotification notification)
+ throws MBeanException, RuntimeOperationsException {
+ if (notification == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_NOTIFICATION_CANNOT_BE_NULL.toLocalizedString()));
+
+ getAttributeChangeBroadcaster().sendNotification(notification);
+
+ Logger modelMBeanLogger = getModelMBeanLogger(notification.getType());
+ if (modelMBeanLogger != null)
+ if (modelMBeanLogger.isEnabledFor(Logger.DEBUG))
+ modelMBeanLogger.debug("ModelMBean log: " + new Date() + " - " + notification);
+
+ Logger logger = getLogger();
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Attribute change notification " + notification + " sent");
+ }
+
+ public void sendNotification(String message) throws MBeanException, RuntimeOperationsException {
+ Notification notification = new Notification("jmx.modelmbean.general", this, 1, message);
+ sendNotification(notification);
+ }
+
+ public void sendNotification(Notification notification)
+ throws MBeanException, RuntimeOperationsException {
+ if (m_generalBroadcaster != null) {
+ m_generalBroadcaster.sendNotification(notification);
+ }
+ }
+
+ public AttributeList getAttributes(String[] attributes) {
+ if (attributes == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_NAMES_CANNOT_BE_NULL.toLocalizedString()));
+
+ Logger logger = getLogger();
+
+ AttributeList list = new AttributeList();
+ for (int i = 0; i < attributes.length; ++i) {
+ String attrName = attributes[i];
+ Attribute attribute = null;
+ try {
+ Object value = getAttribute(attrName);
+ attribute = new Attribute(attrName, value);
+ list.add(attribute);
+ } catch (Exception x) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("getAttribute for attribute " + attrName + " failed", x);
+ // And go on with the next attribute
}
- else
- {
- throw new MBeanRegistrationException(new IllegalStateException(LocalizedStrings.MX4JModelMBean_MODELMBEAN_CANNOT_BE_REGISTERED_UNTIL_SETMODELMBEANINFO_HAS_BEEN_CALLED.toLocalizedString()));
+ }
+ return list;
+ }
+
+ public Object getAttribute(String attribute)
+ throws AttributeNotFoundException, MBeanException, ReflectionException {
+ if (attribute == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_NAME_CANNOT_BE_NULL.toLocalizedString()));
+
+ Logger logger = getLogger();
+
+ // I want the real info, not its clone
+ ModelMBeanInfo info = getModelMBeanInfo();
+ if (info == null)
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_NULL.toLocalizedString());
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("ModelMBeanInfo is: " + info);
+
+ // This is a clone, we use it read only
+ ModelMBeanAttributeInfo attrInfo = info.getAttribute(attribute);
+ if (attrInfo == null)
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_CANNOT_FIND_MODELMBEANATTRIBUTEINFO_FOR_ATTRIBUTE_0
+ .toLocalizedString(attribute));
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Attribute info is: " + attrInfo);
+ if (!attrInfo.isReadable())
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_0_IS_NOT_READABLE.toLocalizedString(attribute));
+
+ // This returns a clone of the mbean descriptor, we use it read only
+ Descriptor mbeanDescriptor = info.getMBeanDescriptor();
+ if (mbeanDescriptor == null)
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_MBEAN_DESCRIPTOR_CANNOT_BE_NULL.toLocalizedString());
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("MBean descriptor is: " + mbeanDescriptor);
+
+ // This descriptor is a clone
+ Descriptor attributeDescriptor = attrInfo.getDescriptor();
+ if (attributeDescriptor == null)
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_DESCRIPTOR_FOR_ATTRIBUTE_0_CANNOT_BE_NULL
+ .toLocalizedString(attribute));
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Attribute descriptor is: " + attributeDescriptor);
+
+ Object returnValue = null;
+
+ String lastUpdateField = "lastUpdatedTimeStamp";
+
+ int staleness = getStaleness(attributeDescriptor, mbeanDescriptor, lastUpdateField);
+
+ if (staleness == ALWAYS_STALE || staleness == STALE) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Value is stale");
+
+ String getter = (String) attributeDescriptor.getFieldValue("getMethod");
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("getMethod field is: " + getter);
+ if (getter == null) {
+ // No getter, use default value
+ returnValue = attributeDescriptor.getFieldValue("default");
+
+ if (returnValue != null) {
+ // Check if the return type is of the same type
+ // As an extension allow covariant return type
+ Class returned = returnValue.getClass();
+ Class declared = loadClassWithContextClassLoader(attrInfo.getType());
+
+ checkAssignability(returned, declared);
+ }
+
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug(
+ "getAttribute for attribute " + attribute + " returns default value: " + returnValue);
+ } else {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Invoking attribute getter...");
+ // As an extension, allow attributes to be called on target objects also
+ Object target = resolveTargetObject(attributeDescriptor);
+ returnValue = invokeMethod(target, getter, new Class[0], new Object[0]);
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Returned value is: " + returnValue);
+
+ if (returnValue != null) {
+ // Check if the return type is of the same type
+ // As an extension allow covariant return type
+ Class returned = returnValue.getClass();
+ Class declared = loadClassWithContextClassLoader(attrInfo.getType());
+
+ checkAssignability(returned, declared);
+ }
+
+ // Cache the new value only if caching is needed
+ if (staleness != ALWAYS_STALE) {
+ attributeDescriptor.setField("value", returnValue);
+ attributeDescriptor.setField(lastUpdateField, Long.valueOf(System.currentTimeMillis()));
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Returned value has been cached");
+
+ // And now replace the descriptor with the updated clone
+ info.setDescriptor(attributeDescriptor, "attribute");
+ }
+
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug(
+ "getAttribute for attribute " + attribute + " returns invoked value: " + returnValue);
}
- }
+ } else {
+ // Return cached value
+ returnValue = attributeDescriptor.getFieldValue("value");
- public void postRegister(Boolean registrationDone)
- {
- if (!registrationDone.booleanValue()) clear();
- }
-
- public void preDeregister() throws Exception
- {
- }
-
- public void postDeregister()
- {
- clear();
- }
+ if (returnValue != null) {
+ // Check if the return type is of the same type
+ // As an extension allow covariant return type
+ Class returned = returnValue.getClass();
+ Class declared = loadClassWithContextClassLoader(attrInfo.getType());
- private void clear()
- {
- m_mbeanServer = null;
- m_managedResource = null;
- m_modelMBeanInfo = null;
- m_generalBroadcaster = null;
- m_attributeChangeBroadcaster = null;
- // PENDING: also remove generic listeners, attribute change listeners, log4j appenders...
- }
-
- public void setModelMBeanInfo(ModelMBeanInfo modelMBeanInfo) throws MBeanException, RuntimeOperationsException
- {
- if (modelMBeanInfo == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_CANNOT_BE_NULL.toLocalizedString()));
- if (!isModelMBeanInfoValid(modelMBeanInfo)) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_INVALID.toLocalizedString()));
-
- m_modelMBeanInfo = (ModelMBeanInfo)modelMBeanInfo.clone();
-
- Logger logger = getLogger();
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("ModelMBeanInfo successfully set to: " + m_modelMBeanInfo);
- // Only now the MBean can be registered in the MBeanServer
- m_canBeRegistered = true;
- }
-
- private boolean isModelMBeanInfoValid(ModelMBeanInfo info)
- {
- if (info == null || info.getClassName() == null) return false;
- // PENDING: maybe more checks are needed
- return true;
- }
-
- public void setManagedResource(Object resource, String resourceType) throws MBeanException, RuntimeOperationsException, InstanceNotFoundException, InvalidTargetObjectTypeException
- {
- if (resource == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_MANAGED_RESOURCE_CANNOT_BE_NULL.toLocalizedString()));
- if (!isResourceTypeSupported(resourceType)) throw new InvalidTargetObjectTypeException(resourceType);
-
- Logger logger = getLogger();
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Setting managed resource to be: " + resource);
- m_managedResource = resource;
- }
-
- private boolean isResourceTypeSupported(String resourceType)
- {
- // For now only object reference is supported
- return OBJECT_RESOURCE_TYPE.equals(resourceType);
- }
-
- private Object getManagedResource()
- {
- return m_managedResource;
- }
-
- public MBeanInfo getMBeanInfo()
- {
- return m_modelMBeanInfo == null ? null : (MBeanInfo)m_modelMBeanInfo.clone();
- }
-
- public void addAttributeChangeNotificationListener(NotificationListener listener, String attributeName, Object handback) throws MBeanException, RuntimeOperationsException, IllegalArgumentException
- {
- if (listener == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_LISTENER_CANNOT_BE_NULL.toLocalizedString()));
- AttributeChangeNotificationFilter filter = new AttributeChangeNotificationFilter();
- if (attributeName != null)
- {
- filter.enableAttribute(attributeName);
+ checkAssignability(returned, declared);
}
- else
- {
- MBeanAttributeInfo[] ai = m_modelMBeanInfo.getAttributes();
- for (int i = 0; i < ai.length; i++)
- {
- Descriptor d = ((ModelMBeanAttributeInfo)ai[i]).getDescriptor();
- filter.enableAttribute((String)d.getFieldValue("name"));
- }
- }
-
- getAttributeChangeBroadcaster().addNotificationListener(listener, filter, handback);
- Logger logger = getLogger();
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Listener " + listener + " for attribute " + attributeName + " added successfully, handback is " + handback);
- }
-
- public void addNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback) throws IllegalArgumentException
- {
- m_generalBroadcaster.addNotificationListener(listener, filter, handback);
- }
-
- public MBeanNotificationInfo[] getNotificationInfo()
- {
- return m_modelMBeanInfo.getNotifications();
- }
-
- public void removeAttributeChangeNotificationListener(NotificationListener listener, String attributeName) throws RuntimeOperationsException, ListenerNotFoundException
- {
- try
- {
- removeAttributeChangeNotificationListener(listener, attributeName, null);
- }
- catch (MBeanException e)
- {
- throw new RuntimeOperationsException(new RuntimeException(e.getMessage()));
- }
- }
-
- // Not in the spec but needed
- private void removeAttributeChangeNotificationListener(NotificationListener listener, String attributeName, Object handback) throws MBeanException, RuntimeOperationsException, ListenerNotFoundException
- {
- if (listener == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_LISTENER_CANNOT_BE_NULL.toLocalizedString()));
- AttributeChangeNotificationFilter filter = new AttributeChangeNotificationFilter();
- if (attributeName != null)
- {
- filter.enableAttribute(attributeName);
- }
- else
- {
- MBeanAttributeInfo[] ai = m_modelMBeanInfo.getAttributes();
- for (int i = 0; i < ai.length; i++)
- {
- Descriptor d = ((ModelMBeanAttributeInfo)ai[i]).getDescriptor();
- filter.enableAttribute((String)d.getFieldValue("name"));
- }
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug(
+ "getAttribute for attribute " + attribute + " returns cached value: " + returnValue);
+ }
+
+ // Puff, everything went ok
+ return returnValue;
+ }
+
+ public AttributeList setAttributes(AttributeList attributes) {
+ if (attributes == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_LIST_CANNOT_BE_NULL.toLocalizedString()));
+
+ Logger logger = getLogger();
+
+ AttributeList list = new AttributeList();
+ for (Iterator i = attributes.iterator(); i.hasNext();) {
+ Attribute attribute = (Attribute) i.next();
+ String name = attribute.getName();
+ try {
+ setAttribute(attribute);
+ list.add(attribute);
+ } catch (Exception x) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("setAttribute for attribute " + name + " failed", x);
+ // And go on with the next one
}
-
- getAttributeChangeBroadcaster().removeNotificationListener(listener, filter, handback);
-
- Logger logger = getLogger();
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Listener " + listener + " for attribute " + attributeName + " removed successfully, handback is " + handback);
- }
-
- public void removeNotificationListener(NotificationListener listener) throws RuntimeOperationsException, ListenerNotFoundException
- {
- m_generalBroadcaster.removeNotificationListener(listener);
- }
-
- public void removeNotificationListener(NotificationListener listener, NotificationFilter filter, Object handback) throws RuntimeOperationsException, ListenerNotFoundException
- {
- m_generalBroadcaster.removeNotificationListener(listener, filter, handback);
- }
-
- public void sendAttributeChangeNotification(Attribute oldAttribute, Attribute newAttribute) throws MBeanException, RuntimeOperationsException
- {
- if (oldAttribute == null || newAttribute == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_CANNOT_BE_NULL.toLocalizedString()));
- if (!oldAttribute.getName().equals(newAttribute.getName())) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_NAMES_CANNOT_BE_DIFFERENT.toLocalizedString()));
-
- // TODO: the source must be the object name of the MBean if the listener was registered through MBeanServer
- Object oldValue = oldAttribute.getValue();
- AttributeChangeNotification n = new AttributeChangeNotification(this,
- 1,
- System.currentTimeMillis(),
- "Attribute value changed",
- oldAttribute.getName(),
- oldValue == null ? null : oldValue.getClass().getName(),
- oldValue,
- newAttribute.getValue());
- sendAttributeChangeNotification(n);
- }
-
- public void sendAttributeChangeNotification(AttributeChangeNotification notification) throws MBeanException, RuntimeOperationsException
- {
- if (notification == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_NOTIFICATION_CANNOT_BE_NULL.toLocalizedString()));
-
- getAttributeChangeBroadcaster().sendNotification(notification);
-
- Logger modelMBeanLogger = getModelMBeanLogger(notification.getType());
- if (modelMBeanLogger != null) if (modelMBeanLogger.isEnabledFor(Logger.DEBUG)) modelMBeanLogger.debug("ModelMBean log: " + new Date() + " - " + notification);
-
- Logger logger = getLogger();
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Attribute change notification " + notification + " sent");
- }
-
- public void sendNotification(String message) throws MBeanException, RuntimeOperationsException
- {
- Notification notification = new Notification("jmx.modelmbean.general", this, 1, message);
- sendNotification(notification);
- }
-
- public void sendNotification(Notification notification) throws MBeanException, RuntimeOperationsException
- {
- if (m_generalBroadcaster != null) {
- m_generalBroadcaster.sendNotification(notification);
- }
- }
-
- public AttributeList getAttributes(String[] attributes)
- {
- if (attributes == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_NAMES_CANNOT_BE_NULL.toLocalizedString()));
-
- Logger logger = getLogger();
-
- AttributeList list = new AttributeList();
- for (int i = 0; i < attributes.length; ++i)
- {
- String attrName = attributes[i];
- Attribute attribute = null;
- try
- {
- Object value = getAttribute(attrName);
- attribute = new Attribute(attrName, value);
- list.add(attribute);
- }
- catch (Exception x)
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("getAttribute for attribute " + attrName + " failed", x);
- // And go on with the next attribute
- }
+ }
+ return list;
+ }
+
+ public void setAttribute(Attribute attribute) throws AttributeNotFoundException,
+ InvalidAttributeValueException, MBeanException, ReflectionException {
+ if (attribute == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_CANNOT_BE_NULL.toLocalizedString()));
+
+ Logger logger = getLogger();
+
+ // No need to synchronize: I work mostly on clones
+ // I want the real info, not its clone
+ ModelMBeanInfo info = getModelMBeanInfo();
+ if (info == null)
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_NULL.toLocalizedString());
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("ModelMBeanInfo is: " + info);
+
+ String attrName = attribute.getName();
+ Object attrValue = attribute.getValue();
+
+ // This is a clone, we use it read only
+ ModelMBeanAttributeInfo attrInfo = info.getAttribute(attrName);
+ if (attrInfo == null)
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_CANNOT_FIND_MODELMBEANATTRIBUTEINFO_FOR_ATTRIBUTE_0
+ .toLocalizedString(attrName));
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Attribute info is: " + attrInfo);
+
+ if (!attrInfo.isWritable())
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_0_IS_NOT_WRITABLE.toLocalizedString(attrName));
+
+ // This returns a clone of the mbean descriptor, we use it read only
+ Descriptor mbeanDescriptor = info.getMBeanDescriptor();
+ if (mbeanDescriptor == null)
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_MBEAN_DESCRIPTOR_CANNOT_BE_NULL.toLocalizedString());
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("MBean descriptor is: " + mbeanDescriptor);
+
+ // This descriptor is a clone
+ Descriptor attributeDescriptor = attrInfo.getDescriptor();
+ if (attributeDescriptor == null)
+ throw new AttributeNotFoundException(
+ LocalizedStrings.MX4JModelMBean_ATTRIBUTE_DESCRIPTOR_FOR_ATTRIBUTE_0_CANNOT_BE_NULL
+ .toLocalizedString(attrName));
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Attribute descriptor is: " + attributeDescriptor);
+
+ String lastUpdateField = "lastUpdatedTimeStamp";
+
+ Object oldValue = null;
+ try {
+ oldValue = getAttribute(attrName);
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Previous value of attribute " + attrName + ": " + oldValue);
+ } catch (Exception x) {
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Cannot get previous value of attribute " + attrName, x);
+ }
+
+ // Check if setMethod is present
+ String method = (String) attributeDescriptor.getFieldValue("setMethod");
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("setMethod field is: " + method);
+ if (method != null) {
+ Class declared = loadClassWithContextClassLoader(attrInfo.getType());
+ if (attrValue != null) {
+ Class parameter = attrValue.getClass();
+ checkAssignability(parameter, declared);
}
- return list;
- }
-
- public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException
- {
- if (attribute == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_NAME_CANNOT_BE_NULL.toLocalizedString()));
-
- Logger logger = getLogger();
-
- // I want the real info, not its clone
- ModelMBeanInfo info = getModelMBeanInfo();
- if (info == null) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_NULL.toLocalizedString());
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("ModelMBeanInfo is: " + info);
-
- // This is a clone, we use it read only
- ModelMBeanAttributeInfo attrInfo = info.getAttribute(attribute);
- if (attrInfo == null) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_CANNOT_FIND_MODELMBEANATTRIBUTEINFO_FOR_ATTRIBUTE_0.toLocalizedString(attribute));
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Attribute info is: " + attrInfo);
- if (!attrInfo.isReadable()) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_0_IS_NOT_READABLE.toLocalizedString(attribute));
-
- // This returns a clone of the mbean descriptor, we use it read only
- Descriptor mbeanDescriptor = info.getMBeanDescriptor();
- if (mbeanDescriptor == null) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_MBEAN_DESCRIPTOR_CANNOT_BE_NULL.toLocalizedString());
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("MBean descriptor is: " + mbeanDescriptor);
-
- // This descriptor is a clone
- Descriptor attributeDescriptor = attrInfo.getDescriptor();
- if (attributeDescriptor == null) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_DESCRIPTOR_FOR_ATTRIBUTE_0_CANNOT_BE_NULL.toLocalizedString(attribute));
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Attribute descriptor is: " + attributeDescriptor);
-
- Object returnValue = null;
- String lastUpdateField = "lastUpdatedTimeStamp";
+ // As an extension, allow attributes to be called on target objects also
+ Object target = resolveTargetObject(attributeDescriptor);
+ invokeMethod(target, method, new Class[] {declared}, new Object[] {attrValue});
+ // Cache the value only if currencyTimeLimit is not 0, ie it is not always stale
int staleness = getStaleness(attributeDescriptor, mbeanDescriptor, lastUpdateField);
-
- if (staleness == ALWAYS_STALE || staleness == STALE)
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Value is stale");
-
- String getter = (String)attributeDescriptor.getFieldValue("getMethod");
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("getMethod field is: " + getter);
- if (getter == null)
- {
- // No getter, use default value
- returnValue = attributeDescriptor.getFieldValue("default");
-
- if (returnValue != null)
- {
- // Check if the return type is of the same type
- // As an extension allow covariant return type
- Class returned = returnValue.getClass();
- Class declared = loadClassWithContextClassLoader(attrInfo.getType());
-
- checkAssignability(returned, declared);
- }
-
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("getAttribute for attribute " + attribute + " returns default value: " + returnValue);
- }
- else
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Invoking attribute getter...");
- // As an extension, allow attributes to be called on target objects also
- Object target = resolveTargetObject(attributeDescriptor);
- returnValue = invokeMethod(target, getter, new Class[0], new Object[0]);
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Returned value is: " + returnValue);
-
- if (returnValue != null)
- {
- // Check if the return type is of the same type
- // As an extension allow covariant return type
- Class returned = returnValue.getClass();
- Class declared = loadClassWithContextClassLoader(attrInfo.getType());
-
- checkAssignability(returned, declared);
- }
-
- // Cache the new value only if caching is needed
- if (staleness != ALWAYS_STALE)
- {
- attributeDescriptor.setField("value", returnValue);
- attributeDescriptor.setField(lastUpdateField, Long.valueOf(System.currentTimeMillis()));
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Returned value has been cached");
-
- // And now replace the descriptor with the updated clone
- info.setDescriptor(attributeDescriptor, "attribute");
- }
-
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("getAttribute for attribute " + attribute + " returns invoked value: " + returnValue);
- }
- }
- else
- {
- // Return cached value
- returnValue = attributeDescriptor.getFieldValue("value");
-
- if (returnValue != null)
- {
- // Check if the return type is of the same type
- // As an extension allow covariant return type
- Class returned = returnValue.getClass();
- Class declared = loadClassWithContextClassLoader(attrInfo.getType());
-
- checkAssignability(returned, declared);
- }
-
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("getAttribute for attribute " + attribute + " returns cached value: " + returnValue);
+ if (staleness != ALWAYS_STALE) {
+ attributeDescriptor.setField("value", attrValue);
+ attributeDescriptor.setField(lastUpdateField, Long.valueOf(System.currentTimeMillis()));
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Attribute's value has been cached");
+ } else {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Always stale, avoiding to cache attribute's value");
}
+ } else {
+ if (attrValue != null) {
+ Class parameter = attrValue.getClass();
+ Class declared = loadClassWithContextClassLoader(attrInfo.getType());
- // Puff, everything went ok
- return returnValue;
- }
-
- public AttributeList setAttributes(AttributeList attributes)
- {
- if (attributes == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_LIST_CANNOT_BE_NULL.toLocalizedString()));
-
- Logger logger = getLogger();
-
- AttributeList list = new AttributeList();
- for (Iterator i = attributes.iterator(); i.hasNext();)
- {
- Attribute attribute = (Attribute)i.next();
- String name = attribute.getName();
- try
- {
- setAttribute(attribute);
- list.add(attribute);
- }
- catch (Exception x)
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("setAttribute for attribute " + name + " failed", x);
- // And go on with the next one
- }
+ checkAssignability(parameter, declared);
}
- return list;
- }
-
- public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException
- {
- if (attribute == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_CANNOT_BE_NULL.toLocalizedString()));
- Logger logger = getLogger();
-
- // No need to synchronize: I work mostly on clones
- // I want the real info, not its clone
- ModelMBeanInfo info = getModelMBeanInfo();
- if (info == null) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_NULL.toLocalizedString());
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("ModelMBeanInfo is: " + info);
-
- String attrName = attribute.getName();
- Object attrValue = attribute.getValue();
-
- // This is a clone, we use it read only
- ModelMBeanAttributeInfo attrInfo = info.getAttribute(attrName);
- if (attrInfo == null) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_CANNOT_FIND_MODELMBEANATTRIBUTEINFO_FOR_ATTRIBUTE_0.toLocalizedString(attrName));
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Attribute info is: " + attrInfo);
-
- if (!attrInfo.isWritable()) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_0_IS_NOT_WRITABLE.toLocalizedString(attrName));
-
- // This returns a clone of the mbean descriptor, we use it read only
- Descriptor mbeanDescriptor = info.getMBeanDescriptor();
- if (mbeanDescriptor == null) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_MBEAN_DESCRIPTOR_CANNOT_BE_NULL.toLocalizedString());
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("MBean descriptor is: " + mbeanDescriptor);
-
- // This descriptor is a clone
- Descriptor attributeDescriptor = attrInfo.getDescriptor();
- if (attributeDescriptor == null) throw new AttributeNotFoundException(LocalizedStrings.MX4JModelMBean_ATTRIBUTE_DESCRIPTOR_FOR_ATTRIBUTE_0_CANNOT_BE_NULL.toLocalizedString(attrName));
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Attribute descriptor is: " + attributeDescriptor);
-
- String lastUpdateField = "lastUpdatedTimeStamp";
-
- Object oldValue = null;
- try
- {
- oldValue = getAttribute(attrName);
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Previous value of attribute " + attrName + ": " + oldValue);
+ // Always store the value in the descriptor: no setMethod
+ attributeDescriptor.setField("value", attrValue);
+ }
+
+ // And now replace the descriptor with the updated clone
+ info.setDescriptor(attributeDescriptor, "attribute");
+
+ // Send notifications to listeners
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Sending attribute change notifications");
+ sendAttributeChangeNotification(new Attribute(attrName, oldValue), attribute);
+
+ // Persist this ModelMBean
+ boolean persistNow = shouldPersistNow(attributeDescriptor, mbeanDescriptor, lastUpdateField);
+ if (persistNow) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Persisting this ModelMBean...");
+ try {
+ store();
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("ModelMBean persisted successfully");
+ } catch (Exception x) {
+ logger.error(LocalizedStrings.MX4JModelMBean_CANNOT_STORE_MODELMBEAN_AFTER_SETATTRIBUTE, x);
+ if (x instanceof MBeanException)
+ throw (MBeanException) x;
+ else
+ throw new MBeanException(x);
}
- catch (Exception x)
- {
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Cannot get previous value of attribute " + attrName, x);
- }
-
- // Check if setMethod is present
- String method = (String)attributeDescriptor.getFieldValue("setMethod");
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("setMethod field is: " + method);
- if (method != null)
- {
- Class declared = loadClassWithContextClassLoader(attrInfo.getType());
- if (attrValue != null)
- {
- Class parameter = attrValue.getClass();
- checkAssignability(parameter, declared);
- }
-
- // As an extension, allow attributes to be called on target objects also
- Object target = resolveTargetObject(attributeDescriptor);
- invokeMethod(target, method, new Class[]{declared}, new Object[]{attrValue});
-
- // Cache the value only if currencyTimeLimit is not 0, ie it is not always stale
- int staleness = getStaleness(attributeDescriptor, mbeanDescriptor, lastUpdateField);
- if (staleness != ALWAYS_STALE)
- {
- attributeDescriptor.setField("value", attrValue);
- attributeDescriptor.setField(lastUpdateField, Long.valueOf(System.currentTimeMillis()));
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Attribute's value has been cached");
- }
- else
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Always stale, avoiding to cache attribute's value");
- }
+ }
+ }
+
+ public Object invoke(String method, Object[] arguments, String[] params)
+ throws MBeanException, ReflectionException {
+ if (method == null)
+ throw new RuntimeOperationsException(new IllegalArgumentException(
+ LocalizedStrings.MX4JModelMBean_METHOD_NAME_CANNOT_BE_NULL.toLocalizedString()));
+ if (arguments == null)
+ arguments = new Object[0];
+ if (params == null)
+ params = new String[0];
+
+ Logger logger = getLogger();
+
+ // Find operation descriptor
+ ModelMBeanInfo info = getModelMBeanInfo();
+ if (info == null)
+ throw new MBeanException(new ServiceNotFoundException(
+ LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_NULL.toLocalizedString()));
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("ModelMBeanInfo is: " + info);
+
+ // This is a clone, we use it read only
+ ModelMBeanOperationInfo operInfo = info.getOperation(method);
+ if (operInfo == null)
+ throw new MBeanException(new ServiceNotFoundException(
+ LocalizedStrings.MX4JModelMBean_CANNOT_FIND_MODELMBEANOPERATIONINFO_FOR_OPERATION_0
+ .toLocalizedString(method)));
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Operation info is: " + operInfo);
+
+ // This descriptor is a clone
+ Descriptor operationDescriptor = operInfo.getDescriptor();
+ if (operationDescriptor == null)
+ throw new MBeanException(new ServiceNotFoundException(
+ LocalizedStrings.MX4JModelMBean_OPERATION_DESCRIPTOR_FOR_OPERATION_0_CANNOT_BE_NULL
+ .toLocalizedString(method)));
+ String role = (String) operationDescriptor.getFieldValue("role");
+ if (role == null || !role.equals("operation"))
+ throw new MBeanException(new ServiceNotFoundException(
+ LocalizedStrings.MX4JModelMBean_OPERATION_DESCRIPTOR_FIELD_ROLE_MUST_BE_OPERATION_NOT_0
+ .toLocalizedString(role)));
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Operation descriptor is: " + operationDescriptor);
+
+ // This returns a clone of the mbean descriptor, we use it read only
+ Descriptor mbeanDescriptor = info.getMBeanDescriptor();
+ if (mbeanDescriptor == null)
+ throw new MBeanException(new ServiceNotFoundException(
+ LocalizedStrings.MX4JModelMBean_MBEAN_DESCRIPTOR_CANNOT_BE_NULL.toLocalizedString()));
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("MBean descriptor is: " + mbeanDescriptor);
+
+ Object returnValue = null;
+
+ String lastUpdateField = "lastReturnedTimeStamp";
+
+ // Check if the method should be invoked given the cache settings
+ int staleness = getStaleness(operationDescriptor, mbeanDescriptor, lastUpdateField);
+
+ if (staleness == ALWAYS_STALE || staleness == STALE) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Value is stale");
+
+ // Find parameters classes
+ Class[] parameters = null;
+ try {
+ parameters = Utils.loadClasses(Thread.currentThread().getContextClassLoader(), params);
+ } catch (ClassNotFoundException x) {
+ logger.error(LocalizedStrings.MX4JModelMBean_CANNOT_FIND_OPERATIONS_PARAMETER_CLASSES, x);
+ throw new ReflectionException(x);
}
- else
- {
- if (attrValue != null)
- {
- Class parameter = attrValue.getClass();
- Class declared = loadClassWithContextClassLoader(attrInfo.getType());
- checkAssignability(parameter, declared);
- }
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Invoking operation...");
- // Always store the value in the descriptor: no setMethod
- attributeDescriptor.setField("value", attrValue);
- }
+ // Find target object
+ Object target = resolveTargetObject(operationDescriptor);
+ returnValue = invokeMethod(target, method, parameters, arguments);
- // And now replace the descriptor with the updated clone
- info.setDescriptor(attributeDescriptor, "attribute");
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Returned value is: " + returnValue);
- // Send notifications to listeners
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Sending attribute change notifications");
- sendAttributeChangeNotification(new Attribute(attrName, oldValue), attribute);
+ if (returnValue != null) {
+ Class parameter = returnValue.getClass();
+ Class declared = loadClassWithContextClassLoader(operInfo.getReturnType());
- // Persist this ModelMBean
- boolean persistNow = shouldPersistNow(attributeDescriptor, mbeanDescriptor, lastUpdateField);
- if (persistNow)
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Persisting this ModelMBean...");
- try
- {
- store();
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("ModelMBean persisted successfully");
- }
- catch (Exception x)
- {
- logger.error(LocalizedStrings.MX4JModelMBean_CANNOT_STORE_MODELMBEAN_AFTER_SETATTRIBUTE, x);
- if (x instanceof MBeanException)
- throw (MBeanException)x;
- else
- throw new MBeanException(x);
- }
+ checkAssignability(parameter, declared);
}
- }
-
- public Object invoke(String method, Object[] arguments, String[] params) throws MBeanException, ReflectionException
- {
- if (method == null) throw new RuntimeOperationsException(new IllegalArgumentException(LocalizedStrings.MX4JModelMBean_METHOD_NAME_CANNOT_BE_NULL.toLocalizedString()));
- if (arguments == null) arguments = new Object[0];
- if (params == null) params = new String[0];
-
- Logger logger = getLogger();
-
- // Find operation descriptor
- ModelMBeanInfo info = getModelMBeanInfo();
- if (info == null) throw new MBeanException(new ServiceNotFoundException(LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_IS_NULL.toLocalizedString()));
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("ModelMBeanInfo is: " + info);
-
- // This is a clone, we use it read only
- ModelMBeanOperationInfo operInfo = info.getOperation(method);
- if (operInfo == null) throw new MBeanException(new ServiceNotFoundException(LocalizedStrings.MX4JModelMBean_CANNOT_FIND_MODELMBEANOPERATIONINFO_FOR_OPERATION_0.toLocalizedString(method)));
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Operation info is: " + operInfo);
-
- // This descriptor is a clone
- Descriptor operationDescriptor = operInfo.getDescriptor();
- if (operationDescriptor == null) throw new MBeanException(new ServiceNotFoundException(LocalizedStrings.MX4JModelMBean_OPERATION_DESCRIPTOR_FOR_OPERATION_0_CANNOT_BE_NULL.toLocalizedString(method)));
- String role = (String)operationDescriptor.getFieldValue("role");
- if (role == null || !role.equals("operation")) throw new MBeanException(new ServiceNotFoundException(LocalizedStrings.MX4JModelMBean_OPERATION_DESCRIPTOR_FIELD_ROLE_MUST_BE_OPERATION_NOT_0.toLocalizedString(role)));
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Operation descriptor is: " + operationDescriptor);
-
- // This returns a clone of the mbean descriptor, we use it read only
- Descriptor mbeanDescriptor = info.getMBeanDescriptor();
- if (mbeanDescriptor == null) throw new MBeanException(new ServiceNotFoundException(LocalizedStrings.MX4JModelMBean_MBEAN_DESCRIPTOR_CANNOT_BE_NULL.toLocalizedString()));
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("MBean descriptor is: " + mbeanDescriptor);
-
- Object returnValue = null;
-
- String lastUpdateField = "lastReturnedTimeStamp";
- // Check if the method should be invoked given the cache settings
- int staleness = getStaleness(operationDescriptor, mbeanDescriptor, lastUpdateField);
+ // Cache the new value only if caching is needed
+ if (staleness != ALWAYS_STALE) {
+ operationDescriptor.setField("lastReturnedValue", returnValue);
+ operationDescriptor.setField(lastUpdateField, Long.valueOf(System.currentTimeMillis()));
+ if (logger.isEnabledFor(Logger.TRACE)) {
+ logger.trace("Returned value has been cached");
+ }
- if (staleness == ALWAYS_STALE || staleness == STALE)
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Value is stale");
-
- // Find parameters classes
- Class[] parameters = null;
- try
- {
- parameters = Utils.loadClasses(Thread.currentThread().getContextClassLoader(), params);
- }
- catch (ClassNotFoundException x)
- {
- logger.error(LocalizedStrings.MX4JModelMBean_CANNOT_FIND_OPERATIONS_PARAMETER_CLASSES, x);
- throw new ReflectionException(x);
- }
-
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Invoking operation...");
-
- // Find target object
- Object target = resolveTargetObject(operationDescriptor);
- returnValue = invokeMethod(target, method, parameters, arguments);
-
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Returned value is: " + returnValue);
-
- if (returnValue != null)
- {
- Class parameter = returnValue.getClass();
- Class declared = loadClassWithContextClassLoader(operInfo.getReturnType());
-
- checkAssignability(parameter, declared);
- }
-
- // Cache the new value only if caching is needed
- if (staleness != ALWAYS_STALE)
- {
- operationDescriptor.setField("lastReturnedValue", returnValue);
- operationDescriptor.setField(lastUpdateField, Long.valueOf(System.currentTimeMillis()));
- if (logger.isEnabledFor(Logger.TRACE))
- {
- logger.trace("Returned value has been cached");
- }
-
- // And now replace the descriptor with the updated clone
- info.setDescriptor(operationDescriptor, "operation");
- }
-
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("invoke for operation " + method + " returns invoked value: " + returnValue);
+ // And now replace the descriptor with the updated clone
+ info.setDescriptor(operationDescriptor, "operation");
}
- else
- {
- // Return cached value
- returnValue = operationDescriptor.getFieldValue("lastReturnedValue");
-
- if (returnValue != null)
- {
- Class parameter = returnValue.getClass();
- Class declared = loadClassWithContextClassLoader(operInfo.getReturnType());
- checkAssignability(parameter, declared);
- }
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("invoke for operation " + method + " returns invoked value: " + returnValue);
+ } else {
+ // Return cached value
+ returnValue = operationDescriptor.getFieldValue("lastReturnedValue");
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("invoke for operation " + method + " returns cached value: " + returnValue);
- }
+ if (returnValue != null) {
+ Class parameter = returnValue.getClass();
+ Class declared = loadClassWithContextClassLoader(operInfo.getReturnType());
- // As an extension, persist this model mbean also after operation invocation, but using only
- // settings provided in the operation descriptor, without falling back to defaults set in
- // the MBean descriptor
- boolean persistNow = shouldPersistNow(operationDescriptor, null, lastUpdateField);
- int impact = operInfo.getImpact();
- if (persistNow && impact != MBeanOperationInfo.INFO)
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Persisting this ModelMBean...");
- try
- {
- store();
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("ModelMBean persisted successfully");
- }
- catch (Exception x)
- {
- logger.error(LocalizedStrings.MX4JModelMBean_CANNOT_STORE_MODELMBEAN_AFTER_OPERATION_INVOCATION, x);
- if (x instanceof MBeanException)
- throw (MBeanException)x;
- else
- throw new MBeanException(x);
- }
+ checkAssignability(parameter, declared);
}
- return returnValue;
- }
-
- private Object resolveTargetObject(Descriptor descriptor) throws MBeanException
- {
- Logger logger = getLogger();
- Object target = descriptor.getFieldValue("targetObject");
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("targetObject is: " + target);
- if (target == null)
- {
- target = getManagedResource();
- }
- else
- {
- String targetObjectType = (String)descriptor.getFieldValue("targetObjectType");
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("targetObjectType is: " + targetObjectType);
- if (targetObjectType == null)
- {
- // Not defined, assume object reference
- targetObjectType = OBJECT_RESOURCE_TYPE;
- }
-
- if (!isResourceTypeSupported(targetObjectType)) throw new MBeanException(new InvalidTargetObjectTypeException(targetObjectType));
- }
- return target;
- }
-
- public void load() throws MBeanException, RuntimeOperationsException, InstanceNotFoundException
- {
- PersisterMBean persister = findPersister();
- if (persister != null)
- {
- ModelMBeanInfo info = (ModelMBeanInfo)persister.load();
- setModelMBeanInfo(info);
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("invoke for operation " + method + " returns cached value: " + returnValue);
+ }
+
+ // As an extension, persist this model mbean also after operation invocation, but using only
+ // settings provided in the operation descriptor, without falling back to defaults set in
+ // the MBean descriptor
+ boolean persistNow = shouldPersistNow(operationDescriptor, null, lastUpdateField);
+ int impact = operInfo.getImpact();
+ if (persistNow && impact != MBeanOperationInfo.INFO) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Persisting this ModelMBean...");
+ try {
+ store();
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("ModelMBean persisted successfully");
+ } catch (Exception x) {
+ logger.error(
+ LocalizedStrings.MX4JModelMBean_CANNOT_STORE_MODELMBEAN_AFTER_OPERATION_INVOCATION, x);
+ if (x instanceof MBeanException)
+ throw (MBeanException) x;
+ else
+ throw new MBeanException(x);
}
- }
-
- public void store() throws MBeanException, RuntimeOperationsException, InstanceNotFoundException
- {
- PersisterMBean persister = findPersister();
- if (persister != null)
- {
- // Take a clone to avoid synchronization problems
- ModelMBeanInfo info = (ModelMBeanInfo)getMBeanInfo();
- persister.store(info);
+ }
+
+ return returnValue;
+ }
+
+ private Object resolveTargetObject(Descriptor descriptor) throws MBeanException {
+ Logger logger = getLogger();
+ Object target = descriptor.getFieldValue("targetObject");
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("targetObject is: " + target);
+ if (target == null) {
+ target = getManagedResource();
+ } else {
+ String targetObjectType = (String) descriptor.getFieldValue("targetObjectType");
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("targetObjectType is: " + targetObjectType);
+ if (targetObjectType == null) {
+ // Not defined, assume object reference
+ targetObjectType = OBJECT_RESOURCE_TYPE;
}
- }
- protected ClassLoaderRepository getClassLoaderRepository()
- {
- if (m_mbeanServer != null)
- return m_mbeanServer.getClassLoaderRepository();
- else
- return null;
- }
+ if (!isResourceTypeSupported(targetObjectType))
+ throw new MBeanException(new InvalidTargetObjectTypeException(targetObjectType));
+ }
+ return target;
+ }
+
+ public void load() throws MBeanException, RuntimeOperationsException, InstanceNotFoundException {
+ PersisterMBean persister = findPersister();
+ if (persister != null) {
+ ModelMBeanInfo info = (ModelMBeanInfo) persister.load();
+ setModelMBeanInfo(info);
+ }
+ }
+
+ public void store() throws MBeanException, RuntimeOperationsException, InstanceNotFoundException {
+ PersisterMBean persister = findPersister();
+ if (persister != null) {
+ // Take a clone to avoid synchronization problems
+ ModelMBeanInfo info = (ModelMBeanInfo) getMBeanInfo();
+ persister.store(info);
+ }
+ }
+
+ protected ClassLoaderRepository getClassLoaderRepository() {
+ if (m_mbeanServer != null)
+ return m_mbeanServer.getClassLoaderRepository();
+ else
+ return null;
+ }
- private boolean shouldPersistNow(Descriptor attribute, Descriptor mbean, String lastUpdateField)
- {
- int persist = getPersistPolicy(attribute, mbean);
- if (persist == PERSIST_NO_MORE_OFTEN_THAN)
- {
- Long period = getFieldTimeValue(attribute, mbean, "persistPeriod");
- long now = System.currentTimeMillis();
- Long lastUpdate = (Long)attribute.getFieldValue(lastUpdateField);
- if (now - lastUpdate.longValue() < period.longValue())
- return false;
- else
- return true;
- }
- else if (persist == PERSIST_NEVER)
- {
- return false;
- }
- else if (persist == PERSIST_ON_TIMER)
- {
- return false;
- }
- else if (persist == PERSIST_ON_UPDATE)
- {
- return true;
- }
+ private boolean shouldPersistNow(Descriptor attribute, Descriptor mbean, String lastUpdateField) {
+ int persist = getPersistPolicy(attribute, mbean);
+ if (persist == PERSIST_NO_MORE_OFTEN_THAN) {
+ Long period = getFieldTimeValue(attribute, mbean, "persistPeriod");
+ long now = System.currentTimeMillis();
+ Long lastUpdate = (Long) attribute.getFieldValue(lastUpdateField);
+ if (now - lastUpdate.longValue() < period.longValue())
+ return false;
else
- {
- throw new ImplementationException(LocalizedStrings.MX4JModelMBean_INVALID_PERSIST_VALUE.toLocalizedString());
- }
- }
-
- private int getPersistPolicy(Descriptor descriptor, Descriptor mbean)
- {
- Logger logger = getLogger();
-
- String persist = (String)descriptor.getFieldValue("persistPolicy");
- if (persist == null && mbean != null) persist = (String)mbean.getFieldValue("persistPolicy");
- if (persist == null)
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("No persist policy defined, assuming Never");
- return PERSIST_NEVER;
+ return true;
+ } else if (persist == PERSIST_NEVER) {
+ return false;
+ } else if (persist == PERSIST_ON_TIMER) {
+ return false;
+ } else if (persist == PERSIST_ON_UPDATE) {
+ return true;
+ } else {
+ throw new ImplementationException(
+ LocalizedStrings.MX4JModelMBean_INVALID_PERSIST_VALUE.toLocalizedString());
+ }
+ }
+
+ private int getPersistPolicy(Descriptor descriptor, Descriptor mbean) {
+ Logger logger = getLogger();
+
+ String persist = (String) descriptor.getFieldValue("persistPolicy");
+ if (persist == null && mbean != null)
+ persist = (String) mbean.getFieldValue("persistPolicy");
+ if (persist == null) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("No persist policy defined, assuming Never");
+ return PERSIST_NEVER;
+ } else {
+ if (persist.equals("Never")) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Persist never");
+ return PERSIST_NEVER;
+ } else if (persist.equals("OnUpdate")) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Persist on update");
+ return PERSIST_ON_UPDATE;
+ } else if (persist.equals("OnTimer")) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Persist on update");
+ return PERSIST_ON_TIMER;
+ } else if (persist.equals("NoMoreOftenThan")) {
+ if (logger.isEnabledFor(Logger.TRACE)) {
+ Long period = getFieldTimeValue(descriptor, mbean, "persistPeriod");
+ logger.trace("Persist no more often than " + period);
+ }
+ return PERSIST_NO_MORE_OFTEN_THAN;
+ } else {
+ // Garbage, assuming Never
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Invalid persist policy, assuming persist never");
+ return PERSIST_NEVER;
}
- else
+ }
+ }
+
+ private int getStaleness(Descriptor attribute, Descriptor mbean, String lastUpdateField) {
+ Logger logger = getLogger();
+
+ Long currencyTimeLimit = getFieldTimeValue(attribute, mbean, "currencyTimeLimit");
+ if (currencyTimeLimit == null) {
+ // No time limit defined
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("No currencyTimeLimit defined, assuming always stale");
+ return ALWAYS_STALE;
+ } else {
+ long ctl = currencyTimeLimit.longValue() * 1000;
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("currencyTimeLimit is (ms): " + ctl);
+
+ if (ctl == 0) {
+ // Never stale
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Never stale");
+ return NEVER_STALE;
+ } else if (ctl < 0) // this should be == -1 but the other cases are in the air
{
- if (persist.equals("Never"))
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Persist never");
- return PERSIST_NEVER;
- }
- else if (persist.equals("OnUpdate"))
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Persist on update");
- return PERSIST_ON_UPDATE;
- }
- else if (persist.equals("OnTimer"))
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Persist on update");
- return PERSIST_ON_TIMER;
- }
- else if (persist.equals("NoMoreOftenThan"))
- {
+ // Always stale
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Always stale");
+ return ALWAYS_STALE;
+ } else {
+ Long timestamp = (Long) attribute.getFieldValue(lastUpdateField);
+ long luts = 0;
+
+ if (timestamp != null)
+ luts = timestamp.longValue();
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug(lastUpdateField + " is: " + luts);
+
+ long now = System.currentTimeMillis();
+ if (now < luts + ctl) {
+ // Seems to be not stale, but has been set at least once ?
+ if (timestamp == null) {
+ // Return stale to call it the first time
if (logger.isEnabledFor(Logger.TRACE))
- {
- Long period = getFieldTimeValue(descriptor, mbean, "persistPeriod");
- logger.trace("Persist no more often than " + period);
- }
- return PERSIST_NO_MORE_OFTEN_THAN;
- }
- else
- {
- // Garbage, assuming Never
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Invalid persist policy, assuming persist never");
- return PERSIST_NEVER;
- }
- }
- }
-
- private int getStaleness(Descriptor attribute, Descriptor mbean, String lastUpdateField)
- {
- Logger logger = getLogger();
-
- Long currencyTimeLimit = getFieldTimeValue(attribute, mbean, "currencyTimeLimit");
- if (currencyTimeLimit == null)
- {
- // No time limit defined
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("No currencyTimeLimit defined, assuming always stale");
- return ALWAYS_STALE;
- }
- else
- {
- long ctl = currencyTimeLimit.longValue() * 1000;
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("currencyTimeLimit is (ms): " + ctl);
-
- if (ctl == 0)
- {
- // Never stale
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Never stale");
- return NEVER_STALE;
- }
- else if (ctl < 0) // this should be == -1 but the other cases are in the air
- {
- // Always stale
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Always stale");
- return ALWAYS_STALE;
- }
- else
- {
- Long timestamp = (Long)attribute.getFieldValue(lastUpdateField);
- long luts = 0;
-
- if (timestamp != null) luts = timestamp.longValue();
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug(lastUpdateField + " is: " + luts);
-
- long now = System.currentTimeMillis();
- if (now < luts + ctl)
- {
- // Seems to be not stale, but has been set at least once ?
- if (timestamp == null)
- {
- // Return stale to call it the first time
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Stale since was never set");
- return STALE;
- }
- else
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Not stale");
- return NOT_STALE;
- }
- }
- else
- {
- // Stale
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Stale");
- return STALE;
- }
- }
- }
- }
-
- private Long getFieldTimeValue(Descriptor descriptor, Descriptor mbean, String field)
- {
- Logger logger = getLogger();
-
- Object value = descriptor.getFieldValue(field);
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Descriptor's " + field + " field: " + value);
-
- if (value == null && mbean != null)
- {
- value = mbean.getFieldValue(field);
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("MBean's " + field + " field: " + value);
- if (value == null) return null;
- }
-
- if (value instanceof Number) return Long.valueOf(((Number)value).longValue());
-
- if (value instanceof String)
- {
- try
- {
- long ctl = Long.parseLong((String)value);
- return Long.valueOf(ctl);
- }
- catch (NumberFormatException x)
- {
- return Long.valueOf(0);
- }
- }
- return Long.valueOf(0);
- }
-
- private Object invokeMethod(Object target, String methodName, Class[] params, Object[] args) throws MBeanException, ReflectionException
- {
- // First try on this instance, then on the target
- Object realTarget = null;
- Method method = null;
- try
- {
- realTarget = this;
- method = realTarget.getClass().getMethod(methodName, params);
- }
- catch (NoSuchMethodException x)
- {
- realTarget = target;
- }
-
- if (realTarget == null) throw new MBeanException(new ServiceNotFoundException(LocalizedStrings.MX4JModelMBean_COULD_NOT_FIND_TARGET.toLocalizedString()));
-
- if (method == null)
- {
- try
- {
- method = realTarget.getClass().getMethod(methodName, params);
- }
- catch (NoSuchMethodException x)
- {
- throw new ReflectionException(x);
- }
+ logger.trace("Stale since was never set");
+ return STALE;
+ } else {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Not stale");
+ return NOT_STALE;
+ }
+ } else {
+ // Stale
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Stale");
+ return STALE;
+ }
}
+ }
+ }
- try
- {
- Object value = method.invoke(realTarget, args);
- Logger logger = getLogger();
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Method invocation returned value: " + value);
- return value;
- }
- catch (IllegalAccessException x)
- {
- throw new ReflectionException(x);
- }
- catch (IllegalArgumentException x)
- {
- throw new MBeanException(x);
- }
- catch (InvocationTargetException x)
- {
- Throwable t = x.getTargetException();
- if (t instanceof Error)
- throw new MBeanException(new RuntimeErrorException((Error)t));
- else
- throw new MBeanException((Exception)t);
- }
- }
+ private Long getFieldTimeValue(Descriptor descriptor, Descriptor mbean, String field) {
+ Logger logger = getLogger();
- private Logger getModelMBeanLogger(String notificationType) throws MBeanException
- {
- // Get a copy to avoid synchronization
- ModelMBeanInfo info = getModelMBeanInfo();
+ Object value = descriptor.getFieldValue(field);
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Descriptor's " + field + " field: " + value);
- // First look if there is a suitable notification descriptor, otherwise use MBean descriptor
- Descriptor descriptor = null;
- Logger modelMBeanLogger = null;
- if (notificationType != null)
- {
- descriptor = info.getDescriptor(notificationType, "notification");
- modelMBeanLogger = findLogger(descriptor);
+ if (value == null && mbean != null) {
+ value = mbean.getFieldValue(field);
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("MBean's " + field + " field: " + value);
+ if (value == null)
+ return null;
+ }
+
+ if (value instanceof Number)
+ return Long.valueOf(((Number) value).longValue());
+
+ if (value instanceof String) {
+ try {
+ long ctl = Long.parseLong((String) value);
+ return Long.valueOf(ctl);
+ } catch (NumberFormatException x) {
+ return Long.valueOf(0);
}
-
- if (modelMBeanLogger == null)
- {
- descriptor = info.getMBeanDescriptor();
- modelMBeanLogger = findLogger(descriptor);
- if (modelMBeanLogger != null) return modelMBeanLogger;
+ }
+ return Long.valueOf(0);
+ }
+
+ private Object invokeMethod(Object target, String methodName, Class[] params, Object[] args)
+ throws MBeanException, ReflectionException {
+ // First try on this instance, then on the target
+ Object realTarget = null;
+ Method method = null;
+ try {
+ realTarget = this;
+ method = realTarget.getClass().getMethod(methodName, params);
+ } catch (NoSuchMethodException x) {
+ realTarget = target;
+ }
+
+ if (realTarget == null)
+ throw new MBeanException(new ServiceNotFoundException(
+ LocalizedStrings.MX4JModelMBean_COULD_NOT_FIND_TARGET.toLocalizedString()));
+
+ if (method == null) {
+ try {
+ method = realTarget.getClass().getMethod(methodName, params);
+ } catch (NoSuchMethodException x) {
+ throw new ReflectionException(x);
}
+ }
- return null;
- }
-
- private Logger findLogger(Descriptor descriptor)
- {
+ try {
+ Object value = method.invoke(realTarget, args);
Logger logger = getLogger();
-
- if (descriptor == null)
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Can't find MBean logger, descriptor is null");
- return null;
- }
-
- String log = (String)descriptor.getFieldValue("log");
- String location = (String)descriptor.getFieldValue("logFile");
-
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Log fields: log=" + log + ", file=" + location);
-
- if (log == null || !Boolean.valueOf(log).booleanValue())
- {
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Logging is not supported by this ModelMBean");
- return null;
- }
- // Logger is supported, where log to ?
- if (location == null)
- {
- // As an extension, see if the field logMBean has been defined
- location = (String)descriptor.getFieldValue("logMBean");
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Log fields: mbean=" + location);
-
- if (location == null)
- {
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Logging is not supported by this ModelMBean");
- return null;
- }
-
- // It seems that the user wants to delegate a registered mbean to log
- try
- {
- ObjectName objectName = new ObjectName(location);
- MBeanServer server = getMBeanServer();
- if (server == null) throw new MBeanException(new IllegalStateException(LocalizedStrings.MX4JModelMBean_MX4JMODELMBEAN_IS_NOT_REGISTERED.toLocalizedString()));
- if (server.isRegistered(objectName))
- {
- MBeanLogger l = new MBeanLogger(server, objectName);
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("ModelMBean log supported by delegating to this MBean: " + objectName);
- return l;
- }
-
- return null;
- }
- catch (MalformedObjectNameException x)
- {
- // Ah, was not a correct object name
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Specified logMBean field does not contain a valid ObjectName: " + location);
- return null;
- }
- catch (MBeanException x)
- {
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("logMBean field does not specify an MBean that supports logging delegation", x);
- return null;
- }
- }
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Method invocation returned value: " + value);
+ return value;
+ } catch (IllegalAccessException x) {
+ throw new ReflectionException(x);
+ } catch (IllegalArgumentException x) {
+ throw new MBeanException(x);
+ } catch (InvocationTargetException x) {
+ Throwable t = x.getTargetException();
+ if (t instanceof Error)
+ throw new MBeanException(new RuntimeErrorException((Error) t));
else
- {
- // User decided to log to a file
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("ModelMBean log supported on file system");
- return new FileLogger(location);
- }
- }
-
- private NotificationBroadcasterSupport getAttributeChangeBroadcaster()
- {
- return m_attributeChangeBroadcaster;
- }
-
- private MBeanServer getMBeanServer()
- {
- return m_mbeanServer;
- }
-
- private ModelMBeanInfo getModelMBeanInfo()
- {
- // No cloning performed
- return m_modelMBeanInfo;
- }
-
- private PersisterMBean findPersister() throws MBeanException, InstanceNotFoundException
- {
- Logger logger = getLogger();
+ throw new MBeanException((Exception) t);
+ }
+ }
+
+ private Logger getModelMBeanLogger(String notificationType) throws MBeanException {
+ // Get a copy to avoid synchronization
+ ModelMBeanInfo info = getModelMBeanInfo();
+
+ // First look if there is a suitable notification descriptor, otherwise use MBean descriptor
+ Descriptor descriptor = null;
+ Logger modelMBeanLogger = null;
+ if (notificationType != null) {
+ descriptor = info.getDescriptor(notificationType, "notification");
+ modelMBeanLogger = findLogger(descriptor);
+ }
+
+ if (modelMBeanLogger == null) {
+ descriptor = info.getMBeanDescriptor();
+ modelMBeanLogger = findLogger(descriptor);
+ if (modelMBeanLogger != null)
+ return modelMBeanLogger;
+ }
+
+ return null;
+ }
+
+ private Logger findLogger(Descriptor descriptor) {
+ Logger logger = getLogger();
+
+ if (descriptor == null) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Can't find MBean logger, descriptor is null");
+ return null;
+ }
- ModelMBeanInfo info = getModelMBeanInfo();
- if (info == null)
- {
- // Not yet initialized
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Can't find persister, ModelMBeanInfo is null");
- return null;
- }
- Descriptor mbeanDescriptor = info.getMBeanDescriptor();
- if (mbeanDescriptor == null)
- {
- // This is normally should not happen if ModelMBeanInfoSupport is used
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Can't find persister, MBean descriptor is null");
- return null;
- }
+ String log = (String) descriptor.getFieldValue("log");
+ String location = (String) descriptor.getFieldValue("logFile");
- String location = (String)mbeanDescriptor.getFieldValue("persistLocation");
- String name = (String)mbeanDescriptor.getFieldValue("persistName");
- String mbeanName = (String)mbeanDescriptor.getFieldValue("name");
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Persistence fields: location=" + location + ", name=" + name);
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Log fields: log=" + log + ", file=" + location);
- if (mbeanName == null && name == null)
- {
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Persistence is not supported by this ModelMBean");
- return null;
- }
+ if (log == null || !Boolean.valueOf(log).booleanValue()) {
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Logging is not supported by this ModelMBean");
+ return null;
+ }
+ // Logger is supported, where log to ?
+ if (location == null) {
+ // As an extension, see if the field logMBean has been defined
+ location = (String) descriptor.getFieldValue("logMBean");
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("Log fields: mbean=" + location);
- // Try to see if this mbean should delegate to another mbean
- if (name != null)
- {
- try
- {
- ObjectName objectName = new ObjectName(name.trim());
- // OK, a valid object name
- MBeanServer server = getMBeanServer();
- if (server == null) throw new MBeanException(new IllegalStateException(LocalizedStrings.MX4JModelMBean_MX4JMODELMBEAN_IS_NOT_REGISTERED.toLocalizedString()));
-
- if (server.isRegistered(objectName) && server.isInstanceOf(objectName, PersisterMBean.class.getName()))
- {
- // OK, the given mbean is registered with this mbean server
- PersisterMBean persister = new MBeanPersister(server, objectName);
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Persistence is delegated to this MBean: " + objectName);
- return persister;
- }
- else
- {
- throw new InstanceNotFoundException(objectName.toString());
- }
- }
- catch (MalformedObjectNameException ignored)
- {
- // It does not delegates to another mbean, use default
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Persistence is not delegated to another MBean");
- }
-
- // Default is serialization to file
- FilePersister persister = new FilePersister(location, name);
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Persistence is realized through file system in " + persister.getFileName());
- return persister;
- }
- else
- {
- // Only location given, use MBean name
- FilePersister persister = new FilePersister(location, mbeanName);
- if (logger.isEnabledFor(Logger.DEBUG)) logger.debug("Persistence is realized through file system in " + persister.getFileName());
- return persister;
+ if (location == null) {
+ if (logger.isEnabledFor(Logger.TRACE))
+ logger.trace("Logging is not supported by this ModelMBean");
+ return null;
}
- }
- private Class loadClassWithContextClassLoader(String name)
- {
- try
- {
- return Utils.loadClass(Thread.currentThread().getContextClassLoader(), name);
- }
- catch (ClassNotFoundException x)
- {
- Logger logger = getLogger();
- if (logger.isEnabledFor(Logger.TRACE)) logger.trace("Cannot find attribute's declared return class", x);
- return null;
+ // It seems that the user wants to delegate a registered mbean to log
+ try {
+ ObjectName objectName = new ObjectName(location);
+ MBeanServer server = getMBeanServer();
+ if (server == null)
+ throw new MBeanException(new IllegalStateException(
+ LocalizedStrings.MX4JModelMBean_MX4JMODELMBEAN_IS_NOT_REGISTERED
+ .toLocalizedString()));
+ if (server.isRegistered(objectName)) {
+ MBeanLogger l = new MBeanLogger(server, objectName);
+ if (logger.isEnabledFor(Logger.DEBUG))
+ logger.debug("ModelMBean log supported by delegating to this MBean: " + objectName);
+ return l;
+ }
+
+ return null;
+ } catch (MalformedObjectNameException x) {
+
<TRUNCATED>
[23/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java
index 0d68f02..551aaa1 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -31,15 +29,15 @@ public class BackupDataStoreHelper {
public static String LOCK_SERVICE_NAME = BackupDataStoreHelper.class.getSimpleName();
private static String LOCK_NAME = LOCK_SERVICE_NAME + "_token";
-
+
private static Object LOCK_SYNC = new Object();
@SuppressWarnings("rawtypes")
- public static BackupDataStoreResult backupAllMembers(
- DM dm, Set recipients, File targetDir, File baselineDir) {
+ public static BackupDataStoreResult backupAllMembers(DM dm, Set recipients, File targetDir,
+ File baselineDir) {
FlushToDiskRequest.send(dm, recipients);
- boolean abort= true;
+ boolean abort = true;
Map<DistributedMember, Set<PersistentID>> successfulMembers;
Map<DistributedMember, Set<PersistentID>> existingDataStores;
try {
@@ -50,7 +48,7 @@ public class BackupDataStoreHelper {
}
return new BackupDataStoreResult(existingDataStores, successfulMembers);
}
-
+
private static DistributedLockService getLockService(DM dm) {
DistributedLockService dls = DistributedLockService.getServiceNamed(LOCK_SERVICE_NAME);
if (dls == null) {
@@ -65,11 +63,11 @@ public class BackupDataStoreHelper {
Assert.assertTrue(dls != null);
return dls;
}
-
+
public static boolean obtainLock(DM dm) {
return getLockService(dm).lock(LOCK_NAME, 0, -1);
}
-
+
public static void releaseLock(DM dm) {
getLockService(dm).unlock(LOCK_NAME);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java
index b2a201d..eae674b 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -23,13 +21,12 @@ import org.apache.geode.cache.persistence.PersistentID;
import org.apache.geode.distributed.DistributedMember;
public class BackupDataStoreResult {
-
+
private Map<DistributedMember, Set<PersistentID>> existingDataStores;
private Map<DistributedMember, Set<PersistentID>> successfulMembers;
- public BackupDataStoreResult(
- Map<DistributedMember, Set<PersistentID>> existingDataStores,
+ public BackupDataStoreResult(Map<DistributedMember, Set<PersistentID>> existingDataStores,
Map<DistributedMember, Set<PersistentID>> successfulMembers) {
this.existingDataStores = existingDataStores;
this.successfulMembers = successfulMembers;
@@ -42,16 +39,10 @@ public class BackupDataStoreResult {
public Map<DistributedMember, Set<PersistentID>> getSuccessfulMembers() {
return this.successfulMembers;
}
-
+
public String toString() {
- return new StringBuilder()
- .append(getClass().getSimpleName())
- .append("[")
- .append("existingDataStores=")
- .append(this.existingDataStores)
- .append("; successfulMembers=")
- .append(this.successfulMembers)
- .append("]")
- .toString();
+ return new StringBuilder().append(getClass().getSimpleName()).append("[")
+ .append("existingDataStores=").append(this.existingDataStores)
+ .append("; successfulMembers=").append(this.successfulMembers).append("]").toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/BackupStatusImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupStatusImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupStatusImpl.java
index 074ecb3..4256c3c 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupStatusImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupStatusImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -31,12 +29,11 @@ import org.apache.geode.distributed.DistributedMember;
*/
public class BackupStatusImpl implements BackupStatus, Serializable {
private static final long serialVersionUID = 3704162840296921840L;
-
+
private Map<DistributedMember, Set<PersistentID>> backedUpDiskStores;
private Set<PersistentID> offlineDiskStores;
-
- public BackupStatusImpl(
- Map<DistributedMember, Set<PersistentID>> backedUpDiskStores,
+
+ public BackupStatusImpl(Map<DistributedMember, Set<PersistentID>> backedUpDiskStores,
Set<PersistentID> offlineDiskStores) {
super();
this.backedUpDiskStores = backedUpDiskStores;
@@ -53,9 +50,10 @@ public class BackupStatusImpl implements BackupStatus, Serializable {
@Override
public String toString() {
- return "BackupStatus[backedUpDiskStores=" + backedUpDiskStores + ", offlineDiskStores=" + offlineDiskStores + "]";
+ return "BackupStatus[backedUpDiskStores=" + backedUpDiskStores + ", offlineDiskStores="
+ + offlineDiskStores + "]";
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthConfigImpl.java
index fd82b24..3c57ef4 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthConfigImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -24,37 +22,39 @@ import org.apache.geode.admin.*;
*
* @since GemFire 3.5
*/
-public abstract class CacheHealthConfigImpl
- extends MemberHealthConfigImpl implements CacheHealthConfig {
+public abstract class CacheHealthConfigImpl extends MemberHealthConfigImpl
+ implements CacheHealthConfig {
- /** The maximum number of milliseconds a
- * <code>netSearch</code> operation can take before the cache member
- * is considered to be unhealthy. */
+ /**
+ * The maximum number of milliseconds a <code>netSearch</code> operation can take before the cache
+ * member is considered to be unhealthy.
+ */
private long maxNetSearchTime = DEFAULT_MAX_NET_SEARCH_TIME;
- /** The maximum mumber of milliseconds a cache
- * <code>load</code> operation can take before the cache member is
- * considered to be unhealthy. */
+ /**
+ * The maximum mumber of milliseconds a cache <code>load</code> operation can take before the
+ * cache member is considered to be unhealthy.
+ */
private long maxLoadTime = DEFAULT_MAX_LOAD_TIME;
/** The minimum hit ratio of a healthy cache member. */
private double minHitRatio = DEFAULT_MIN_HIT_RATIO;
- /** The maximum number of entries in the event delivery queue
- * of a healthy cache member. */
+ /**
+ * The maximum number of entries in the event delivery queue of a healthy cache member.
+ */
private long maxEventQueueSize = DEFAULT_MAX_EVENT_QUEUE_SIZE;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>CacheHealthConfigImpl</code> with the default
- * configuration.
+ * Creates a new <code>CacheHealthConfigImpl</code> with the default configuration.
*/
CacheHealthConfigImpl() {
}
- ////////////////////// Instance Methods /////////////////////
+ ////////////////////// Instance Methods /////////////////////
public long getMaxNetSearchTime() {
return this.maxNetSearchTime;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthEvaluator.java
index 6ab9f34..f7ff9ed 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheHealthEvaluator.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -34,26 +32,25 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
/**
- * Contains the logic for evaluating the health of a GemFire
- * <code>Cache</code> instance according to the thresholds provided in
- * a {@link CacheHealthConfig}.
+ * Contains the logic for evaluating the health of a GemFire <code>Cache</code> instance according
+ * to the thresholds provided in a {@link CacheHealthConfig}.
*
*
* @since GemFire 3.5
*/
-class CacheHealthEvaluator extends AbstractHealthEvaluator
- implements CacheLifecycleListener {
+class CacheHealthEvaluator extends AbstractHealthEvaluator implements CacheLifecycleListener {
private static final Logger logger = LogService.getLogger();
-
+
/** The config from which we get the evaulation criteria */
private CacheHealthConfig config;
/** The description of the cache being evaluated */
private String description;
- /** Statistics about the <code>Cache</code> instance. If no cache
- * has been created in this VM, this field will be <code>null</code>
+ /**
+ * Statistics about the <code>Cache</code> instance. If no cache has been created in this VM, this
+ * field will be <code>null</code>
*/
private CachePerfStats cacheStats;
@@ -72,13 +69,12 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator
/** The previous value of the gets stat */
private long prevGets;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>CacheHealthEvaluator</code>
*/
- CacheHealthEvaluator(GemFireHealthConfig config,
- DM dm) {
+ CacheHealthEvaluator(GemFireHealthConfig config, DM dm) {
super(config, dm);
this.config = config;
@@ -96,7 +92,7 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator
GemFireCacheImpl.addCacheLifecycleListener(this);
}
- //////////////////// Instance Methods ////////////////////
+ //////////////////// Instance Methods ////////////////////
@Override
protected String getDescription() {
@@ -104,8 +100,7 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator
}
/**
- * Initializes the state of this evaluator based on the given cache
- * instance.
+ * Initializes the state of this evaluator based on the given cache instance.
*/
private void initialize(GemFireCacheImpl cache, DM dm) {
StringBuffer sb = new StringBuffer();
@@ -131,66 +126,58 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator
}
public void cacheCreated(GemFireCacheImpl cache) {
- InternalDistributedSystem system =
- (InternalDistributedSystem) cache.getDistributedSystem();
+ InternalDistributedSystem system = (InternalDistributedSystem) cache.getDistributedSystem();
DM dm = system.getDistributionManager();
initialize(cache, dm);
}
/**
- * Checks to make sure that the average <code>netSearch</code> time
- * during the previous health check interval is less than the
- * {@linkplain CacheHealthConfig#getMaxNetSearchTime threshold}. If
- * not, the status is "okay" health.
+ * Checks to make sure that the average <code>netSearch</code> time during the previous health
+ * check interval is less than the {@linkplain CacheHealthConfig#getMaxNetSearchTime threshold}.
+ * If not, the status is "okay" health.
*
* @see CachePerfStats#getNetsearchTime
* @see CachePerfStats#getNetsearchesCompleted
*/
void checkNetSearchTime(List status) {
- if (this.cacheStats == null || isFirstEvaluation() ||
- this.cacheStats.isClosed()) {
+ if (this.cacheStats == null || isFirstEvaluation() || this.cacheStats.isClosed()) {
return;
}
- long deltaNetsearchTime =
- this.cacheStats.getNetsearchTime() - this.prevNetsearchTime;
+ long deltaNetsearchTime = this.cacheStats.getNetsearchTime() - this.prevNetsearchTime;
long deltaNetsearchesCompleted =
- this.cacheStats.getNetsearchesCompleted() -
- this.prevNetsearchesCompleted;
+ this.cacheStats.getNetsearchesCompleted() - this.prevNetsearchesCompleted;
if (deltaNetsearchesCompleted != 0) {
long ratio = deltaNetsearchTime / deltaNetsearchesCompleted;
ratio /= 1000000;
long threshold = this.config.getMaxNetSearchTime();
-
+
if (ratio > threshold) {
- String s = LocalizedStrings.CacheHealthEvaluator_THE_AVERAGE_DURATION_OF_A_CACHE_NETSEARCH_0_MS_EXCEEDS_THE_THRESHOLD_1_MS.toLocalizedString(new Object[] { ratio, threshold });
+ String s =
+ LocalizedStrings.CacheHealthEvaluator_THE_AVERAGE_DURATION_OF_A_CACHE_NETSEARCH_0_MS_EXCEEDS_THE_THRESHOLD_1_MS
+ .toLocalizedString(new Object[] {ratio, threshold});
status.add(okayHealth(s));
}
}
}
/**
- * Checks to make sure that the average <code>load</code> time
- * during the previous health check interval is less than the
- * {@linkplain CacheHealthConfig#getMaxLoadTime threshold}. If
- * not, the status is "okay" health.
+ * Checks to make sure that the average <code>load</code> time during the previous health check
+ * interval is less than the {@linkplain CacheHealthConfig#getMaxLoadTime threshold}. If not, the
+ * status is "okay" health.
*
* @see CachePerfStats#getLoadTime
* @see CachePerfStats#getLoadsCompleted
*/
void checkLoadTime(List status) {
- if (this.cacheStats == null || isFirstEvaluation() ||
- this.cacheStats.isClosed()) {
+ if (this.cacheStats == null || isFirstEvaluation() || this.cacheStats.isClosed()) {
return;
}
if (!isFirstEvaluation()) {
- long deltaLoadTime =
- this.cacheStats.getLoadTime() - this.prevLoadTime;
- long deltaLoadsCompleted =
- this.cacheStats.getLoadsCompleted() -
- this.prevLoadsCompleted;
+ long deltaLoadTime = this.cacheStats.getLoadTime() - this.prevLoadTime;
+ long deltaLoadsCompleted = this.cacheStats.getLoadsCompleted() - this.prevLoadsCompleted;
if (logger.isDebugEnabled()) {
logger.debug("Completed {} loads in {} ms", deltaLoadsCompleted, (deltaLoadTime / 1000000));
@@ -200,9 +187,11 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator
long ratio = deltaLoadTime / deltaLoadsCompleted;
ratio /= 1000000;
long threshold = this.config.getMaxLoadTime();
-
+
if (ratio > threshold) {
- String s = LocalizedStrings.CacheHealthEvaluator_THE_AVERAGE_DURATION_OF_A_CACHE_LOAD_0_MS_EXCEEDS_THE_THRESHOLD_1_MS.toLocalizedString(new Object[] { ratio, threshold });
+ String s =
+ LocalizedStrings.CacheHealthEvaluator_THE_AVERAGE_DURATION_OF_A_CACHE_LOAD_0_MS_EXCEEDS_THE_THRESHOLD_1_MS
+ .toLocalizedString(new Object[] {ratio, threshold});
if (logger.isDebugEnabled()) {
logger.debug(s);
}
@@ -213,10 +202,9 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator
}
/**
- * Checks to make sure that the cache hit ratio during the previous
- * health check interval is less than the {@linkplain
- * CacheHealthConfig#getMinHitRatio threshold}. If not, the status
- * is "okay" health.
+ * Checks to make sure that the cache hit ratio during the previous health check interval is less
+ * than the {@linkplain CacheHealthConfig#getMinHitRatio threshold}. If not, the status is "okay"
+ * health.
*
* <P>
*
@@ -232,48 +220,44 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator
* @see CachePerfStats#getNetsearchesCompleted
*/
void checkHitRatio(List status) {
- if (this.cacheStats == null || isFirstEvaluation() ||
- this.cacheStats.isClosed()) {
+ if (this.cacheStats == null || isFirstEvaluation() || this.cacheStats.isClosed()) {
return;
}
long deltaGets = this.cacheStats.getGets() - this.prevGets;
if (deltaGets != 0) {
- long deltaLoadsCompleted =
- this.cacheStats.getLoadsCompleted() - this.prevLoadsCompleted;
+ long deltaLoadsCompleted = this.cacheStats.getLoadsCompleted() - this.prevLoadsCompleted;
long deltaNetsearchesCompleted =
- this.cacheStats.getNetsearchesCompleted() -
- this.prevNetsearchesCompleted;
+ this.cacheStats.getNetsearchesCompleted() - this.prevNetsearchesCompleted;
- double hits =
- (deltaGets -
- (deltaLoadsCompleted + deltaNetsearchesCompleted));
+ double hits = (deltaGets - (deltaLoadsCompleted + deltaNetsearchesCompleted));
double hitRatio = hits / deltaGets;
double threshold = this.config.getMinHitRatio();
if (hitRatio < threshold) {
- String s = "The hit ratio of this Cache (" + hitRatio +
- ") is below the threshold (" + threshold + ")";
+ String s = "The hit ratio of this Cache (" + hitRatio + ") is below the threshold ("
+ + threshold + ")";
status.add(okayHealth(s));
}
}
}
/**
- * Checks to make sure that the {@linkplain
- * CachePerfStats#getEventQueueSize cache event queue size} does
- * not exceed the {@linkplain CacheHealthConfig#getMaxEventQueueSize
- * threshold}. If it does, the status is "okay" health.
+ * Checks to make sure that the {@linkplain CachePerfStats#getEventQueueSize cache event queue
+ * size} does not exceed the {@linkplain CacheHealthConfig#getMaxEventQueueSize threshold}. If it
+ * does, the status is "okay" health.
*/
void checkEventQueueSize(List status) {
- if (this.cacheStats == null || isFirstEvaluation() ||
- this.cacheStats.isClosed()) {
+ if (this.cacheStats == null || isFirstEvaluation() || this.cacheStats.isClosed()) {
return;
}
long eventQueueSize = this.cacheStats.getEventQueueSize();
long threshold = this.config.getMaxEventQueueSize();
if (eventQueueSize > threshold) {
- String s = LocalizedStrings.CacheHealthEvaluator_THE_SIZE_OF_THE_CACHE_EVENT_QUEUE_0_MS_EXCEEDS_THE_THRESHOLD_1_MS.toLocalizedString(new Object[] { Long.valueOf(eventQueueSize), Long.valueOf(threshold) });
+ String s =
+ LocalizedStrings.CacheHealthEvaluator_THE_SIZE_OF_THE_CACHE_EVENT_QUEUE_0_MS_EXCEEDS_THE_THRESHOLD_1_MS
+ .toLocalizedString(
+ new Object[] {Long.valueOf(eventQueueSize), Long.valueOf(threshold)});
status.add(okayHealth(s));
}
}
@@ -287,8 +271,7 @@ class CacheHealthEvaluator extends AbstractHealthEvaluator
this.prevLoadTime = this.cacheStats.getLoadTime();
this.prevLoadsCompleted = this.cacheStats.getLoadsCompleted();
this.prevNetsearchTime = this.cacheStats.getNetsearchTime();
- this.prevNetsearchesCompleted =
- this.cacheStats.getNetsearchesCompleted();
+ this.prevNetsearchesCompleted = this.cacheStats.getNetsearchesCompleted();
this.prevGets = this.cacheStats.getGets();
} else {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
index e34a476..dbf860f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerConfigImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -27,21 +25,21 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
*
* @since GemFire 4.0
*/
-public class CacheServerConfigImpl extends ManagedEntityConfigImpl
- implements CacheVmConfig, CacheServerConfig {
+public class CacheServerConfigImpl extends ManagedEntityConfigImpl
+ implements CacheVmConfig, CacheServerConfig {
- /** Declarative caching XML file that is used to initialize the
- * Cache in the cache server. */
+ /**
+ * Declarative caching XML file that is used to initialize the Cache in the cache server.
+ */
private String cacheXMLFile;
/** Extra classpath for the cache server */
private String classpath;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>CacheServerConfigImpl</code> with the default
- * configuration settings.
+ * Creates a new <code>CacheServerConfigImpl</code> with the default configuration settings.
*/
public CacheServerConfigImpl() {
this.cacheXMLFile = null;
@@ -49,8 +47,7 @@ public class CacheServerConfigImpl extends ManagedEntityConfigImpl
}
/**
- * Creates a new <code>CacheServerConfigImpl</code> for a running
- * cache server.
+ * Creates a new <code>CacheServerConfigImpl</code> for a running cache server.
*/
public CacheServerConfigImpl(GemFireVM vm) {
super(vm);
@@ -78,7 +75,7 @@ public class CacheServerConfigImpl extends ManagedEntityConfigImpl
this.classpath = other.getClassPath();
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
public String getCacheXMLFile() {
return this.cacheXMLFile;
@@ -104,7 +101,7 @@ public class CacheServerConfigImpl extends ManagedEntityConfigImpl
public void validate() {
super.validate();
- // Nothing to validate really. Cache.xml file could live on
+ // Nothing to validate really. Cache.xml file could live on
// different file system.
}
@@ -118,7 +115,7 @@ public class CacheServerConfigImpl extends ManagedEntityConfigImpl
@Override
public Object clone() throws CloneNotSupportedException {
- return new CacheServerConfigImpl((CacheVmConfig)this);
+ return new CacheServerConfigImpl((CacheVmConfig) this);
}
@Override
@@ -130,7 +127,7 @@ public class CacheServerConfigImpl extends ManagedEntityConfigImpl
sb.append(" classPath=");
sb.append(this.getClassPath());
- return sb.toString();
+ return sb.toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
index f13c9ba..c10c6f8 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/CacheServerImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -29,27 +27,24 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
*
* @since GemFire 3.5
*/
-public class CacheServerImpl extends ManagedSystemMemberImpl
- implements CacheVm, CacheServer {
+public class CacheServerImpl extends ManagedSystemMemberImpl implements CacheVm, CacheServer {
/** How many new <code>CacheServer</code>s have been created? */
private static int newCacheServers = 0;
- /////////////////////// Instance Fields ///////////////////////
+ /////////////////////// Instance Fields ///////////////////////
/** The configuration object for this cache server */
private final CacheServerConfigImpl config;
- ///////////////////////// Constructors ////////////////////////
+ ///////////////////////// Constructors ////////////////////////
/**
- * Creates a new <code>CacheServerImpl</code> that represents a
- * non-existsing (unstarted) cache server in a given distributed
- * system.
+ * Creates a new <code>CacheServerImpl</code> that represents a non-existsing (unstarted) cache
+ * server in a given distributed system.
*/
- public CacheServerImpl(AdminDistributedSystemImpl system,
- CacheVmConfig config)
- throws AdminException {
+ public CacheServerImpl(AdminDistributedSystemImpl system, CacheVmConfig config)
+ throws AdminException {
super(system, config);
@@ -58,18 +53,16 @@ public class CacheServerImpl extends ManagedSystemMemberImpl
}
/**
- * Creates a new <code>CacheServerImpl</code> that represents an
- * existing dedicated cache server in a given distributed system.
+ * Creates a new <code>CacheServerImpl</code> that represents an existing dedicated cache server
+ * in a given distributed system.
*/
- public CacheServerImpl(AdminDistributedSystemImpl system,
- GemFireVM vm)
- throws AdminException {
+ public CacheServerImpl(AdminDistributedSystemImpl system, GemFireVM vm) throws AdminException {
super(system, vm);
this.config = new CacheServerConfigImpl(vm);
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
@Override
public SystemMemberType getType() {
@@ -101,18 +94,18 @@ public class CacheServerImpl extends ManagedSystemMemberImpl
// NOTE: DistributedSystem nodeLeft will then set this.manager to null
this.config.setManagedEntity(null);
}
-
+
public boolean isRunning() {
- DM dm = ((AdminDistributedSystemImpl)getDistributedSystem()).getDistributionManager();
- if(dm == null) {
+ DM dm = ((AdminDistributedSystemImpl) getDistributedSystem()).getDistributionManager();
+ if (dm == null) {
try {
return this.controller.isRunning(this);
- }
- catch (IllegalStateException e) {
+ } catch (IllegalStateException e) {
return false;
}
}
- return ((DistributionManager)dm).getDistributionManagerIdsIncludingAdmin().contains(getDistributedMember());
+ return ((DistributionManager) dm).getDistributionManagerIdsIncludingAdmin()
+ .contains(getDistributedMember());
}
public CacheServerConfig getConfig() {
@@ -123,7 +116,7 @@ public class CacheServerImpl extends ManagedSystemMemberImpl
return this.config;
}
- //////////////////////// Command execution ////////////////////////
+ //////////////////////// Command execution ////////////////////////
public ManagedEntityConfig getEntityConfig() {
return this.getConfig();
@@ -180,19 +173,17 @@ public class CacheServerImpl extends ManagedSystemMemberImpl
/**
* Find whether this server is primary for given client (durableClientId)
*
- * @param durableClientId -
- * durable-id of the client
+ * @param durableClientId - durable-id of the client
* @return true if the server is primary for given client
*
* @since GemFire 5.6
*/
- public boolean isPrimaryForDurableClient(String durableClientId)
- {
- RemoteApplicationVM vm = (RemoteApplicationVM)this.getGemFireVM();
+ public boolean isPrimaryForDurableClient(String durableClientId) {
+ RemoteApplicationVM vm = (RemoteApplicationVM) this.getGemFireVM();
boolean isPrimary = false;
if (vm != null) {
isPrimary = vm.isPrimaryForDurableClient(durableClientId);
-}
+ }
return isPrimary;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
index e556b04..8e5707d 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -22,7 +20,7 @@ import org.apache.geode.admin.UnmodifiableConfigurationException;
import org.apache.geode.internal.i18n.LocalizedStrings;
import java.io.File;
-//import java.net.InetAddress;
+// import java.net.InetAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -30,12 +28,11 @@ import java.util.List;
/**
* A single configuration parameter of a system member.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
-public class ConfigurationParameterImpl
-implements org.apache.geode.admin.ConfigurationParameter {
-
+public class ConfigurationParameterImpl implements org.apache.geode.admin.ConfigurationParameter {
+
/** Identifying name of this configuration parameter */
protected String name;
/** Full description of this configuration parameter */
@@ -48,152 +45,156 @@ implements org.apache.geode.admin.ConfigurationParameter {
protected boolean userModifiable;
/** List of listeners to notify when value changes */
private final List listeners = new ArrayList();
-
+
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
-
- /**
+
+ /**
* Constructs new <code>ConfigurationParameterImpl</code>.
*
- * @param name the name of this parameter which cannot change
- * @param description full description to use
- * @param value the value of this parameter
- * @param type the class type of the value
- * @param userModifiable true if this is modifiable; false if read-only
+ * @param name the name of this parameter which cannot change
+ * @param description full description to use
+ * @param value the value of this parameter
+ * @param type the class type of the value
+ * @param userModifiable true if this is modifiable; false if read-only
*/
- protected ConfigurationParameterImpl(String name,
- String description,
- Object value,
- Class type,
- boolean userModifiable) {
+ protected ConfigurationParameterImpl(String name, String description, Object value, Class type,
+ boolean userModifiable) {
if (name == null || name.length() == 0) {
- throw new IllegalArgumentException(LocalizedStrings.ConfigurationParameterImpl_CONFIGURATIONPARAMETER_NAME_MUST_BE_SPECIFIED.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.ConfigurationParameterImpl_CONFIGURATIONPARAMETER_NAME_MUST_BE_SPECIFIED
+ .toLocalizedString());
}
-
+
this.name = name;
setInternalState(description, value, type, userModifiable);
}
-
- /**
+
+ /**
* Constructs new <code>ConfigurationParameterImpl</code>.
*
- * @param name the name of this parameter which cannot change
- * @param value the value of this parameter
+ * @param name the name of this parameter which cannot change
+ * @param value the value of this parameter
*/
- protected ConfigurationParameterImpl(String name,
- Object value) {
+ protected ConfigurationParameterImpl(String name, Object value) {
if (name == null || name.length() == 0) {
- throw new IllegalArgumentException(LocalizedStrings.ConfigurationParameterImpl_CONFIGURATIONPARAMETER_NAME_MUST_BE_SPECIFIED.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.ConfigurationParameterImpl_CONFIGURATIONPARAMETER_NAME_MUST_BE_SPECIFIED
+ .toLocalizedString());
}
-
+
this.name = name;
setInternalState(name, value, value.getClass(), true);
}
-
+
/** Constructor to allow serialization by subclass */
protected ConfigurationParameterImpl() {}
-
+
// -------------------------------------------------------------------------
- // Attribute accessors and mutators
+ // Attribute accessors and mutators
// -------------------------------------------------------------------------
public String getName() {
return this.name;
}
-
+
public String getDescription() {
return this.description;
}
-
+
public Object getValue() {
return this.value;
}
-
+
public String getValueAsString() {
if (isString()) {
return (String) this.value;
- }
- else if (isInetAddress()) {
+ } else if (isInetAddress()) {
return InetAddressUtil.toString(this.value);
- }
- else if (isFile()) {
+ } else if (isFile()) {
return this.value.toString();
- }
- else if (isOctal()) {
+ } else if (isOctal()) {
String strVal = Integer.toOctalString(((Integer) this.value).intValue());
if (!strVal.startsWith("0")) {
strVal = "0" + strVal;
}
return strVal;
- }
- else if (isArray()) {
+ } else if (isArray()) {
List list = Arrays.asList((Object[]) this.value);
return list.toString();
- }
- else {
+ } else {
return this.value.toString();
}
}
-
+
public Class getValueType() {
return this.type;
}
-
+
public boolean isModifiable() {
return this.userModifiable;
}
-
+
public boolean isArray() {
- return "manager-parameters".equals(this.name) ||
- "manager-classpaths".equals(this.name);
+ return "manager-parameters".equals(this.name) || "manager-classpaths".equals(this.name);
}
+
public boolean isInetAddress() {
return java.net.InetAddress.class.isAssignableFrom(this.type);
}
+
public boolean isFile() {
return java.io.File.class.equals(this.type);
}
+
public boolean isOctal() {
return "shared-memory-permissions".equals(this.name);
}
+
public boolean isString() {
return java.lang.String.class.equals(this.type);
}
-
+
public void setValue(Object value) throws UnmodifiableConfigurationException {
if (!isModifiable()) {
- throw new UnmodifiableConfigurationException(LocalizedStrings.ConfigurationParameterImpl_0_IS_NOT_A_MODIFIABLE_CONFIGURATION_PARAMETER.toLocalizedString(getName()));
+ throw new UnmodifiableConfigurationException(
+ LocalizedStrings.ConfigurationParameterImpl_0_IS_NOT_A_MODIFIABLE_CONFIGURATION_PARAMETER
+ .toLocalizedString(getName()));
}
if (value == null) {
- throw new IllegalArgumentException(LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_0_TO_NULL_VALUE.toLocalizedString(getName()));
+ throw new IllegalArgumentException(
+ LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_0_TO_NULL_VALUE
+ .toLocalizedString(getName()));
}
if (!getValueType().equals(value.getClass())) {
- throw new IllegalArgumentException(LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_TYPE_0_WITH_TYPE_1.toLocalizedString(new Object[] {getValueType().getName(), value.getClass().getName()}));
+ throw new IllegalArgumentException(
+ LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_TYPE_0_WITH_TYPE_1
+ .toLocalizedString(
+ new Object[] {getValueType().getName(), value.getClass().getName()}));
}
-
+
if (value instanceof String && !isString()) {
// we need to check what the type should be and convert to it...
setValueFromString((String) value);
- }
- else {
+ } else {
this.value = value;
}
fireConfigurationParameterValueChanged(this);
}
-
+
// -------------------------------------------------------------------------
- // Operations for handling the registration of listeners
- // Note: this is only for use within impl pkg and subclass pkgs
+ // Operations for handling the registration of listeners
+ // Note: this is only for use within impl pkg and subclass pkgs
// -------------------------------------------------------------------------
-
+
/** Adds the listener for any changes to this configuration parameter. */
public void addConfigurationParameterListener(ConfigurationParameterListener listener) {
if (!this.listeners.contains(listener)) {
this.listeners.add(listener);
}
}
-
+
/** Removes the listener if it's currently registered. */
public void removeConfigurationParameterListener(ConfigurationParameterListener listener) {
if (this.listeners.contains(listener)) {
@@ -202,75 +203,76 @@ implements org.apache.geode.admin.ConfigurationParameter {
}
// -------------------------------------------------------------------------
- // Implementation methods
+ // Implementation methods
// -------------------------------------------------------------------------
protected void setValueFromString(String newValue) {
if (newValue == null) {
- throw new IllegalArgumentException(LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_0_TO_NULL_VALUE.toLocalizedString(getName()));
+ throw new IllegalArgumentException(
+ LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_0_TO_NULL_VALUE
+ .toLocalizedString(getName()));
}
if (isInetAddress()) {
this.value = InetAddressUtil.toInetAddress(newValue);
- }
- else if (isFile()) {
+ } else if (isFile()) {
this.value = new File(newValue);
- }
- else if (isOctal()) {
+ } else if (isOctal()) {
if (!newValue.startsWith("0")) {
newValue = "0" + newValue;
}
this.value = Integer.valueOf(Integer.parseInt(newValue, 8));
- }
- else if (isArray()) {
+ } else if (isArray()) {
// parse it TODO
- throw new IllegalArgumentException(LocalizedStrings.ConfigurationParameterImpl_SETTING_ARRAY_VALUE_FROM_DELIMITED_STRING_IS_NOT_SUPPORTED.toLocalizedString());
- }
- else {
+ throw new IllegalArgumentException(
+ LocalizedStrings.ConfigurationParameterImpl_SETTING_ARRAY_VALUE_FROM_DELIMITED_STRING_IS_NOT_SUPPORTED
+ .toLocalizedString());
+ } else {
this.value = newValue;
}
}
-
+
/**
* Fires changed configuration parameter to registered listeners.
*
- * @param parm the configuration parameter the changed
+ * @param parm the configuration parameter the changed
*/
- protected void fireConfigurationParameterValueChanged(ConfigurationParameter parm) {
- ConfigurationParameterListener[] listeners =
- (ConfigurationParameterListener[]) this.listeners.toArray(
- new ConfigurationParameterListener[0]);
+ protected void fireConfigurationParameterValueChanged(ConfigurationParameter parm) {
+ ConfigurationParameterListener[] listeners = (ConfigurationParameterListener[]) this.listeners
+ .toArray(new ConfigurationParameterListener[0]);
for (int i = 0; i < listeners.length; i++) {
listeners[i].configurationParameterValueChanged(parm);
}
- }
-
+ }
+
/**
- * Sets the internal state of this configuration parameter.
+ * Sets the internal state of this configuration parameter.
*
- * @param description full description to use
- * @param value the value of this parameter
- * @param type the class type of the value
- * @param userModifiable true if this is modifiable; false if read-only
+ * @param description full description to use
+ * @param value the value of this parameter
+ * @param type the class type of the value
+ * @param userModifiable true if this is modifiable; false if read-only
*/
- protected void setInternalState(String description,
- Object value,
- Class type,
- boolean userModifiable) {
+ protected void setInternalState(String description, Object value, Class type,
+ boolean userModifiable) {
if (description == null || description.length() == 0) {
- throw new IllegalArgumentException(LocalizedStrings.ConfigurationParameterImpl_CONFIGURATIONPARAMETER_DESCRIPTION_MUST_BE_SPECIFIED.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.ConfigurationParameterImpl_CONFIGURATIONPARAMETER_DESCRIPTION_MUST_BE_SPECIFIED
+ .toLocalizedString());
}
this.description = description;
this.type = type;
this.userModifiable = userModifiable;
if (value == null) {
- throw new IllegalArgumentException(LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_0_TO_NULL_VALUE.toLocalizedString(getName()));
+ throw new IllegalArgumentException(
+ LocalizedStrings.ConfigurationParameterImpl_UNABLE_TO_SET_0_TO_NULL_VALUE
+ .toLocalizedString(getName()));
}
this.value = value;
}
-
+
@Override
public String toString() {
return this.name;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
index b9102d6..8865429 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ConfigurationParameterListener.java
@@ -1,31 +1,27 @@
/*
- * 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
+ * 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.admin.internal;
import org.apache.geode.admin.ConfigurationParameter;
/**
- * Listens to value changes of a
- * {@link org.apache.geode.admin.ConfigurationParameter}. This is for
- * internal use only to allow a {@link SystemMemberImpl} to keep track of
- * configuration changes made through
- * {@link ConfigurationParameterImpl#setValue}.
+ * Listens to value changes of a {@link org.apache.geode.admin.ConfigurationParameter}. This is for
+ * internal use only to allow a {@link SystemMemberImpl} to keep track of configuration changes made
+ * through {@link ConfigurationParameterImpl#setValue}.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
public interface ConfigurationParameterListener {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/DisabledManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DisabledManagedEntityController.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DisabledManagedEntityController.java
index 8450991..e4eb49f 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DisabledManagedEntityController.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DisabledManagedEntityController.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -25,66 +23,71 @@ import org.apache.geode.internal.logging.log4j.LogMarker;
/**
* This is a disabled implementation of ManagedEntityController for bug #47909.
*
- * The old ManagedEntityController was a concrete class which has been renamed
- * to ManagedEntityControllerImpl. The build.xml now skips building
- * ManagedEntityControllerImpl. If ManagedEntityControllerImpl is not found
- * in the classpath then the code uses DisabledManagedEntityController as a
- * place holder.
+ * The old ManagedEntityController was a concrete class which has been renamed to
+ * ManagedEntityControllerImpl. The build.xml now skips building ManagedEntityControllerImpl. If
+ * ManagedEntityControllerImpl is not found in the classpath then the code uses
+ * DisabledManagedEntityController as a place holder.
*
*/
class DisabledManagedEntityController implements ManagedEntityController {
private static final Logger logger = LogService.getLogger();
- private static final String EXCEPTION_MESSAGE = "Local and remote OS command invocations are disabled for the Admin API.";
-
- DisabledManagedEntityController() {
- }
-
+ private static final String EXCEPTION_MESSAGE =
+ "Local and remote OS command invocations are disabled for the Admin API.";
+
+ DisabledManagedEntityController() {}
+
@Override
public void start(InternalManagedEntity entity) {
- if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)){
- logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#start {}", EXCEPTION_MESSAGE);
+ if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)) {
+ logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#start {}",
+ EXCEPTION_MESSAGE);
}
throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
}
@Override
public void stop(InternalManagedEntity entity) {
- if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)){
- logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#stop {}", EXCEPTION_MESSAGE);
+ if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)) {
+ logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#stop {}",
+ EXCEPTION_MESSAGE);
}
throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
}
@Override
public boolean isRunning(InternalManagedEntity entity) {
- if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)){
- logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#isRunning {}", EXCEPTION_MESSAGE);
+ if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)) {
+ logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#isRunning {}",
+ EXCEPTION_MESSAGE);
}
throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
}
@Override
public String getLog(DistributionLocatorImpl locator) {
- if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)){
- logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#getLog {}", EXCEPTION_MESSAGE);
+ if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)) {
+ logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#getLog {}",
+ EXCEPTION_MESSAGE);
}
throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
}
@Override
public String buildSSLArguments(DistributedSystemConfig config) {
- if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)){
- logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#buildSSLArguments {}", EXCEPTION_MESSAGE);
+ if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)) {
+ logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#buildSSLArguments {}",
+ EXCEPTION_MESSAGE);
}
throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
}
@Override
public String getProductExecutable(InternalManagedEntity entity, String executable) {
- if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)){
- logger.warn(LogMarker.MANAGED_ENTITY, "DisabledManagedEntityController#getProductExecutable {}", EXCEPTION_MESSAGE);
+ if (logger.isTraceEnabled(LogMarker.MANAGED_ENTITY)) {
+ logger.warn(LogMarker.MANAGED_ENTITY,
+ "DisabledManagedEntityController#getProductExecutable {}", EXCEPTION_MESSAGE);
}
throw new UnsupportedOperationException(EXCEPTION_MESSAGE);
}
[28/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java b/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
index fc4ce0f..389d6bc 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
@@ -1,24 +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
+ * 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.admin;
/**
- * Configuration for a GemFire cache server that is managed by the
- * administration API. The cache server may or may not be running.
+ * Configuration for a GemFire cache server that is managed by the administration API. The cache
+ * server may or may not be running.
*
* @see AdminDistributedSystem#addCacheServer()
*
@@ -28,27 +26,25 @@ package org.apache.geode.admin;
@Deprecated
public interface CacheServerConfig extends CacheVmConfig {
/**
- * Returns the <code>cache.xml</code> declarative caching
- * initialization file used to configure this cache server VM. By
- * default, a cache server VM is started without an XML file.
+ * Returns the <code>cache.xml</code> declarative caching initialization file used to configure
+ * this cache server VM. By default, a cache server VM is started without an XML file.
*/
public String getCacheXMLFile();
/**
- * Sets the <code>cache.xml</code> declarative caching
- * initialization file used to configure this cache server VM.
+ * Sets the <code>cache.xml</code> declarative caching initialization file used to configure this
+ * cache server VM.
*/
public void setCacheXMLFile(String cacheXml);
/**
- * Returns the location(s) of user classes (such as cache loaders)
- * required by the cache server VM.
+ * Returns the location(s) of user classes (such as cache loaders) required by the cache server
+ * VM.
*/
public String getClassPath();
/**
- * Sets the location(s) of user classes (such as cache loaders)
- * required by the cache server VM.
+ * Sets the location(s) of user classes (such as cache loaders) required by the cache server VM.
*/
public void setClassPath(String classpath);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java b/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
index 5bfeddc..30d8701 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
@@ -1,33 +1,31 @@
/*
- * 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
+ * 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.admin;
/**
- * A dedicated cache server VM that is managed by the administration
- * API.
- * <p>Note that this may not represent an instance of
- * {@link org.apache.geode.cache.server.CacheServer}. It is possible for
- * a cache VM to be started but for it not to listen for client connections
- * in which case it is not a
- * {@link org.apache.geode.cache.server.CacheServer}
- * but is an instance of this interface.
+ * A dedicated cache server VM that is managed by the administration API.
+ * <p>
+ * Note that this may not represent an instance of
+ * {@link org.apache.geode.cache.server.CacheServer}. It is possible for a cache VM to be started
+ * but for it not to listen for client connections in which case it is not a
+ * {@link org.apache.geode.cache.server.CacheServer} but is an instance of this interface.
*
* @since GemFire 5.7
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface CacheVm extends SystemMember, ManagedEntity {
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java b/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java
index e7068bc..81f4a38 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheVmConfig.java
@@ -1,53 +1,51 @@
/*
- * 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
+ * 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.admin;
/**
- * Configuration for a GemFire cache server VM that is managed by the
- * administration API. The VM may or may not be running.
+ * Configuration for a GemFire cache server VM that is managed by the administration API. The VM may
+ * or may not be running.
*
* @see AdminDistributedSystem#addCacheVm()
*
* @since GemFire 5.7
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface CacheVmConfig extends ManagedEntityConfig {
/**
- * Returns the <code>cache.xml</code> declarative caching
- * initialization file used to configure this cache server VM. By
- * default, a cache server VM is started without an XML file.
+ * Returns the <code>cache.xml</code> declarative caching initialization file used to configure
+ * this cache server VM. By default, a cache server VM is started without an XML file.
*/
public String getCacheXMLFile();
/**
- * Sets the <code>cache.xml</code> declarative caching
- * initialization file used to configure this cache server VM.
+ * Sets the <code>cache.xml</code> declarative caching initialization file used to configure this
+ * cache server VM.
*/
public void setCacheXMLFile(String cacheXml);
/**
- * Returns the location(s) of user classes (such as cache loaders)
- * required by the cache server VM.
+ * Returns the location(s) of user classes (such as cache loaders) required by the cache server
+ * VM.
*/
public String getClassPath();
/**
- * Sets the location(s) of user classes (such as cache loaders)
- * required by the cache server VM.
+ * Sets the location(s) of user classes (such as cache loaders) required by the cache server VM.
*/
public void setClassPath(String classpath);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java b/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
index ff9b613..74e1510 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/ConfigurationParameter.java
@@ -1,72 +1,71 @@
/*
- * 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
+ * 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.admin;
/**
-* A single configuration parameter of a {@link SystemMember}.
+ * A single configuration parameter of a {@link SystemMember}.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface ConfigurationParameter {
-
+
/** Gets the identifying name of this configuration parameter. */
public String getName();
-
+
/** Gets the full description of this configuration parameter */
public String getDescription();
-
+
/** Gets the current value */
public Object getValue();
-
+
/** Gets the current value as a string */
public String getValueAsString();
-
+
/** Gets the class type of the value */
public Class getValueType();
-
+
/** True if this is modifiable; false if read-only */
public boolean isModifiable();
-
+
/** Returns true if this config parameter uses a string array for value. */
public boolean isArray();
-
+
/** Returns true if this config parameter represents an InetAddress value. */
public boolean isInetAddress();
-
+
/** Returns true if this config parameter represents a File value. */
public boolean isFile();
-
+
/** Returns true if this config parameter represents an octal value. */
public boolean isOctal();
-
+
/** Returns true if this config parameter represents a string value. */
public boolean isString();
-
+
/**
* Sets a new value for this configuration parameter.
*
- * @param value the new value which must be of type {@link #getValueType}
- * @throws IllegalArgumentException
- * if value type does not match {@link #getValueType}
- * @throws UnmodifiableConfigurationException
- * if attempting to set value when isModifiable is false
+ * @param value the new value which must be of type {@link #getValueType}
+ * @throws IllegalArgumentException if value type does not match {@link #getValueType}
+ * @throws UnmodifiableConfigurationException if attempting to set value when isModifiable is
+ * false
*/
public void setValue(Object value) throws UnmodifiableConfigurationException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
index 67f8c7c..940d306 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemConfig.java
@@ -1,18 +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
+ * 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.admin;
@@ -25,53 +23,47 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
/**
- * Configuration for defining a GemFire distributed system to
- * administrate. This configuration includes information about the
- * discovery mechanism used to find members of the distributed system
- * and information about {@linkplain ManagedEntity managed entities}
- * such as {@linkplain DistributionLocator distribution locators}
- * and {@linkplain CacheVm GemFire cache vms}
- * that can be {@linkplain AdminDistributedSystem#start started}.
+ * Configuration for defining a GemFire distributed system to administrate. This configuration
+ * includes information about the discovery mechanism used to find members of the distributed system
+ * and information about {@linkplain ManagedEntity managed entities} such as
+ * {@linkplain DistributionLocator distribution locators} and {@linkplain CacheVm GemFire cache vms}
+ * that can be {@linkplain AdminDistributedSystem#start started}.
*
* <P>
*
- * Detailed descriptions of many of these configuration attributes can
- * be found in the {@link
- * org.apache.geode.distributed.DistributedSystem
- * DistributedSystem} class. Note that the default values of these
- * configuration attributes can be specified using Java system
- * properties.
+ * Detailed descriptions of many of these configuration attributes can be found in the
+ * {@link org.apache.geode.distributed.DistributedSystem DistributedSystem} class. Note that the
+ * default values of these configuration attributes can be specified using Java system properties.
*
* <P>
*
- * A <code>DistributedSystemConfig</code> can be modified using a
- * number of mutator methods until the
- * <code>AdminDistributedSystem</code> that it configures {@linkplain
- * AdminDistributedSystem#connect connects} to the distributed system.
- * After that, attempts to modify most attributes in the
- * <code>DistributedSystemConfig</code> will result in an {@link
- * IllegalStateException} being thrown. If you wish to use the same
- * <code>DistributedSystemConfig</code> to configure multiple
- * <code>AdminDistributedSystem</code>s, a copy of the
- * <code>DistributedSystemConfig</code> object can be made by invoking
- * the {@link #clone} method.
+ * A <code>DistributedSystemConfig</code> can be modified using a number of mutator methods until
+ * the <code>AdminDistributedSystem</code> that it configures
+ * {@linkplain AdminDistributedSystem#connect connects} to the distributed system. After that,
+ * attempts to modify most attributes in the <code>DistributedSystemConfig</code> will result in an
+ * {@link IllegalStateException} being thrown. If you wish to use the same
+ * <code>DistributedSystemConfig</code> to configure multiple <code>AdminDistributedSystem</code>s,
+ * a copy of the <code>DistributedSystemConfig</code> object can be made by invoking the
+ * {@link #clone} method.
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
-*/
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
+ */
public interface DistributedSystemConfig extends Cloneable {
- /** The name of an XML file that specifies the configuration for the
- * {@linkplain ManagedEntity managed entities} administered by the
- * <code>DistributedSystem</code>. The XML file must conform to a
- * <a href="doc-files/ds5_0.dtd">dtd</a>. */
- String ENTITY_CONFIG_XML_FILE_NAME =
- "entity-config-xml-file";
+ /**
+ * The name of an XML file that specifies the configuration for the {@linkplain ManagedEntity
+ * managed entities} administered by the <code>DistributedSystem</code>. The XML file must conform
+ * to a <a href="doc-files/ds5_0.dtd">dtd</a>.
+ */
+ String ENTITY_CONFIG_XML_FILE_NAME = "entity-config-xml-file";
- /** The default value of the "entity-config-xml-file" property
- * ("distributed-system.xml"). */
- String DEFAULT_ENTITY_CONFIG_XML_FILE =
- "distributed-system.xml";
+ /**
+ * The default value of the "entity-config-xml-file" property ("distributed-system.xml").
+ */
+ String DEFAULT_ENTITY_CONFIG_XML_FILE = "distributed-system.xml";
/** The name of the "system-id" property */
String SYSTEM_ID_NAME = "system-id";
@@ -89,123 +81,128 @@ public interface DistributedSystemConfig extends Cloneable {
String MCAST_PORT_NAME = MCAST_PORT;
/** The default value of the "mcastPort" property (10334) */
- int DEFAULT_MCAST_PORT =
- DistributionConfig.DEFAULT_MCAST_PORT;
+ int DEFAULT_MCAST_PORT = DistributionConfig.DEFAULT_MCAST_PORT;
/** The minimum mcastPort (0) */
int MIN_MCAST_PORT = DistributionConfig.MIN_MCAST_PORT;
/** The maximum mcastPort (65535) */
int MAX_MCAST_PORT = DistributionConfig.MAX_MCAST_PORT;
-
+
/** The name of the "mcastAddress" property */
String MCAST_ADDRESS_NAME = MCAST_ADDRESS;
/** The default value of the "mcastAddress" property (239.192.81.1). */
- String DEFAULT_MCAST_ADDRESS =
- InetAddressUtil.toString(DistributionConfig.DEFAULT_MCAST_ADDRESS);
-
- /** The name of the "membership-port-range" property
+ String DEFAULT_MCAST_ADDRESS = InetAddressUtil.toString(DistributionConfig.DEFAULT_MCAST_ADDRESS);
+
+ /**
+ * The name of the "membership-port-range" property
+ *
* @since GemFire 6.5
*/
String MEMBERSHIP_PORT_RANGE_NAME = MEMBERSHIP_PORT_RANGE;
/**
* The default membership-port-range.
- * <p> Actual value is <code>[1024,65535]</code>.
+ * <p>
+ * Actual value is <code>[1024,65535]</code>.
+ *
* @since GemFire 6.5
*/
- int[] DEFAULT_MEMBERSHIP_PORT_RANGE =
- DistributionConfig.DEFAULT_MEMBERSHIP_PORT_RANGE;
-
- /** settings for tcp-port
+ int[] DEFAULT_MEMBERSHIP_PORT_RANGE = DistributionConfig.DEFAULT_MEMBERSHIP_PORT_RANGE;
+
+ /**
+ * settings for tcp-port
+ *
* @since GemFire 6.5
*/
String TCP_PORT_NAME = TCP_PORT;
- /** The default value of the "tcpPort" property.
- * <p> Actual value is <code>0</code>.
+ /**
+ * The default value of the "tcpPort" property.
+ * <p>
+ * Actual value is <code>0</code>.
+ *
* @since GemFire 6.5
*/
int DEFAULT_TCP_PORT = DistributionConfig.DEFAULT_TCP_PORT;
/**
* The default AckWaitThreshold.
- * <p> Actual value of this constant is <code>15</code> seconds.
+ * <p>
+ * Actual value of this constant is <code>15</code> seconds.
*/
- int DEFAULT_ACK_WAIT_THRESHOLD =
- DistributionConfig.DEFAULT_ACK_WAIT_THRESHOLD;
+ int DEFAULT_ACK_WAIT_THRESHOLD = DistributionConfig.DEFAULT_ACK_WAIT_THRESHOLD;
/**
* The minimum AckWaitThreshold.
- * <p> Actual value of this constant is <code>1</code> second.
+ * <p>
+ * Actual value of this constant is <code>1</code> second.
*/
- int MIN_ACK_WAIT_THRESHOLD =
- DistributionConfig.MIN_ACK_WAIT_THRESHOLD;
+ int MIN_ACK_WAIT_THRESHOLD = DistributionConfig.MIN_ACK_WAIT_THRESHOLD;
/**
* The maximum AckWaitThreshold.
- * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
+ * <p>
+ * Actual value of this constant is <code>MAX_INT</code> seconds.
*/
- int MAX_ACK_WAIT_THRESHOLD =
- DistributionConfig.MIN_ACK_WAIT_THRESHOLD;
-
+ int MAX_ACK_WAIT_THRESHOLD = DistributionConfig.MIN_ACK_WAIT_THRESHOLD;
+
/**
* The default ackSevereAlertThreshold.
- * <p> Actual value of this constant is <code>0</code> seconds, which
- * turns off forced disconnects based on ack wait periods.
+ * <p>
+ * Actual value of this constant is <code>0</code> seconds, which turns off forced disconnects
+ * based on ack wait periods.
*/
- int DEFAULT_ACK_SEVERE_ALERT_THRESHOLD =
- DistributionConfig.DEFAULT_ACK_SEVERE_ALERT_THRESHOLD;
+ int DEFAULT_ACK_SEVERE_ALERT_THRESHOLD = DistributionConfig.DEFAULT_ACK_SEVERE_ALERT_THRESHOLD;
/**
* The minimum ackSevereAlertThreshold.
- * <p> Actual value of this constant is <code>0</code> second,
- * which turns off forced disconnects based on ack wait periods.
+ * <p>
+ * Actual value of this constant is <code>0</code> second, which turns off forced disconnects
+ * based on ack wait periods.
*/
- int MIN_ACK_SEVERE_ALERT_THRESHOLD =
- DistributionConfig.MIN_ACK_SEVERE_ALERT_THRESHOLD;
+ int MIN_ACK_SEVERE_ALERT_THRESHOLD = DistributionConfig.MIN_ACK_SEVERE_ALERT_THRESHOLD;
/**
* The maximum ackSevereAlertThreshold.
- * <p> Actual value of this constant is <code>MAX_INT</code> seconds.
+ * <p>
+ * Actual value of this constant is <code>MAX_INT</code> seconds.
*/
- int MAX_ACK_SEVERE_ALERT_THRESHOLD =
- DistributionConfig.MAX_ACK_SEVERE_ALERT_THRESHOLD;
+ int MAX_ACK_SEVERE_ALERT_THRESHOLD = DistributionConfig.MAX_ACK_SEVERE_ALERT_THRESHOLD;
/** The name of the "locators" property (comma-delimited host[port] list) */
String LOCATORS_NAME = LOCATORS;
/** The default value of the "locators" property ("") */
- String DEFAULT_LOCATORS =
- DistributionConfig.DEFAULT_LOCATORS;
+ String DEFAULT_LOCATORS = DistributionConfig.DEFAULT_LOCATORS;
/** The name of the "bindAddress" property */
String BIND_ADDRESS_NAME = BIND_ADDRESS;
/** The default value of the "bindAddress" property */
- String DEFAULT_BIND_ADDRESS =
- DistributionConfig.DEFAULT_BIND_ADDRESS;
+ String DEFAULT_BIND_ADDRESS = DistributionConfig.DEFAULT_BIND_ADDRESS;
/** The name of the remote-command property */
String REMOTE_COMMAND_NAME = "remote-command";
/** The default value of the remote-command property */
- String DEFAULT_REMOTE_COMMAND =
- "rsh -n {HOST} {CMD}";
+ String DEFAULT_REMOTE_COMMAND = "rsh -n {HOST} {CMD}";
/** The default disable-tcp value (<code>false</code>) */
boolean DEFAULT_DISABLE_TCP = DistributionConfig.DEFAULT_DISABLE_TCP;
-
+
/** The default enable-network-partition-detection setting (<code>false</code>) */
- boolean DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION = DistributionConfig.DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION;
-
+ boolean DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION =
+ DistributionConfig.DEFAULT_ENABLE_NETWORK_PARTITION_DETECTION;
+
/** The default disable-auto-reconnect setting (<code>false</code>) */
boolean DEFAULT_DISABLE_AUTO_RECONNECT = DistributionConfig.DEFAULT_DISABLE_AUTO_RECONNECT;
/** The default failure-detection timeout period for member heart-beat responses */
int DEFAULT_MEMBER_TIMEOUT = DistributionConfig.DEFAULT_MEMBER_TIMEOUT;
-
+
/** The name of the "logFile" property */
String LOG_FILE_NAME = LOG_FILE;
- /** The default log-file value ("" which directs logging to standard
- * output) */
+ /**
+ * The default log-file value ("" which directs logging to standard output)
+ */
String DEFAULT_LOG_FILE = "";
/** The name of the "logLevel" property */
@@ -215,61 +212,51 @@ public interface DistributedSystemConfig extends Cloneable {
String DEFAULT_LOG_LEVEL = "config";
/** The name of the "LogDiskSpaceLimit" property */
- String LOG_DISK_SPACE_LIMIT_NAME =
- LOG_DISK_SPACE_LIMIT;
+ String LOG_DISK_SPACE_LIMIT_NAME = LOG_DISK_SPACE_LIMIT;
/** The default log disk space limit in megabytes (0) */
- int DEFAULT_LOG_DISK_SPACE_LIMIT =
- DistributionConfig.DEFAULT_LOG_DISK_SPACE_LIMIT;
+ int DEFAULT_LOG_DISK_SPACE_LIMIT = DistributionConfig.DEFAULT_LOG_DISK_SPACE_LIMIT;
/** The minimum log disk space limit in megabytes (0) */
- int MIN_LOG_DISK_SPACE_LIMIT =
- DistributionConfig.MIN_LOG_DISK_SPACE_LIMIT;
+ int MIN_LOG_DISK_SPACE_LIMIT = DistributionConfig.MIN_LOG_DISK_SPACE_LIMIT;
/** The minimum log disk space limit in megabytes (1000000) */
- int MAX_LOG_DISK_SPACE_LIMIT =
- DistributionConfig.MAX_LOG_DISK_SPACE_LIMIT;
-
+ int MAX_LOG_DISK_SPACE_LIMIT = DistributionConfig.MAX_LOG_DISK_SPACE_LIMIT;
+
/** The name of the "LogFileSizeLimit" property */
String LOG_FILE_SIZE_LIMIT_NAME = LOG_FILE_SIZE_LIMIT;
/** The default log file size limit in megabytes (0) */
- int DEFAULT_LOG_FILE_SIZE_LIMIT =
- DistributionConfig.DEFAULT_LOG_FILE_SIZE_LIMIT;
+ int DEFAULT_LOG_FILE_SIZE_LIMIT = DistributionConfig.DEFAULT_LOG_FILE_SIZE_LIMIT;
/** The minimum log file size limit in megabytes (0) */
- int MIN_LOG_FILE_SIZE_LIMIT =
- DistributionConfig.MIN_LOG_FILE_SIZE_LIMIT;
+ int MIN_LOG_FILE_SIZE_LIMIT = DistributionConfig.MIN_LOG_FILE_SIZE_LIMIT;
/** The minimum log file size limit in megabytes (1000000) */
- int MAX_LOG_FILE_SIZE_LIMIT =
- DistributionConfig.MAX_LOG_FILE_SIZE_LIMIT;
+ int MAX_LOG_FILE_SIZE_LIMIT = DistributionConfig.MAX_LOG_FILE_SIZE_LIMIT;
/**
- * The name of the "refreshInterval" property which will apply to
- * SystemMember, SystemMemberCache and StatisticResource refresh. This interval
- * (in seconds) is used for auto-polling and updating AdminDistributedSystem
- * constituents including SystemMember, CacheServer, SystemMemberCache and
- * StatisticResource. This interval is read-only and retains the value set
- * when the config is created. Note that the resource MBeans actually refresh
- * and hit the DS only if there is an RMI client connected
- * */
- String REFRESH_INTERVAL_NAME =
- "refresh-interval";
+ * The name of the "refreshInterval" property which will apply to SystemMember, SystemMemberCache
+ * and StatisticResource refresh. This interval (in seconds) is used for auto-polling and updating
+ * AdminDistributedSystem constituents including SystemMember, CacheServer, SystemMemberCache and
+ * StatisticResource. This interval is read-only and retains the value set when the config is
+ * created. Note that the resource MBeans actually refresh and hit the DS only if there is an RMI
+ * client connected
+ */
+ String REFRESH_INTERVAL_NAME = "refresh-interval";
/**
- * The default "refreshInterval" in seconds which will apply to
- * REFRESH_INTERVAL_NAME property. The default value is 15 secs
- * */
+ * The default "refreshInterval" in seconds which will apply to REFRESH_INTERVAL_NAME property.
+ * The default value is 15 secs
+ */
int DEFAULT_REFRESH_INTERVAL = 15;
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Returns the name of the XML file that specifies the configuration
- * of the {@linkplain org.apache.geode.admin.ManagedEntity
- * managed entities} administered by the
- * <code>DistributedSystem</code>. The XML file must conform to a
+ * Returns the name of the XML file that specifies the configuration of the
+ * {@linkplain org.apache.geode.admin.ManagedEntity managed entities} administered by the
+ * <code>DistributedSystem</code>. The XML file must conform to a
* <a href="doc-files/ds5_0.dtd">dtd</a>.
*
* @since GemFire 4.0
@@ -277,9 +264,8 @@ public interface DistributedSystemConfig extends Cloneable {
public String getEntityConfigXMLFile();
/**
- * Sets the name of the XML file that specifies the configuration of
- * managed entities administered by the
- * <code>DistributedSystem</code>.
+ * Sets the name of the XML file that specifies the configuration of managed entities administered
+ * by the <code>DistributedSystem</code>.
*/
public void setEntityConfigXMLFile(String xmlFile);
@@ -303,19 +289,19 @@ public interface DistributedSystemConfig extends Cloneable {
/** Returns the multicast port for the system */
public int getMcastPort();
-
+
/** Sets the multicast port for the system */
public void setMcastPort(int mcastPort);
/** Returns the ack-wait-threshold for the system */
public int getAckWaitThreshold();
-
+
/** Sets the ack-wait-threshold for the system */
public void setAckWaitThreshold(int seconds);
/** Returns the ack-severe-alert-threshold for the system */
public int getAckSevereAlertThreshold();
-
+
/** Sets the ack-severe-alert-threshold for the system */
public void setAckSevereAlertThreshold(int seconds);
@@ -326,43 +312,48 @@ public interface DistributedSystemConfig extends Cloneable {
public void setLocators(String locators);
/**
- * Returns the membership-port-range property of the Distributed System. This
- * range is given as two numbers separated by a minus sign.
+ * Returns the membership-port-range property of the Distributed System. This range is given as
+ * two numbers separated by a minus sign.
+ *
* @since GemFire 6.5
*/
public String getMembershipPortRange();
-
+
/**
- * Sets the membership-port-range property of the Distributed System. This
- * range is given as two numbers separated by a minus sign.
+ * Sets the membership-port-range property of the Distributed System. This range is given as two
+ * numbers separated by a minus sign.
+ *
* @since GemFire 6.5
*/
public void setMembershipPortRange(String membershipPortRange);
-
-
+
+
/**
* Sets the primary communication port number for the Distributed System.
+ *
* @since GemFire 6.5
*/
public void setTcpPort(int port);
/**
* Returns the primary communication port number for the Distributed System.
+ *
* @since GemFire 6.5
*/
public int getTcpPort();
- /** Sets the disable-tcp property for the system. When tcp is disabled,
- the cache uses udp for unicast messaging. This must be consistent
- across all members of the distributed system. The default is to enable
- tcp. */
+ /**
+ * Sets the disable-tcp property for the system. When tcp is disabled, the cache uses udp for
+ * unicast messaging. This must be consistent across all members of the distributed system. The
+ * default is to enable tcp.
+ */
public void setDisableTcp(boolean flag);
-
- /** Returns the disable-tcp property for the system. When tcp is
- disabled, the cache uses udp for unicast messaging. This must be
- consistent across all members of the distributed system. The default
- is to enable tcp.
+
+ /**
+ * Returns the disable-tcp property for the system. When tcp is disabled, the cache uses udp for
+ * unicast messaging. This must be consistent across all members of the distributed system. The
+ * default is to enable tcp.
*/
public boolean getDisableTcp();
@@ -371,74 +362,69 @@ public interface DistributedSystemConfig extends Cloneable {
* Turns on network partition detection
*/
public void setEnableNetworkPartitionDetection(boolean newValue);
+
/**
* Returns true if network partition detection is enabled.
*/
public boolean getEnableNetworkPartitionDetection();
-
+
/**
* Disables auto reconnect after being forced out of the distributed system
*/
public void setDisableAutoReconnect(boolean newValue);
-
+
/**
* Returns true if auto reconnect is disabled
*/
public boolean getDisableAutoReconnect();
-
-
+
+
/**
- * Returns the member-timeout millisecond value used in failure-detection
- * protocols
+ * Returns the member-timeout millisecond value used in failure-detection protocols
*/
public int getMemberTimeout();
/**
- * Set the millisecond value of the member-timeout used in failure-detection
- * protocols. This timeout determines how long a member has to respond to
- * a heartbeat request. The member is given three chances before being
- * kicked out of the distributed system with a SystemConnectException.
+ * Set the millisecond value of the member-timeout used in failure-detection protocols. This
+ * timeout determines how long a member has to respond to a heartbeat request. The member is given
+ * three chances before being kicked out of the distributed system with a SystemConnectException.
*/
public void setMemberTimeout(int value);
/**
- * Returns the IP address to which the distributed system's server
- * sockets are bound.
+ * Returns the IP address to which the distributed system's server sockets are bound.
*
* @since GemFire 4.0
*/
public String getBindAddress();
/**
- * Sets the IP address to which the distributed system's server
- * sockets are bound.
+ * Sets the IP address to which the distributed system's server sockets are bound.
*
* @since GemFire 4.0
*/
public void setBindAddress(String bindAddress);
-
-
+
+
/**
- * Returns the IP address to which client/server server sockets are
- * bound
+ * Returns the IP address to which client/server server sockets are bound
*/
public String getServerBindAddress();
-
+
/**
- * Sets the IP address to which a server cache will bind when listening
- * for client cache connections.
+ * Sets the IP address to which a server cache will bind when listening for client cache
+ * connections.
*/
public void setServerBindAddress(String bindAddress);
-
+
/** Returns the remote command setting to use for remote administration */
public String getRemoteCommand();
- /**
- * Sets the remote command setting to use for remote administration.
- * This attribute may be modified after this
- * <code>DistributedSystemConfig</code> has been used to create an
+ /**
+ * Sets the remote command setting to use for remote administration. This attribute may be
+ * modified after this <code>DistributedSystemConfig</code> has been used to create an
* <codE>AdminDistributedSystem</code>.
*/
public void setRemoteCommand(String command);
@@ -466,7 +452,7 @@ public interface DistributedSystemConfig extends Cloneable {
/** Sets the value of the "ssl-require-authentication" property. */
public void setSSLAuthenticationRequired(boolean authRequired);
-
+
/** Returns the provider-specific properties for SSL. */
public Properties getSSLProperties();
@@ -478,18 +464,16 @@ public interface DistributedSystemConfig extends Cloneable {
/** Removes an SSL property */
public void removeSSLProperty(String key);
-
+
/**
- * Returns the name of the log file to which informational messages
- * are written.
+ * Returns the name of the log file to which informational messages are written.
*
* @see org.apache.geode.i18n.LogWriterI18n
*/
public String getLogFile();
/**
- * Sets the name of the log file to which informational messages
- * are written.
+ * Sets the name of the log file to which informational messages are written.
*
* @see org.apache.geode.i18n.LogWriterI18n
*/
@@ -527,76 +511,79 @@ public interface DistributedSystemConfig extends Cloneable {
/**
* Returns the refreshInterval in seconds used for auto-polling and updating
- * AdminDistributedSystem constituents including SystemMember, CacheServer,
- * SystemMemberCache and StatisticResource
+ * AdminDistributedSystem constituents including SystemMember, CacheServer, SystemMemberCache and
+ * StatisticResource
+ *
* @since GemFire 6.0
*/
public int getRefreshInterval();
/**
* Sets the refreshInterval in seconds
+ *
* @since GemFire 6.0
*/
public void setRefreshInterval(int timeInSecs);
- /**
- * Returns an array of configurations for statically known
- * <code>CacheServers</code>.
+ /**
+ * Returns an array of configurations for statically known <code>CacheServers</code>.
+ *
* @deprecated as of 5.7 use {@link #getCacheVmConfigs} instead.
- */
+ */
@Deprecated
public CacheServerConfig[] getCacheServerConfigs();
- /**
+ /**
* Creates the configuration for a CacheServer
+ *
* @deprecated as of 5.7 use {@link #createCacheVmConfig} instead.
*/
@Deprecated
public CacheServerConfig createCacheServerConfig();
- /**
+ /**
* Removes the configuration for a CacheServer
+ *
* @deprecated as of 5.7 use {@link #removeCacheVmConfig} instead.
*/
@Deprecated
public void removeCacheServerConfig(CacheServerConfig managerConfig);
- /**
- * Returns an array of configurations for statically known
- * {@link CacheVm}s.
+ /**
+ * Returns an array of configurations for statically known {@link CacheVm}s.
+ *
* @since GemFire 5.7
- */
+ */
public CacheVmConfig[] getCacheVmConfigs();
- /**
+ /**
* Creates the configuration for a {@link CacheVm}.
+ *
* @since GemFire 5.7
*/
public CacheVmConfig createCacheVmConfig();
- /**
+ /**
* Removes the configuration for a {@link CacheVm}
+ *
* @since GemFire 5.7
*/
public void removeCacheVmConfig(CacheVmConfig existing);
/**
- * Returns configuration information about {@link
- * DistributionLocator}s that are managed by an
+ * Returns configuration information about {@link DistributionLocator}s that are managed by an
* <code>AdminDistributedSystem</code>.
*/
public DistributionLocatorConfig[] getDistributionLocatorConfigs();
-
+
/**
- * Creates a new <code>DistributionLocatorConfig</code> for a
- * distribution locator that is managed in this distributed system.
- * The default locator config is set to not use multicast
+ * Creates a new <code>DistributionLocatorConfig</code> for a distribution locator that is managed
+ * in this distributed system. The default locator config is set to not use multicast
*/
public DistributionLocatorConfig createDistributionLocatorConfig();
/**
- * Removes a <code>DistributionLocatorConfig</code> from the
- * distributed system.
+ * Removes a <code>DistributionLocatorConfig</code> from the distributed system.
*/
public void removeDistributionLocatorConfig(DistributionLocatorConfig config);
@@ -607,31 +594,28 @@ public interface DistributedSystemConfig extends Cloneable {
public void removeListener(ConfigListener listener);
/**
- * Validates that this distributed system configuration is correct
- * and consistent.
+ * Validates that this distributed system configuration is correct and consistent.
*
- * @throws IllegalStateException
- * If this config is not valid
- * @throws AdminXmlException
- * If the {@linkplain #getEntityConfigXMLFile entity config
- * XML file} is not valid
+ * @throws IllegalStateException If this config is not valid
+ * @throws AdminXmlException If the {@linkplain #getEntityConfigXMLFile entity config XML file} is
+ * not valid
*/
public void validate();
/**
- * Returns a copy of this <code>DistributedSystemConfig</code>
- * object whose configuration can be modified. Note that this
- * {@link DistributedSystemConfig.ConfigListener ConfigListener}s
- * that are registered on this config object are not cloned.
+ * Returns a copy of this <code>DistributedSystemConfig</code> object whose configuration can be
+ * modified. Note that this {@link DistributedSystemConfig.ConfigListener ConfigListener}s that
+ * are registered on this config object are not cloned.
*
* @since GemFire 4.0
*/
public Object clone() throws CloneNotSupportedException;
- ////////////////////// Inner Classes //////////////////////
+ ////////////////////// Inner Classes //////////////////////
- /** A listener whose callback methods are invoked when this config
- * changes. */
+ /**
+ * A listener whose callback methods are invoked when this config changes.
+ */
public interface ConfigListener extends java.util.EventListener {
/** Invoked when this configurated is changed. */
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java
index d9416ce..d7f7751 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/DistributedSystemHealthConfig.java
@@ -1,74 +1,72 @@
/*
- * 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
+ * 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.admin;
/**
- * Provides configuration information relating to the health of an
- * entire GemFire distributed system.
+ * Provides configuration information relating to the health of an entire GemFire distributed
+ * system.
*
* <P>
*
- * If any of the following criteria is
- * true, then the distributed system is considered to be in
+ * If any of the following criteria is true, then the distributed system is considered to be in
* {@link GemFireHealth#OKAY_HEALTH OKAY_HEALTH}.
*
* <UL>
*
* </UL>
*
- * If any of the following criteria is true, then the distributed
- * system is considered to be in {@link GemFireHealth#POOR_HEALTH
- * POOR_HEALTH}.
+ * If any of the following criteria is true, then the distributed system is considered to be in
+ * {@link GemFireHealth#POOR_HEALTH POOR_HEALTH}.
*
* <UL>
*
- * <LI>Too many application members {@linkplain
- * #getMaxDepartedApplications unexpectedly leave} the distributed
- * system.</LI>
+ * <LI>Too many application members {@linkplain #getMaxDepartedApplications unexpectedly leave} the
+ * distributed system.</LI>
*
- * <LI>Too many application members {@linkplain
- * #getMaxDepartedApplications unexpectedly leave} the distributed
- * system.</LI>
+ * <LI>Too many application members {@linkplain #getMaxDepartedApplications unexpectedly leave} the
+ * distributed system.</LI>
*
* </UL>
*
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- * */
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
+ */
public interface DistributedSystemHealthConfig {
- /** The default maximum number of application members that can
- * unexceptedly leave a healthy the distributed system. */
+ /**
+ * The default maximum number of application members that can unexceptedly leave a healthy the
+ * distributed system.
+ */
public static final long DEFAULT_MAX_DEPARTED_APPLICATIONS = 10;
- /////////////////////// Instance Methods ///////////////////////
+ /////////////////////// Instance Methods ///////////////////////
/**
- * Returns the maximum number of application members that can
- * unexceptedly leave a healthy the distributed system.
+ * Returns the maximum number of application members that can unexceptedly leave a healthy the
+ * distributed system.
*
* @see #DEFAULT_MAX_DEPARTED_APPLICATIONS
*/
public long getMaxDepartedApplications();
/**
- * Sets the maximum number of application members that can
- * unexceptedly leave a healthy the distributed system.
+ * Sets the maximum number of application members that can unexceptedly leave a healthy the
+ * distributed system.
*
* @see #getMaxDepartedApplications
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
index da8864c..cb82679 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocator.java
@@ -1,40 +1,39 @@
/*
- * 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
+ * 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.admin;
/**
- * Represents a single distribution locator server, of which a
- * distributed system may use zero or many. The distributed system
- * will be configured to use either multicast discovery or locator
+ * Represents a single distribution locator server, of which a distributed system may use zero or
+ * many. The distributed system will be configured to use either multicast discovery or locator
* service.
*
* @see DistributionLocatorConfig
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface DistributionLocator extends ManagedEntity {
-
- /**
+
+ /**
* Returns the identity name for this locator.
*/
public String getId();
-
+
/**
* Returns the configuration object for this distribution locator.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
index 162f4f1..6e8794d 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/DistributionLocatorConfig.java
@@ -1,86 +1,78 @@
/*
- * 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
+ * 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.admin;
+
import java.util.Properties;
/**
- * Describes the configuration of a {@link DistributionLocator}
- * managed by the GemFire administration APIs.
+ * Describes the configuration of a {@link DistributionLocator} managed by the GemFire
+ * administration APIs.
*
* <P>
*
- * A <code>DistributionLocatorConfig</code> can be modified using a
- * number of mutator methods until the
- * <code>DistributionLocator</code> configured by this object is
- * {@linkplain ManagedEntity#start started}. After that,
- * attempts to modify most attributes in the
- * <code>DistributionLocatorConfig</code> will result in an {@link
- * IllegalStateException} being thrown. If you wish to use the same
- * <code>DistributionLocatorConfig</code> to configure another
- * <code>DistributionLocator</code>s, a copy of the
- * <code>DistributionLocatorConfig</code> object can be made by
- * invoking the {@link Object#clone} method.
+ * A <code>DistributionLocatorConfig</code> can be modified using a number of mutator methods until
+ * the <code>DistributionLocator</code> configured by this object is {@linkplain ManagedEntity#start
+ * started}. After that, attempts to modify most attributes in the
+ * <code>DistributionLocatorConfig</code> will result in an {@link IllegalStateException} being
+ * thrown. If you wish to use the same <code>DistributionLocatorConfig</code> to configure another
+ * <code>DistributionLocator</code>s, a copy of the <code>DistributionLocatorConfig</code> object
+ * can be made by invoking the {@link Object#clone} method.
*
* @see AdminDistributedSystem#addDistributionLocator
* @see org.apache.geode.distributed.Locator
*
* @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
-public interface DistributionLocatorConfig
- extends ManagedEntityConfig {
+public interface DistributionLocatorConfig extends ManagedEntityConfig {
/**
- * Returns the port on which ths distribution locator listens for
- * members to connect. There is no default locator port, so a
- * non-default port must be specified.
+ * Returns the port on which ths distribution locator listens for members to connect. There is no
+ * default locator port, so a non-default port must be specified.
*/
public int getPort();
/**
- * Sets the port on which the distribution locator listens for
- * members to connect.
+ * Sets the port on which the distribution locator listens for members to connect.
*/
public void setPort(int port);
/**
- * Returns the address to which the distribution locator's port is
- * (or will be) bound. By default, the bind address is
- * <code>null</code> meaning that the port will be bound to all
- * network addresses on the host.
+ * Returns the address to which the distribution locator's port is (or will be) bound. By default,
+ * the bind address is <code>null</code> meaning that the port will be bound to all network
+ * addresses on the host.
*/
public String getBindAddress();
/**
- * Sets the address to which the distribution locator's port is
- * (or will be) bound.
+ * Sets the address to which the distribution locator's port is (or will be) bound.
*/
public void setBindAddress(String bindAddress);
/**
- * Sets the properties used to configure the locator's
- * DistributedSystem.
+ * Sets the properties used to configure the locator's DistributedSystem.
+ *
* @since GemFire 5.0
*/
public void setDistributedSystemProperties(Properties props);
-
+
/**
- * Retrieves the properties used to configure the locator's
- * DistributedSystem.
+ * Retrieves the properties used to configure the locator's DistributedSystem.
+ *
* @since GemFire 5.0
*/
public Properties getDistributedSystemProperties();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
index 202ce70..bb8590a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealth.java
@@ -1,18 +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
+ * 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.admin;
@@ -20,59 +18,56 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- * Provides information about the aggregate health of the members of a
- * GemFire distributed system ("components"). The {@link #getHealth
- * getHealth} method provides an indication of the overall health.
- * Health is expressed as one of three levels: {@link #GOOD_HEALTH
- * GOOD_HEALTH}, {@link #OKAY_HEALTH OKAY_HEALTH}, and {@link
- * #POOR_HEALTH POOR_HEALTH}. The {@link #getDiagnosis getDiagnosis}
- * method provides a more detailed explanation of the cause of ill
- * health.
+ * Provides information about the aggregate health of the members of a GemFire distributed system
+ * ("components"). The {@link #getHealth getHealth} method provides an indication of the overall
+ * health. Health is expressed as one of three levels: {@link #GOOD_HEALTH GOOD_HEALTH},
+ * {@link #OKAY_HEALTH OKAY_HEALTH}, and {@link #POOR_HEALTH POOR_HEALTH}. The {@link #getDiagnosis
+ * getDiagnosis} method provides a more detailed explanation of the cause of ill health.
*
* <P>
*
* The aggregate health of the GemFire component is evaluated
- * {@linkplain GemFireHealthConfig#setHealthEvaluationInterval every
- * so often} and if certain criteria are met, then the overall health
- * of the component changes accordingly. If any of the components is
- * in <code>OKAY_HEALTH</code>, then the overall health is
- * <code>OKAY_HEALTH</code>. If any of the components is in
- * <code>POOR_HEALTH</code>, then the overall health is
+ * {@linkplain GemFireHealthConfig#setHealthEvaluationInterval every so often} and if certain
+ * criteria are met, then the overall health of the component changes accordingly. If any of the
+ * components is in <code>OKAY_HEALTH</code>, then the overall health is <code>OKAY_HEALTH</code>.
+ * If any of the components is in <code>POOR_HEALTH</code>, then the overall health is
* <code>POOR_HEALTH</code>.
*
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- * */
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
+ */
public interface GemFireHealth {
- /** An indicator that the GemFire components are healthy.
+ /**
+ * An indicator that the GemFire components are healthy.
*
- * @see #getHealth */
- public static final Health GOOD_HEALTH =
- new Health(Health.GOOD_STRING);
+ * @see #getHealth
+ */
+ public static final Health GOOD_HEALTH = new Health(Health.GOOD_STRING);
- /** An indicator that one or more GemFire components is slightly
- * unhealthy. The problem may or may not require configuration
- * changes and may not necessarily lead to poorer component health.
+ /**
+ * An indicator that one or more GemFire components is slightly unhealthy. The problem may or may
+ * not require configuration changes and may not necessarily lead to poorer component health.
*
- * @see #getHealth */
- public static final Health OKAY_HEALTH =
- new Health(Health.OKAY_STRING);
+ * @see #getHealth
+ */
+ public static final Health OKAY_HEALTH = new Health(Health.OKAY_STRING);
- /** An indicator that one or more GemFire components is unhealthy.
- * While it may be possible for the components to recover on their
- * own, it is likely that they will have to be restarted.
+ /**
+ * An indicator that one or more GemFire components is unhealthy. While it may be possible for the
+ * components to recover on their own, it is likely that they will have to be restarted.
*
- * @see #getHealth */
- public static final Health POOR_HEALTH =
- new Health(Health.POOR_STRING);
+ * @see #getHealth
+ */
+ public static final Health POOR_HEALTH = new Health(Health.POOR_STRING);
- /////////////////////// Instance Methods ///////////////////////
+ /////////////////////// Instance Methods ///////////////////////
/**
- * Returns an indicator of the overall health of the GemFire
- * components.
+ * Returns an indicator of the overall health of the GemFire components.
*
* @see #GOOD_HEALTH
* @see #OKAY_HEALTH
@@ -80,97 +75,80 @@ public interface GemFireHealth {
*/
public Health getHealth();
- /**
- * Resets the overall health of the GemFire components to {@link
- * #GOOD_HEALTH}. This operation should be invoked when the
- * operator has determined that warnings about the components's
- * health do not need to be regarded.
+ /**
+ * Resets the overall health of the GemFire components to {@link #GOOD_HEALTH}. This operation
+ * should be invoked when the operator has determined that warnings about the components's health
+ * do not need to be regarded.
*/
public void resetHealth();
/**
- * Returns a message that provides a description of the cause of a
- * component's ill health.
+ * Returns a message that provides a description of the cause of a component's ill health.
*/
public String getDiagnosis();
/**
- * Returns the configuration for determining the health of the
- * distributed system itself.
+ * Returns the configuration for determining the health of the distributed system itself.
*/
public DistributedSystemHealthConfig getDistributedSystemHealthConfig();
/**
- * Sets the configuration for determining the health of the
- * distributed system itself.
+ * Sets the configuration for determining the health of the distributed system itself.
*/
public void setDistributedSystemHealthConfig(DistributedSystemHealthConfig config);
/**
- * Returns the <code>GemFireHealthConfig</code> for GemFire
- * components whose configurations are not overridden on a per-host
- * basis. Note that changes made to the returned
+ * Returns the <code>GemFireHealthConfig</code> for GemFire components whose configurations are
+ * not overridden on a per-host basis. Note that changes made to the returned
* <code>GemFireHealthConfig</code> will not take effect until
* {@link #setDefaultGemFireHealthConfig} is invoked.
*/
public GemFireHealthConfig getDefaultGemFireHealthConfig();
/**
- * Sets the <code>GemFireHealthConfig</code> for
- * GemFire components whose configurations are not overridden on a
- * per-host basis.
+ * Sets the <code>GemFireHealthConfig</code> for GemFire components whose configurations are not
+ * overridden on a per-host basis.
*
- * @throws IllegalArgumentException
- * If <code>config</code> specifies the config for a host
+ * @throws IllegalArgumentException If <code>config</code> specifies the config for a host
*/
public void setDefaultGemFireHealthConfig(GemFireHealthConfig config);
/**
- * Returns the <code>GemFireHealthConfig</code> for GemFire
- * components that reside on a given host. This configuration will
- * override the {@linkplain #getDefaultGemFireHealthConfig default}
+ * Returns the <code>GemFireHealthConfig</code> for GemFire components that reside on a given
+ * host. This configuration will override the {@linkplain #getDefaultGemFireHealthConfig default}
* configuration.
*
- * @param hostName
- * The {@linkplain java.net.InetAddress#getCanonicalHostName
- * canonical} name of the host.
+ * @param hostName The {@linkplain java.net.InetAddress#getCanonicalHostName canonical} name of
+ * the host.
*/
public GemFireHealthConfig getGemFireHealthConfig(String hostName);
/**
- * Sets the <code>GemFireHealthConfig</code> for GemFire
- * components that reside on a given host. This configuration will
- * override the {@linkplain #getDefaultGemFireHealthConfig default}
- * configuration. Note that changes made to the returned
- * <code>GemFireHealthConfig</code> will not take effect until
- * {@link #setDefaultGemFireHealthConfig} is invoked.
+ * Sets the <code>GemFireHealthConfig</code> for GemFire components that reside on a given host.
+ * This configuration will override the {@linkplain #getDefaultGemFireHealthConfig default}
+ * configuration. Note that changes made to the returned <code>GemFireHealthConfig</code> will not
+ * take effect until {@link #setDefaultGemFireHealthConfig} is invoked.
*
- * @param hostName
- * The {@linkplain java.net.InetAddress#getCanonicalHostName
- * canonical} name of the host.
+ * @param hostName The {@linkplain java.net.InetAddress#getCanonicalHostName canonical} name of
+ * the host.
*
- * @throws IllegalArgumentException
- * If host <code>hostName</code> does not exist or if there
- * are no GemFire components running on that host or if
- * <code>config</code> does not configure host
- * <code>hostName</code>.
+ * @throws IllegalArgumentException If host <code>hostName</code> does not exist or if there are
+ * no GemFire components running on that host or if <code>config</code> does not configure
+ * host <code>hostName</code>.
*/
- public void setGemFireHealthConfig(String hostName,
- GemFireHealthConfig config);
+ public void setGemFireHealthConfig(String hostName, GemFireHealthConfig config);
/**
- * Closes this health monitor and releases all resources associated
- * with it.
+ * Closes this health monitor and releases all resources associated with it.
*/
public void close();
/**
- * Returns whether or not this <code>GemFireHealth</code> is
- * {@linkplain #close closed}.
+ * Returns whether or not this <code>GemFireHealth</code> is {@linkplain #close closed}.
*/
public boolean isClosed();
- ////////////////////// Inner Classes //////////////////////
+ ////////////////////// Inner Classes //////////////////////
/**
* An enumerated type for the health of GemFire.
@@ -186,12 +164,12 @@ public interface GemFireHealth {
/** The string for poor health */
static final String POOR_STRING = LocalizedStrings.GemFireHealth_POOR.toLocalizedString();
- //////////////////// Instance Fields ////////////////////
+ //////////////////// Instance Fields ////////////////////
/** The string for this health */
private String healthString;
- ///////////////////// Constructors //////////////////////
+ ///////////////////// Constructors //////////////////////
/**
* Creates a new <code>Health</code> with the given string
@@ -199,12 +177,11 @@ public interface GemFireHealth {
protected Health(String healthString) {
this.healthString = healthString;
}
-
- //////////////////// Instance Methods ////////////////////
+
+ //////////////////// Instance Methods ////////////////////
/**
- * Returns the appropriate canonical instance of
- * <code>Health</code>.
+ * Returns the appropriate canonical instance of <code>Health</code>.
*/
public Object readResolve() {
if (this.healthString.equals(GOOD_STRING)) {
@@ -217,8 +194,7 @@ public interface GemFireHealth {
return GemFireHealth.POOR_HEALTH;
} else {
- Assert.assertTrue(false, "Unknown healthString: " +
- this.healthString);
+ Assert.assertTrue(false, "Unknown healthString: " + this.healthString);
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/GemFireHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealthConfig.java
index 638244a..b31861f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireHealthConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/GemFireHealthConfig.java
@@ -1,56 +1,53 @@
/*
- * 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
+ * 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.admin;
/**
- * Provides configuration information relating to all of the
- * components of a GemFire distributed system.
+ * Provides configuration information relating to all of the components of a GemFire distributed
+ * system.
*
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- * */
-public interface GemFireHealthConfig
- extends MemberHealthConfig, CacheHealthConfig {
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
+ */
+public interface GemFireHealthConfig extends MemberHealthConfig, CacheHealthConfig {
- /** The default number of seconds between assessments of the health
- * of the GemFire components. */
+ /**
+ * The default number of seconds between assessments of the health of the GemFire components.
+ */
public static final int DEFAULT_HEALTH_EVALUATION_INTERVAL = 30;
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Returns the name of the host to which this configuration
- * applies. If this is the "default" configuration, then
- * <code>null</code> is returned.
+ * Returns the name of the host to which this configuration applies. If this is the "default"
+ * configuration, then <code>null</code> is returned.
*
* @see GemFireHealth#getGemFireHealthConfig
*/
public String getHostName();
/**
- * Sets the number of seconds between assessments of the health of
- * the GemFire components.
+ * Sets the number of seconds between assessments of the health of the GemFire components.
*/
public void setHealthEvaluationInterval(int interval);
/**
- * Returns the number of seconds between assessments of the health of
- * the GemFire components.
+ * Returns the number of seconds between assessments of the health of the GemFire components.
*/
public int getHealthEvaluationInterval();
[62/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
GEODE-2014: Upgrade Swagger libraries
* this closes #265
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/892d6d33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/892d6d33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/892d6d33
Branch: refs/heads/feature/GEM-983
Commit: 892d6d33f34c917dde7142b8f49df0957f8b7ed0
Parents: 24a7204
Author: Kevin Duling <kd...@pivotal.io>
Authored: Tue Oct 18 15:54:55 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Oct 24 12:00:18 2016 -0700
----------------------------------------------------------------------
.../rest/internal/web/GeodeRestClient.java | 22 +-
.../web/RestSecurityIntegrationTest.java | 24 +-
.../internal/web/SwaggerVerificationTest.java | 82 +
.../geode/internal/i18n/LocalizedStrings.java | 8 +-
geode-web-api/build.gradle | 31 +-
.../web/controllers/AbstractBaseController.java | 64 +-
.../web/controllers/BaseControllerAdvice.java | 19 +-
.../web/controllers/CommonCrudController.java | 40 +-
.../controllers/FunctionAccessController.java | 37 +-
.../web/controllers/PdxBasedCrudController.java | 27 +-
.../web/controllers/QueryAccessController.java | 43 +-
.../web/swagger/config/RestApiPathProvider.java | 96 -
.../web/swagger/config/SwaggerConfig.java | 169 +-
.../src/main/resources/swagger.properties | 2 +
geode-web-api/src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/main/webapp/docs/css/reset.css | 125 -
.../src/main/webapp/docs/css/screen.css | 1221 --------
.../main/webapp/docs/images/explorer_icons.png | Bin 5763 -> 0 bytes
.../src/main/webapp/docs/images/logo_small.png | Bin 770 -> 0 bytes
.../main/webapp/docs/images/pet_store_api.png | Bin 824 -> 0 bytes
.../src/main/webapp/docs/images/throbber.gif | Bin 9257 -> 0 bytes
.../src/main/webapp/docs/images/wordnik_api.png | Bin 980 -> 0 bytes
geode-web-api/src/main/webapp/docs/index.html | 82 +-
.../src/main/webapp/docs/lib/backbone-min.js | 38 -
.../main/webapp/docs/lib/handlebars-1.0.0.js | 2278 ---------------
.../main/webapp/docs/lib/highlight.7.3.pack.js | 1 -
.../main/webapp/docs/lib/jquery-1.8.0.min.js | 2 -
.../main/webapp/docs/lib/jquery.ba-bbq.min.js | 18 -
.../main/webapp/docs/lib/jquery.slideto.min.js | 1 -
.../main/webapp/docs/lib/jquery.wiggle.min.js | 8 -
.../src/main/webapp/docs/lib/shred.bundle.js | 2765 ------------------
.../src/main/webapp/docs/lib/shred/content.js | 193 --
.../src/main/webapp/docs/lib/swagger-oauth.js | 211 --
.../src/main/webapp/docs/lib/swagger.js | 1527 ----------
.../src/main/webapp/docs/lib/underscore-min.js | 32 -
geode-web-api/src/main/webapp/docs/o2c.html | 15 -
.../src/main/webapp/docs/swagger-ui.js | 2269 --------------
.../src/main/webapp/docs/swagger-ui.min.js | 1 -
geode-web/src/main/webapp/WEB-INF/web.xml | 2 +-
gradle/dependency-versions.properties | 3 +-
40 files changed, 264 insertions(+), 11194 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
index 4f92bfe..2889c67 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
@@ -15,13 +15,6 @@
package org.apache.geode.rest.internal.web;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.nio.charset.StandardCharsets;
-
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.HttpResponse;
@@ -46,6 +39,13 @@ import org.apache.http.impl.client.HttpClients;
import org.json.JSONTokener;
import org.junit.Assert;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.nio.charset.StandardCharsets;
+
public class GeodeRestClient {
public final static String PROTOCOL = "http";
@@ -86,10 +86,12 @@ public class GeodeRestClient {
return doRequest(getRequest, username, password);
}
- public HttpResponse doGet(String uri) throws MalformedURLException {
- return doGet(uri, null, null);
+ public HttpResponse doGetRequest(String url) throws MalformedURLException {
+ HttpGet getRequest = new HttpGet(url);
+ return doRequest(getRequest, null, null);
}
+
public HttpResponse doDelete(String uri, String username, String password)
throws MalformedURLException {
HttpDelete httpDelete = new HttpDelete(CONTEXT + uri);
@@ -123,7 +125,7 @@ public class GeodeRestClient {
return new JSONTokener(str.toString());
}
- private HttpResponse doRequest(HttpRequestBase request, String username, String password)
+ public HttpResponse doRequest(HttpRequestBase request, String username, String password)
throws MalformedURLException {
HttpHost targetHost = new HttpHost(HOSTNAME, restPort, PROTOCOL);
CloseableHttpClient httpclient = HttpClients.custom().build();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index fc9ae95..5b3f7ce 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -14,11 +14,20 @@
*/
package org.apache.geode.rest.internal.web;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-import java.util.Properties;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.security.templates.SampleSecurityManager;
+import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
import org.apache.http.HttpResponse;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -28,12 +37,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.springframework.http.MediaType;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.security.templates.SampleSecurityManager;
-import org.apache.geode.test.dunit.rules.ServerStarter;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
+import java.util.Properties;
@Category({IntegrationTest.class, SecurityTest.class})
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
new file mode 100644
index 0000000..3412331
--- /dev/null
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
@@ -0,0 +1,82 @@
+/*
+ * 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.rest.internal.web;
+
+
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.http.HttpResponse;
+import org.json.JSONObject;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Properties;
+
+@Category(IntegrationTest.class)
+
+public class SwaggerVerificationTest {
+
+ private static int restPort = AvailablePortHelper.getRandomAvailableTCPPort();
+ static Properties properties = new Properties() {
+ {
+ setProperty(START_DEV_REST_API, "true");
+ setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
+ setProperty(HTTP_SERVICE_PORT, restPort + "");
+ }
+ };
+
+ @ClassRule
+ public static ServerStarter serverStarter = new ServerStarter(properties);
+ private final GeodeRestClient restClient = new GeodeRestClient(restPort);
+
+ @BeforeClass
+ public static void before() throws Exception {
+ serverStarter.startServer();
+ }
+
+ @Test
+ public void isSwaggerRunning() throws Exception {
+ // Check the UI
+ HttpResponse response = restClient.doGetRequest("/geode/swagger-ui.html");
+ assertThat(GeodeRestClient.getCode(response), is(200));
+
+ // Check the JSON
+ response = restClient.doGetRequest("/geode/v2/api-docs");
+ assertThat(GeodeRestClient.getCode(response), is(200));
+ JSONObject json = new JSONObject(GeodeRestClient.getResponseBody(response));
+ assertThat(json.get("swagger"), is("2.0"));
+
+ JSONObject info = json.getJSONObject("info");
+ assertThat(info.getString("description"),
+ is(LocalizedStrings.SwaggerConfig_DESCRIPTOR.toLocalizedString()));
+ assertThat(info.getString("title"),
+ is(LocalizedStrings.SwaggerConfig_VENDOR_PRODUCT_LINE.toLocalizedString()));
+
+ JSONObject license = info.getJSONObject("license");
+ assertThat(license.getString("name"), is("Apache License, version 2.0"));
+ assertThat(license.getString("url"), is("http://www.apache.org/licenses/"));
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index 0e4fac2..210539b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -7579,12 +7579,12 @@ public class LocalizedStrings {
"Developer REST API and interface to Geode''s distributed, in-memory data grid and cache.");
public static final StringId SwaggerConfig_EULA_LINK =
new StringId(6619, "http://www.apache.org/licenses/");
- public static final StringId SwaggerConfig_SUPPORT_LINK =
- new StringId(6620, "user@geode.incubator.apache.org");
+ public static final StringId SwaggerConfig_DEVELOPER_EMAIL =
+ new StringId(6620, "dev@geode.incubator.apache.org");
public static final StringId SwaggerConfig_DOC_TITLE =
new StringId(6621, "Apache Geode Documentation");
- public static final StringId SwaggerConfig_DOC_LINK =
- new StringId(6622, "http://geode.incubator.apache.org/docs/");
+ public static final StringId SwaggerConfig_PRODUCT_LINK =
+ new StringId(6622, "http://geode.apache.org");
public static final StringId LuceneXmlParser_CLASS_0_IS_NOT_AN_INSTANCE_OF_ANALYZER =
new StringId(6623, "Class {0} is not an instance of Analyzer.");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/build.gradle
----------------------------------------------------------------------
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index e823ed3..9b15516 100755
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -20,7 +20,7 @@ apply plugin: 'war'
dependencies {
compile 'commons-lang:commons-lang:' + project.'commons-lang.version'
- compile ('commons-fileupload:commons-fileupload:' + project.'commons-fileupload.version') {
+ compile('commons-fileupload:commons-fileupload:' + project.'commons-fileupload.version') {
exclude module: 'commons-io'
}
compile 'com.fasterxml:classmate:' + project.'classmate.version'
@@ -29,27 +29,12 @@ dependencies {
compile 'com.fasterxml.jackson.core:jackson-databind:' + project.'jackson.version'
compile 'com.fasterxml.jackson.module:jackson-module-scala_2.10:' + project.'jackson-module-scala_2.10.version'
compile 'com.google.guava:guava:' + project.'guava.version'
- compile ('com.mangofactory:swagger-springmvc:' + project.'swagger-springmvc.version') {
- exclude module: 'aopalliance'
- exclude module: 'asm'
- exclude module: 'cglib'
- exclude module: 'commons-logging'
- exclude module: 'jackson-jaxrs-json-provider'
- exclude module: 'jackson-jaxrs-json-provider'
- exclude module: 'jackson-module-jsonSchema'
- exclude module: 'joda-convert'
- exclude module: 'joda-time'
- exclude module: 'scalap'
+ compile('io.springfox:springfox-swagger2:' + project.'springfox.version') {
+ exclude module: 'slf4j-api'
+ }
+ compile('io.springfox:springfox-swagger-ui:' + project.'springfox.version') {
exclude module: 'slf4j-api'
- exclude module: 'spring-aop'
- exclude module: 'spring-beans'
- exclude module: 'spring-context'
- exclude module: 'spring-core'
- exclude module: 'spring-expression'
- exclude module: 'spring-webmvc'
- exclude module: 'spring-web'
}
- compile 'com.wordnik:swagger-annotations:' + project.'swagger.version'
compile 'org.json4s:json4s-ast_2.10:' + project.'json4s.version'
compile 'org.scala-lang:scala-library:' + project.'scala.version'
compile 'org.scala-lang:scala-reflect:' + project.'scala.version'
@@ -58,18 +43,18 @@ dependencies {
compile 'org.springframework.security:spring-security-web:' + project.'spring-security.version'
compile 'org.springframework.security:spring-security-config:' + project.'spring-security.version'
compile 'org.springframework:spring-webmvc:' + project.'springframework.version'
- compile ('org.springframework.hateoas:spring-hateoas:' + project.'spring-hateoas.version') {
+ compile('org.springframework.hateoas:spring-hateoas:' + project.'spring-hateoas.version') {
exclude module: 'aopalliance'
exclude module: 'commons-logging'
exclude module: 'objenesis'
exclude module: 'slf4j-api'
exclude module: 'spring-core'
}
- compile ('org.springframework:spring-aspects:' + project.'springframework.version') {
+ compile('org.springframework:spring-aspects:' + project.'springframework.version') {
exclude module: 'aopalliance'
exclude module: 'aspectjweaver'
}
- compile ('org.springframework:spring-oxm:' + project.'springframework.version') {
+ compile('org.springframework:spring-oxm:' + project.'springframework.version') {
exclude module: 'commons-logging'
exclude module: 'spring-core'
exclude module: 'spring-beans'
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
index 5cd090a..80297b5 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/AbstractBaseController.java
@@ -15,43 +15,10 @@
package org.apache.geode.rest.internal.web.controllers;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.annotation.PostConstruct;
-
import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.logging.log4j.Logger;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-
import org.apache.geode.SerializationException;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheLoaderException;
@@ -82,6 +49,37 @@ import org.apache.geode.rest.internal.web.util.IdentifiableUtils;
import org.apache.geode.rest.internal.web.util.JSONUtils;
import org.apache.geode.rest.internal.web.util.NumberUtils;
import org.apache.geode.rest.internal.web.util.ValidationUtils;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.json.JSONTokener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.net.URI;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.annotation.PostConstruct;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/BaseControllerAdvice.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/BaseControllerAdvice.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/BaseControllerAdvice.java
index 09e6d53..8939542 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/BaseControllerAdvice.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/BaseControllerAdvice.java
@@ -15,9 +15,13 @@
package org.apache.geode.rest.internal.web.controllers;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.rest.internal.web.exception.DataTypeNotSupportedException;
+import org.apache.geode.rest.internal.web.exception.GemfireRestException;
+import org.apache.geode.rest.internal.web.exception.MalformedJsonException;
+import org.apache.geode.rest.internal.web.exception.RegionNotFoundException;
+import org.apache.geode.rest.internal.web.exception.ResourceNotFoundException;
+import org.apache.geode.security.NotAuthorizedException;
import org.apache.logging.log4j.Logger;
import org.springframework.http.HttpStatus;
import org.springframework.security.access.AccessDeniedException;
@@ -27,13 +31,8 @@ import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.rest.internal.web.exception.DataTypeNotSupportedException;
-import org.apache.geode.rest.internal.web.exception.GemfireRestException;
-import org.apache.geode.rest.internal.web.exception.MalformedJsonException;
-import org.apache.geode.rest.internal.web.exception.RegionNotFoundException;
-import org.apache.geode.rest.internal.web.exception.ResourceNotFoundException;
-import org.apache.geode.security.NotAuthorizedException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
index 980ee73..62ce860 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
@@ -14,24 +14,9 @@
*/
package org.apache.geode.rest.internal.web.controllers;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiResponse;
-import com.wordnik.swagger.annotations.ApiResponses;
-import org.apache.logging.log4j.Logger;
-import org.json.JSONException;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
import org.apache.geode.cache.LowMemoryException;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.execute.Execution;
@@ -44,6 +29,20 @@ import org.apache.geode.rest.internal.web.controllers.support.RestServersResultC
import org.apache.geode.rest.internal.web.exception.GemfireRestException;
import org.apache.geode.rest.internal.web.util.ArrayUtils;
import org.apache.geode.rest.internal.web.util.JSONUtils;
+import org.apache.logging.log4j.Logger;
+import org.json.JSONException;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
/**
* The CommonCrudController serves REST Requests related to listing regions, listing keys in region,
@@ -63,15 +62,14 @@ public abstract class CommonCrudController extends AbstractBaseController {
*/
@RequestMapping(method = RequestMethod.GET, produces = {MediaType.APPLICATION_JSON_UTF8_VALUE})
@ApiOperation(value = "list all resources (Regions)",
- notes = "List all available resources (Regions) in the GemFire cluster",
- response = void.class)
+ notes = "List all available resources (Regions) in the Geode cluster", response = void.class)
@ApiResponses({@ApiResponse(code = 200, message = "OK."),
@ApiResponse(code = 401, message = "Invalid Username or Password."),
@ApiResponse(code = 403, message = "Insufficient privileges for operation."),
@ApiResponse(code = 500, message = "GemFire throws an error or exception.")})
@PreAuthorize("@securityService.authorize('DATA', 'READ')")
public ResponseEntity<?> regions() {
- logger.debug("Listing all resources (Regions) in GemFire...");
+ logger.debug("Listing all resources (Regions) in Geode...");
final HttpHeaders headers = new HttpHeaders();
headers.setLocation(toUri());
final Set<Region<?, ?>> regions = getCache().rootRegions();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java
index 4fb8411..ec05ec7 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/FunctionAccessController.java
@@ -15,15 +15,20 @@
package org.apache.geode.rest.internal.web.controllers;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiResponse;
-import com.wordnik.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.apache.geode.cache.LowMemoryException;
+import org.apache.geode.cache.execute.Execution;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionException;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.cache.execute.ResultCollector;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.rest.internal.web.exception.GemfireRestException;
+import org.apache.geode.rest.internal.web.util.ArrayUtils;
+import org.apache.geode.rest.internal.web.util.JSONUtils;
import org.apache.logging.log4j.Logger;
import org.json.JSONException;
import org.springframework.http.HttpHeaders;
@@ -41,16 +46,10 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
-import org.apache.geode.cache.LowMemoryException;
-import org.apache.geode.cache.execute.Execution;
-import org.apache.geode.cache.execute.Function;
-import org.apache.geode.cache.execute.FunctionException;
-import org.apache.geode.cache.execute.FunctionService;
-import org.apache.geode.cache.execute.ResultCollector;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.rest.internal.web.exception.GemfireRestException;
-import org.apache.geode.rest.internal.web.util.ArrayUtils;
-import org.apache.geode.rest.internal.web.util.JSONUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* The FunctionsController class serving REST Requests related to the function execution
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java
index 49ab5f9..2b44e54 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/PdxBasedCrudController.java
@@ -14,14 +14,16 @@
*/
package org.apache.geode.rest.internal.web.controllers;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiResponse;
-import com.wordnik.swagger.annotations.ApiResponses;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.rest.internal.web.controllers.support.JSONTypes;
+import org.apache.geode.rest.internal.web.controllers.support.RegionData;
+import org.apache.geode.rest.internal.web.controllers.support.RegionEntryData;
+import org.apache.geode.rest.internal.web.exception.ResourceNotFoundException;
+import org.apache.geode.rest.internal.web.util.ArrayUtils;
import org.apache.logging.log4j.Logger;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -36,12 +38,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
-import org.apache.geode.internal.logging.LogService;
-import org.apache.geode.rest.internal.web.controllers.support.JSONTypes;
-import org.apache.geode.rest.internal.web.controllers.support.RegionData;
-import org.apache.geode.rest.internal.web.controllers.support.RegionEntryData;
-import org.apache.geode.rest.internal.web.exception.ResourceNotFoundException;
-import org.apache.geode.rest.internal.web.util.ArrayUtils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* The PdxBasedCrudController class serving REST Requests related to the REST CRUD operation on
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
index 6942e90..4a7dfde 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
@@ -15,27 +15,10 @@
package org.apache.geode.rest.internal.web.controllers;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.wordnik.swagger.annotations.Api;
-import com.wordnik.swagger.annotations.ApiOperation;
-import com.wordnik.swagger.annotations.ApiResponse;
-import com.wordnik.swagger.annotations.ApiResponses;
-import org.apache.logging.log4j.Logger;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.FunctionDomainException;
import org.apache.geode.cache.query.NameResolutionException;
@@ -51,6 +34,22 @@ import org.apache.geode.rest.internal.web.exception.GemfireRestException;
import org.apache.geode.rest.internal.web.exception.ResourceNotFoundException;
import org.apache.geode.rest.internal.web.util.JSONUtils;
import org.apache.geode.rest.internal.web.util.ValidationUtils;
+import org.apache.logging.log4j.Logger;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import java.util.concurrent.ConcurrentHashMap;
/**
@@ -62,7 +61,7 @@ import org.apache.geode.rest.internal.web.util.ValidationUtils;
*/
@Controller("queryController")
-@Api(value = "queries", description = "Rest api for gemfire query execution",
+@Api(value = "queries", description = "Rest api for geode query execution",
produces = MediaType.APPLICATION_JSON_VALUE)
@RequestMapping(QueryAccessController.REST_API_VERSION + "/queries")
@SuppressWarnings("unused")
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/RestApiPathProvider.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/RestApiPathProvider.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/RestApiPathProvider.java
deleted file mode 100644
index 307b63e..0000000
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/RestApiPathProvider.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.rest.internal.web.swagger.config;
-
-import org.apache.geode.distributed.internal.DistributionConfig;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.net.SocketCreator;
-import org.apache.geode.internal.lang.StringUtils;
-import com.mangofactory.swagger.core.SwaggerPathProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.Assert;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import javax.servlet.ServletContext;
-import java.net.UnknownHostException;
-
-@SuppressWarnings("unused")
-public class RestApiPathProvider implements SwaggerPathProvider {
-
- @Autowired
- private ServletContext servletContext;
-
- private final String docsLocation;
-
- private SwaggerPathProvider defaultPathProvider;
-
- public RestApiPathProvider(final String docsLocation) {
- Assert.isTrue(!StringUtils.isBlank(docsLocation), "The docs location must be specified!");
-
- DistributionConfig config = InternalDistributedSystem.getAnyInstance().getConfig();
- String scheme = config.getHttpServiceSSLEnabled() ? "https" : "http";
-
- this.docsLocation =
- scheme + "://" + getBindAddressForHttpService() + ":" + config.getHttpServicePort();
- }
-
- private String getBindAddressForHttpService() {
- DistributionConfig config = InternalDistributedSystem.getAnyInstance().getConfig();
- java.lang.String bindAddress = config.getHttpServiceBindAddress();
- if (org.apache.commons.lang.StringUtils.isBlank(bindAddress)) {
- if (org.apache.commons.lang.StringUtils.isBlank(config.getServerBindAddress())) {
- if (org.apache.commons.lang.StringUtils.isBlank(config.getBindAddress())) {
- try {
- bindAddress = SocketCreator.getLocalHost().getHostAddress();
- } catch (UnknownHostException e) {
- e.printStackTrace();
- }
- } else {
- bindAddress = config.getBindAddress();
- }
- } else {
- bindAddress = config.getServerBindAddress();
- }
- }
- return bindAddress;
- }
-
- @Override
- public String getApiResourcePrefix() {
- return defaultPathProvider.getApiResourcePrefix();
- }
-
- @Override
- public String getAppBasePath() {
- return UriComponentsBuilder.fromHttpUrl(docsLocation).path(servletContext.getContextPath())
- .build().toString();
- }
-
- @Override
- public String getSwaggerDocumentationBasePath() {
- return UriComponentsBuilder.fromHttpUrl(getAppBasePath()).pathSegment("api-docs/").build()
- .toString();
- }
-
- @Override
- public String getRequestMappingEndpoint(String requestMappingPattern) {
- return defaultPathProvider.getRequestMappingEndpoint(requestMappingPattern);
- }
-
- public void setDefaultPathProvider(final SwaggerPathProvider defaultSwaggerPathProvider) {
- this.defaultPathProvider = defaultSwaggerPathProvider;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/SwaggerConfig.java
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/SwaggerConfig.java b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/SwaggerConfig.java
index 9eb9c25..c938139 100644
--- a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/SwaggerConfig.java
+++ b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/swagger/config/SwaggerConfig.java
@@ -14,159 +14,44 @@
*/
package org.apache.geode.rest.internal.web.swagger.config;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
import org.apache.geode.internal.i18n.LocalizedStrings;
-import com.mangofactory.swagger.configuration.JacksonScalaSupport;
-import com.mangofactory.swagger.configuration.SpringSwaggerConfig;
-import com.mangofactory.swagger.configuration.SpringSwaggerModelConfig;
-import com.mangofactory.swagger.configuration.SwaggerGlobalSettings;
-import com.mangofactory.swagger.core.SwaggerApiResourceListing;
-import com.mangofactory.swagger.scanners.ApiListingReferenceScanner;
-import com.wordnik.swagger.model.ApiInfo;
-import com.wordnik.swagger.model.AuthorizationType;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
-
+import org.springframework.context.annotation.PropertySource;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@PropertySource({"classpath:swagger.properties"})
@Configuration
-@ComponentScan(basePackages = "com.mangofactory.swagger")
+@EnableSwagger2
@SuppressWarnings("unused")
public class SwaggerConfig {
- protected static final List<String> DEFAULT_INCLUDE_PATTERNS = Arrays.asList("/.*");
-
- protected static final String SWAGGER_GROUP = "gemfireApi";
-
- @Autowired
- private SpringSwaggerConfig springSwaggerConfig;
-
- @Autowired
- private SpringSwaggerModelConfig springSwaggerModelConfig;
-
- @Value("${app.docs}")
- private String docsLocation;
-
- /**
- * API Info as it appears on the Swagger-UI page
- */
- private ApiInfo apiInfo() {
- return new ApiInfo(LocalizedStrings.SwaggerConfig_VENDOR_PRODUCT_LINE.toLocalizedString(),
- LocalizedStrings.SwaggerConfig_DESCRIPTOR.toLocalizedString(),
- LocalizedStrings.SwaggerConfig_EULA_LINK.toLocalizedString(),
- LocalizedStrings.SwaggerConfig_SUPPORT_LINK.toLocalizedString(),
- LocalizedStrings.SwaggerConfig_DOC_TITLE.toLocalizedString(),
- LocalizedStrings.SwaggerConfig_DOC_LINK.toLocalizedString());
- }
-
- /**
- * Adds the Jackson Scala module to the MappingJackson2HttpMessageConverter registered with
- * Spring. Swagger core models are Scala so we need to be able to convert to JSON. Also registers
- * some custom serializers needed to transform Swagger models to Swagger-UI required JSON format.
- */
- @Bean
- public JacksonScalaSupport jacksonScalaSupport() {
- JacksonScalaSupport jacksonScalaSupport = new JacksonScalaSupport();
- // set to false to disable
- jacksonScalaSupport.setRegisterScalaModule(true);
- return jacksonScalaSupport;
- }
-
- /**
- * Configure a SwaggerApiResourceListing for each Swagger instance within your app. e.g. 1.
- * private 2. external APIs 3. ..., required to be a Spring bean as Spring will call the
- * postConstruct method to bootstrap Swagger scanning.
- */
- @Bean
- public SwaggerApiResourceListing swaggerApiResourceListing() {
- // The group name is important and should match the group set on
- // ApiListingReferenceScanner
- // Note that swaggerCache() is by DefaultSwaggerController to serve the
- // Swagger JSON
- SwaggerApiResourceListing swaggerApiResourceListing =
- new SwaggerApiResourceListing(springSwaggerConfig.swaggerCache(), SWAGGER_GROUP);
-
- // set required Swagger settings
- swaggerApiResourceListing.setSwaggerGlobalSettings(swaggerGlobalSettings());
-
- // use a custom path provider or
- // springSwaggerConfig.defaultSwaggerPathProvider()
- swaggerApiResourceListing.setSwaggerPathProvider(apiPathProvider());
-
- // supply the API Info as it should appear on Swagger-UI web page
- swaggerApiResourceListing.setApiInfo(apiInfo());
-
- // every SwaggerApiResourceListing needs an ApiListingReferenceScanner to
- // scan the Spring RequestMappings
- swaggerApiResourceListing.setApiListingReferenceScanner(apiListingReferenceScanner());
-
- // global authorization - see the Swagger documentation
- swaggerApiResourceListing.setAuthorizationTypes(Collections.<AuthorizationType>emptyList());
-
- return swaggerApiResourceListing;
- }
-
- /**
- * Global Swagger configuration settings
- */
- @Bean
- public SwaggerGlobalSettings swaggerGlobalSettings() {
- SwaggerGlobalSettings swaggerGlobalSettings = new SwaggerGlobalSettings();
- swaggerGlobalSettings.setGlobalResponseMessages(springSwaggerConfig.defaultResponseMessages());
- swaggerGlobalSettings
- .setIgnorableParameterTypes(springSwaggerConfig.defaultIgnorableParameterTypes());
- swaggerGlobalSettings
- .setParameterDataTypes(springSwaggerModelConfig.defaultParameterDataTypes());
- return swaggerGlobalSettings;
- }
-
- /**
- * The ApiListingReferenceScanner does most of the work. It scans the appropriate Spring
- * RequestMappingHandlerMappings, applies the correct absolute paths to the generated Swagger
- * resources, and so on.
- */
@Bean
- public ApiListingReferenceScanner apiListingReferenceScanner() {
- ApiListingReferenceScanner apiListingReferenceScanner = new ApiListingReferenceScanner();
-
- // Picks up all of the registered Spring RequestMappingHandlerMappings
- // during scanning...
- apiListingReferenceScanner.setRequestMappingHandlerMapping(
- springSwaggerConfig.swaggerRequestMappingHandlerMappings());
-
- // Excludes any Controllers with the supplied Annotations...
- apiListingReferenceScanner
- .setExcludeAnnotations(springSwaggerConfig.defaultExcludeAnnotations());
-
- // Only include paths that match the supplied Regular Expressions...
- apiListingReferenceScanner.setIncludePatterns(DEFAULT_INCLUDE_PATTERNS);
-
- //
- apiListingReferenceScanner
- .setResourceGroupingStrategy(springSwaggerConfig.defaultResourceGroupingStrategy());
-
- // PathProvider used to generate the appropriate uri's
- apiListingReferenceScanner.setSwaggerPathProvider(apiPathProvider());
-
- // Must match the Swagger group set on the SwaggerApiResourceListing...
- apiListingReferenceScanner.setSwaggerGroup(SWAGGER_GROUP);
-
- return apiListingReferenceScanner;
+ public Docket api() {
+ return new Docket(DocumentationType.SWAGGER_2).select().apis(RequestHandlerSelectors.any())
+ .paths(PathSelectors.any()).build().apiInfo(apiInfo());
}
/**
- * Example of a custom path provider
+ * API Info as it appears on the Swagger-UI page
*/
- @Bean
- public RestApiPathProvider apiPathProvider() {
- RestApiPathProvider apiPathProvider = new RestApiPathProvider(docsLocation);
- apiPathProvider.setDefaultPathProvider(springSwaggerConfig.defaultSwaggerPathProvider());
- return apiPathProvider;
+ private ApiInfo apiInfo() {
+ return new ApiInfoBuilder()
+ .title(LocalizedStrings.SwaggerConfig_VENDOR_PRODUCT_LINE.toLocalizedString())
+ .description(LocalizedStrings.SwaggerConfig_DESCRIPTOR.toLocalizedString()).version("1.0")
+ .termsOfServiceUrl(LocalizedStrings.SwaggerConfig_EULA_LINK.toLocalizedString())
+ .license("Apache License, version 2.0")
+ .licenseUrl(LocalizedStrings.SwaggerConfig_EULA_LINK.toLocalizedString())
+ .contact(new Contact("the Apache Geode Community",
+ LocalizedStrings.SwaggerConfig_PRODUCT_LINK.toLocalizedString(),
+ LocalizedStrings.SwaggerConfig_DEVELOPER_EMAIL.toLocalizedString()))
+ .build();
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/resources/swagger.properties
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/resources/swagger.properties b/geode-web-api/src/main/resources/swagger.properties
new file mode 100644
index 0000000..5042b2c
--- /dev/null
+++ b/geode-web-api/src/main/resources/swagger.properties
@@ -0,0 +1,2 @@
+springfox.documentation.swagger.v2.path=/v2/api-docs
+springfox.documentation.swagger.v1.path=/v1/api-docs
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/WEB-INF/web.xml b/geode-web-api/src/main/webapp/WEB-INF/web.xml
index f1f93c7..c241178 100644
--- a/geode-web-api/src/main/webapp/WEB-INF/web.xml
+++ b/geode-web-api/src/main/webapp/WEB-INF/web.xml
@@ -23,7 +23,7 @@ limitations under the License.
<display-name>GemFire Developer REST API</display-name>
<description>
- Web deployment descriptor declaring the developer REST API for GemFire.
+ Web deployment descriptor declaring the developer REST API for Geode.
</description>
<filter>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/css/reset.css
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/css/reset.css b/geode-web-api/src/main/webapp/docs/css/reset.css
deleted file mode 100644
index 84ef0e6..0000000
--- a/geode-web-api/src/main/webapp/docs/css/reset.css
+++ /dev/null
@@ -1,125 +0,0 @@
-/* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 */
-html,
-body,
-div,
-span,
-applet,
-object,
-iframe,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-big,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-ins,
-kbd,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-b,
-u,
-i,
-center,
-dl,
-dt,
-dd,
-ol,
-ul,
-li,
-fieldset,
-form,
-label,
-legend,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td,
-article,
-aside,
-canvas,
-details,
-embed,
-figure,
-figcaption,
-footer,
-header,
-hgroup,
-menu,
-nav,
-output,
-ruby,
-section,
-summary,
-time,
-mark,
-audio,
-video {
- margin: 0;
- padding: 0;
- border: 0;
- font-size: 100%;
- font: inherit;
- vertical-align: baseline;
-}
-/* HTML5 display-role reset for older browsers */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-menu,
-nav,
-section {
- display: block;
-}
-body {
- line-height: 1;
-}
-ol,
-ul {
- list-style: none;
-}
-blockquote,
-q {
- quotes: none;
-}
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
- content: '';
- content: none;
-}
-table {
- border-collapse: collapse;
- border-spacing: 0;
-}
[87/98] [abbrv] incubator-geode git commit: GEODE-2040 Add to docs
Tomcat 8.0 and 8.5 for HTTP Session Mgmt module
Posted by ds...@apache.org.
GEODE-2040 Add to docs Tomcat 8.0 and 8.5 for HTTP
Session Mgmt module
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a564a692
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a564a692
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a564a692
Branch: refs/heads/feature/GEM-983
Commit: a564a692afeecb56fc33008ba51fa8832395ad2e
Parents: 477806a
Author: Karen Miller <km...@pivotal.io>
Authored: Wed Oct 26 16:31:09 2016 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Wed Oct 26 16:31:09 2016 -0700
----------------------------------------------------------------------
.../http_session_mgmt/quick_start.html.md.erb | 4 ++--
.../tomcat_setting_up_the_module.html.md.erb | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a564a692/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
index d065e32..434a13c 100644
--- a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
@@ -30,7 +30,7 @@ In this section you download, install, and set up the HTTP Session Management mo
| tc Server | 2.9 (Deprecated) | [https://my.vmware.com/web/vmware/info/slug/application_platform/vmware_vfabric_tc_server/2_9](https://my.vmware.com/web/vmware/info/slug/application_platform/vmware_vfabric_tc_server/2_9) |
| tc Server | 3.0 and 3.1 | [https://network.pivotal.io/products/pivotal-tcserver](https://network.pivotal.io/products/pivotal-tcserver) |
| Tomcat | 7.0 | [http://tomcat.apache.org/download-70.cgi](http://tomcat.apache.org/download-70.cgi) |
- | Tomcat | 8.0 | [http://tomcat.apache.org/download-80.cgi](http://tomcat.apache.org/download-80.cgi) |
+ | Tomcat | 8.0, 8.5 | [http://tomcat.apache.org/download-80.cgi](http://tomcat.apache.org/download-80.cgi) |
| WebLogic | 11g (10.3.x) | [http://www.oracle.com/technetwork/middleware/weblogic/overview/index.html](http://www.oracle.com/technetwork/middleware/weblogic/overview/index.html) |
| WebSphere | 7, 8 | [http://www.ibm.com/developerworks/downloads/ws/was/](http://www.ibm.com/developerworks/downloads/ws/was/) |
| JBoss | 5, 6, 7 | [http://www.jboss.org/jbossas/downloads/](http://www.jboss.org/jbossas/downloads/) |
@@ -43,7 +43,7 @@ In this section you download, install, and set up the HTTP Session Management mo
|------------------------------|-----------------------------|----------------------------------------------------------|----------------------------------------------------------------------------------|
| tc Server | 2.9 (Deprecated) | HTTP Session Management Module for Pivotal tc Server | `<tc Server root dir>/templates` |
| tc Server | 3.0 and 3.1 | HTTP Session Management Module for Pivotal tc Server | `<tc Server root dir>/templates` |
- | Tomcat | 7.0 and 8.0 | HTTP Session Management Module for Tomcat | `$CATALINA_HOME` |
+ | Tomcat | 7.0, 8.0 and 8.5 | HTTP Session Management Module for Tomcat | `$CATALINA_HOME` |
| WebLogic | 11g (10.3.x) | HTTP Session Management Module for AppServers | *any directory* |
| WebSphere | 7, 8 | HTTP Session Management Module for AppServers | *any directory* |
| JBoss | 5, 6, 7 | HTTP Session Management Module for AppServers | *any directory* |
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a564a692/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb b/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
index a472ab3..dc805b6 100644
--- a/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/tomcat_setting_up_the_module.html.md.erb
@@ -43,12 +43,18 @@ For Tomcat 6.0:
Tomcat6DeltaSessionManager"/>
```
-For Tomcat 7.0 and above:
+For Tomcat 7.0:
``` pre
<Manager className="org.apache.geode.modules.session.catalina.
Tomcat7DeltaSessionManager"/>
```
+For Tomcat 8.0 and 8.5:
+
+``` pre
+<Manager className="org.apache.geode.modules.session.catalina.
+ Tomcat8DeltaSessionManager"/>
+```
## <a id="tomcat_setting_up_the_module__section_B0CEBE93564540DBA165E0F7A10FDC0B" class="no-quick-link"></a>Client/Server Setup
@@ -70,13 +76,20 @@ For Tomcat 6.0:
Tomcat6DeltaSessionManager"/>
```
-For Tomcat 7.0 and above:
+For Tomcat 7.0:
``` pre
<Manager className="org.apache.geode.modules.session.catalina.
Tomcat7DeltaSessionManager"/>
```
+For Tomcat 8.0 and 8.5:
+
+``` pre
+<Manager className="org.apache.geode.modules.session.catalina.
+ Tomcat8DeltaSessionManager"/>
+```
+
The application server operates as a Geode client in this configuration. With a similar environment to this example that is for a client/server set up,
``` pre
[80/98] [abbrv] incubator-geode git commit: Removing old text about
1.0 GA release
Posted by ds...@apache.org.
Removing old text about 1.0 GA release
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1d9a4ed6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1d9a4ed6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1d9a4ed6
Branch: refs/heads/feature/GEM-983
Commit: 1d9a4ed62faa6c7e8ca23491b1a8a20c701e508c
Parents: be2a404
Author: Swapnil Bawaskar <sb...@pivotal.io>
Authored: Tue Oct 25 15:17:25 2016 -0700
Committer: Swapnil Bawaskar <sb...@pivotal.io>
Committed: Tue Oct 25 15:18:00 2016 -0700
----------------------------------------------------------------------
geode-site/website/content/releases/index.html | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1d9a4ed6/geode-site/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/releases/index.html b/geode-site/website/content/releases/index.html
index 51e3096..63f685e 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -238,12 +238,6 @@ under the License. -->
</div>
<!-- END OF RELEASE -->
<hr/>
- <div class="container done">
- <h3><span class="icon-flag-checkered"> General Availability (GA) Releases - Geode 1.0.0</span></h3>
- Coming soon.
- <br/>
- </div>
- <hr/>
<p>
Project releases are approved by vote of the Apache Geode Podling Project Management Committee (PPMC) and Apache Incubator (PMC). Support for a release is provided by project volunteers on the project <a href="http://geode.incubator.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/GEODE">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Geode project.
</p>
[69/98] [abbrv] incubator-geode git commit: GEODE-2015: Edit links to
docs info
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/master_middleman/source/subnavs/geode-subnav.erb
----------------------------------------------------------------------
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index 2373f4b..30ff2f9 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -21,377 +21,377 @@ limitations under the License.
<div class="nav-content">
<ul>
<li>
- <a href="/docs/about_geode.html">Apache Geode 1.0.0-incubating Documentation</a>
+ <a href="/docs/guide/about_geode.html">Apache Geode 1.0.0-incubating Documentation</a>
</li>
<li class="has_submenu">
- <a href="/docs/getting_started/book_intro.html">Getting Started with Apache Geode</a>
+ <a href="/docs/guide/getting_started/book_intro.html">Getting Started with Apache Geode</a>
<ul>
<li>
- <a href="/docs/getting_started/geode_overview.html">About Apache Geode</a>
+ <a href="/docs/guide/getting_started/geode_overview.html">About Apache Geode</a>
</li>
<li>
- <a href="/docs/getting_started/product_intro.html">Main Features of Apache Geode</a>
+ <a href="/docs/guide/getting_started/product_intro.html">Main Features of Apache Geode</a>
</li>
<li class="has_submenu">
- <a href="/docs/prereq_and_install.html">Prerequisites and Installation Instructions</a>
+ <a href="/docs/guide/prereq_and_install.html">Prerequisites and Installation Instructions</a>
<ul>
<li>
- <a href="/docs/getting_started/system_requirements/host_machine.html">Host Machine Requirements</a>
+ <a href="/docs/guide/getting_started/system_requirements/host_machine.html">Host Machine Requirements</a>
</li>
<li>
- <a href="/docs/getting_started/installation/install_standalone.html">How to Install</a>
+ <a href="/docs/guide/getting_started/installation/install_standalone.html">How to Install</a>
</li>
<li>
- <a href="/docs/getting_started/setup_classpath.html">Setting Up the CLASSPATH</a>
+ <a href="/docs/guide/getting_started/setup_classpath.html">Setting Up the CLASSPATH</a>
</li>
<li>
- <a href="/docs/getting_started/uninstall_gemfire.html">How to Uninstall</a>
+ <a href="/docs/guide/getting_started/uninstall_gemfire.html">How to Uninstall</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/getting_started/15_minute_quickstart_gfsh.html">Apache Geode in 15 Minutes or Less</a>
+ <a href="/docs/guide/getting_started/15_minute_quickstart_gfsh.html">Apache Geode in 15 Minutes or Less</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/configuring/chapter_overview.html">Configuring and Running a Cluster</a>
+ <a href="/docs/guide/configuring/chapter_overview.html">Configuring and Running a Cluster</a>
<ul>
<li>
- <a href="/docs/configuring/cluster_config/gfsh_persist.html">Overview of the Cluster Configuration Service</a>
+ <a href="/docs/guide/configuring/cluster_config/gfsh_persist.html">Overview of the Cluster Configuration Service</a>
</li>
<li>
- <a href="/docs/configuring/cluster_config/persisting_configurations.html">Tutorial\u2014Creating and Using a Cluster Configuration</a>
+ <a href="/docs/guide/configuring/cluster_config/persisting_configurations.html">Tutorial\u2014Creating and Using a Cluster Configuration</a>
</li>
<li>
- <a href="/docs/configuring/cluster_config/deploying_application_jars.html">Deploying Application JARs to Apache Geode Members</a>
+ <a href="/docs/guide/configuring/cluster_config/deploying_application_jars.html">Deploying Application JARs to Apache Geode Members</a>
</li>
<li>
- <a href="/docs/configuring/cluster_config/using_member_groups.html">Using Member Groups</a>
+ <a href="/docs/guide/configuring/cluster_config/using_member_groups.html">Using Member Groups</a>
</li>
<li>
- <a href="/docs/configuring/cluster_config/export-import.html">Exporting and Importing Cluster Configurations</a>
+ <a href="/docs/guide/configuring/cluster_config/export-import.html">Exporting and Importing Cluster Configurations</a>
</li>
<li>
- <a href="/docs/configuring/cluster_config/gfsh_config_troubleshooting.html">Cluster Configuration Files and Troubleshooting</a>
+ <a href="/docs/guide/configuring/cluster_config/gfsh_config_troubleshooting.html">Cluster Configuration Files and Troubleshooting</a>
</li>
<li>
- <a href="/docs/configuring/cluster_config/gfsh_load_from_shared_dir.html">Loading Existing Configuration Files into Cluster Configuration</a>
+ <a href="/docs/guide/configuring/cluster_config/gfsh_load_from_shared_dir.html">Loading Existing Configuration Files into Cluster Configuration</a>
</li>
<li>
- <a href="/docs/configuring/cluster_config/gfsh_remote.html">Using gfsh to Manage a Remote Cluster Over HTTP or HTTPS</a>
+ <a href="/docs/guide/configuring/cluster_config/gfsh_remote.html">Using gfsh to Manage a Remote Cluster Over HTTP or HTTPS</a>
</li>
<li class="has_submenu">
- <a href="/docs/configuring/running/deploying_config_files.html">Deploying Configuration Files without the Cluster Configuration Service</a>
+ <a href="/docs/guide/configuring/running/deploying_config_files.html">Deploying Configuration Files without the Cluster Configuration Service</a>
<ul>
<li>
- <a href="/docs/configuring/running/deploy_config_files_intro.html">Main Steps to Deploying Configuration Files</a>
+ <a href="/docs/guide/configuring/running/deploy_config_files_intro.html">Main Steps to Deploying Configuration Files</a>
</li>
<li>
- <a href="/docs/configuring/running/default_file_specs.html">Default File Specifications and Search Locations</a>
+ <a href="/docs/guide/configuring/running/default_file_specs.html">Default File Specifications and Search Locations</a>
</li>
<li>
- <a href="/docs/configuring/running/change_file_spec.html">Changing the File Specifications</a>
+ <a href="/docs/guide/configuring/running/change_file_spec.html">Changing the File Specifications</a>
</li>
<li>
- <a href="/docs/configuring/running/deploying_config_jar_files.html">Deploying Configuration Files in JAR Files</a>
+ <a href="/docs/guide/configuring/running/deploying_config_jar_files.html">Deploying Configuration Files in JAR Files</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/configuring/running/starting_up_shutting_down.html">Starting Up and Shutting Down Your System</a>
+ <a href="/docs/guide/configuring/running/starting_up_shutting_down.html">Starting Up and Shutting Down Your System</a>
</li>
<li>
- <a href="/docs/configuring/running/running_the_locator.html">Running Geode Locator Processes</a>
+ <a href="/docs/guide/configuring/running/running_the_locator.html">Running Geode Locator Processes</a>
</li>
<li>
- <a href="/docs/configuring/running/running_the_cacheserver.html">Running Geode Server Processes</a>
+ <a href="/docs/guide/configuring/running/running_the_cacheserver.html">Running Geode Server Processes</a>
</li>
<li>
- <a href="/docs/configuring/running/managing_output_files.html">Managing System Output Files</a>
+ <a href="/docs/guide/configuring/running/managing_output_files.html">Managing System Output Files</a>
</li>
<li class="has_submenu">
- <a href="/docs/configuring/running/firewall_ports_config.html">Firewall Considerations</a>
+ <a href="/docs/guide/configuring/running/firewall_ports_config.html">Firewall Considerations</a>
<ul>
<li>
- <a href="/docs/configuring/running/firewalls_connections.html">Firewalls and Connections</a>
+ <a href="/docs/guide/configuring/running/firewalls_connections.html">Firewalls and Connections</a>
</li>
<li>
- <a href="/docs/configuring/running/firewalls_ports.html">Firewalls and Ports</a>
+ <a href="/docs/guide/configuring/running/firewalls_ports.html">Firewalls and Ports</a>
</li>
</ul>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/basic_config/book_intro.html">Basic Configuration and Programming</a>
+ <a href="/docs/guide/basic_config/book_intro.html">Basic Configuration and Programming</a>
<ul>
<li class="has_submenu">
- <a href="/docs/basic_config/config_concepts/chapter_overview.html">
+ <a href="/docs/guide/basic_config/config_concepts/chapter_overview.html">
Distributed System and Cache Configuration</a>
<ul>
<li>
- <a href="/docs/basic_config/config_concepts/distributed_system_member_configuration.html">Distributed System Members</a>
+ <a href="/docs/guide/basic_config/config_concepts/distributed_system_member_configuration.html">Distributed System Members</a>
</li>
<li>
- <a href="/docs/basic_config/gemfire_properties/setting_distributed_properties.html">Setting Properties</a>
+ <a href="/docs/guide/basic_config/gemfire_properties/setting_distributed_properties.html">Setting Properties</a>
</li>
<li>
- <a href="/docs/basic_config/the_cache/setting_cache_properties.html">Options for Configuring the Cache and Data Regions
+ <a href="/docs/guide/basic_config/the_cache/setting_cache_properties.html">Options for Configuring the Cache and Data Regions
</a>
</li>
<li>
- <a href="/docs/basic_config/config_concepts/local_vs_remote.html">Local and Remote Membership and Caching</a>
+ <a href="/docs/guide/basic_config/config_concepts/local_vs_remote.html">Local and Remote Membership and Caching</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/basic_config/the_cache/chapter_overview.html">Cache Management</a>
+ <a href="/docs/guide/basic_config/the_cache/chapter_overview.html">Cache Management</a>
<ul>
<li>
- <a href="/docs/basic_config/the_cache/intro_cache_management.html">Introduction to Cache Management</a>
+ <a href="/docs/guide/basic_config/the_cache/intro_cache_management.html">Introduction to Cache Management</a>
</li>
<li>
- <a href="/docs/basic_config/the_cache/managing_a_peer_server_cache.html">Managing a Peer or Server Cache</a>
+ <a href="/docs/guide/basic_config/the_cache/managing_a_peer_server_cache.html">Managing a Peer or Server Cache</a>
</li>
<li>
- <a href="/docs/basic_config/the_cache/managing_a_client_cache.html">Managing a Client Cache</a>
+ <a href="/docs/guide/basic_config/the_cache/managing_a_client_cache.html">Managing a Client Cache</a>
</li>
<li>
- <a href="/docs/basic_config/the_cache/managing_a_secure_cache.html">Managing a Cache in a Secure System</a>
+ <a href="/docs/guide/basic_config/the_cache/managing_a_secure_cache.html">Managing a Cache in a Secure System</a>
</li>
<li>
- <a href="/docs/basic_config/the_cache/managing_a_multiuser_cache.html">Managing RegionServices for Multiple Secure Users</a>
+ <a href="/docs/guide/basic_config/the_cache/managing_a_multiuser_cache.html">Managing RegionServices for Multiple Secure Users</a>
</li>
<li>
- <a href="/docs/basic_config/the_cache/setting_cache_initializer.html">Launching an Application after Initializing the Cache</a>
+ <a href="/docs/guide/basic_config/the_cache/setting_cache_initializer.html">Launching an Application after Initializing the Cache</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/basic_config/data_regions/chapter_overview.html">Data Regions</a>
+ <a href="/docs/guide/basic_config/data_regions/chapter_overview.html">Data Regions</a>
<ul>
<li>
- <a href="/docs/basic_config/data_regions/managing_data_regions.html">Data Region Management</a>
+ <a href="/docs/guide/basic_config/data_regions/managing_data_regions.html">Data Region Management</a>
</li>
<li>
- <a href="/docs/basic_config/data_regions/create_a_region_with_gfsh.html">Creating a Region with gfsh</a>
+ <a href="/docs/guide/basic_config/data_regions/create_a_region_with_gfsh.html">Creating a Region with gfsh</a>
</li>
<li>
- <a href="/docs/basic_config/data_regions/create_a_region_with_cacheXML.html">Creating a Region Through the cache.xml File</a>
+ <a href="/docs/guide/basic_config/data_regions/create_a_region_with_cacheXML.html">Creating a Region Through the cache.xml File</a>
</li>
<li>
- <a href="/docs/basic_config/data_regions/create_a_region_with_API.html">Creating a Region Through the API</a>
+ <a href="/docs/guide/basic_config/data_regions/create_a_region_with_API.html">Creating a Region Through the API</a>
</li>
<li>
- <a href="/docs/basic_config/data_regions/region_naming.html">Region Naming</a>
+ <a href="/docs/guide/basic_config/data_regions/region_naming.html">Region Naming</a>
</li>
<li>
- <a href="/docs/basic_config/data_regions/region_shortcuts.html">Region Shortcuts and Custom Named Region Attributes</a>
+ <a href="/docs/guide/basic_config/data_regions/region_shortcuts.html">Region Shortcuts and Custom Named Region Attributes</a>
</li>
<li>
- <a href="/docs/basic_config/data_regions/store_retrieve_region_shortcuts.html">Storing and Retrieving Region Shortcuts and Custom Named Region Attributes</a>
+ <a href="/docs/guide/basic_config/data_regions/store_retrieve_region_shortcuts.html">Storing and Retrieving Region Shortcuts and Custom Named Region Attributes</a>
</li>
<li>
- <a href="/docs/basic_config/data_regions/managing_region_attributes.html">Managing Region Attributes</a>
+ <a href="/docs/guide/basic_config/data_regions/managing_region_attributes.html">Managing Region Attributes</a>
</li>
<li>
- <a href="/docs/basic_config/data_regions/creating_custom_attributes.html">Creating Custom Attributes for Regions and Entries</a>
+ <a href="/docs/guide/basic_config/data_regions/creating_custom_attributes.html">Creating Custom Attributes for Regions and Entries</a>
</li>
<li>
- <a href="/docs/basic_config/data_regions/new_region_existing_data.html">Building a New Region with Existing Content</a>
+ <a href="/docs/guide/basic_config/data_regions/new_region_existing_data.html">Building a New Region with Existing Content</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/basic_config/data_entries_custom_classes/chapter_overview.html">
+ <a href="/docs/guide/basic_config/data_entries_custom_classes/chapter_overview.html">
Data Entries
</a>
<ul>
<li>
- <a href="/docs/basic_config/data_entries_custom_classes/managing_data_entries.html">Managing Data Entries</a>
+ <a href="/docs/guide/basic_config/data_entries_custom_classes/managing_data_entries.html">Managing Data Entries</a>
</li>
<li>
- <a href="/docs/basic_config/data_entries_custom_classes/using_custom_classes.html">Requirements for Using Custom Classes in Data Caching</a>
+ <a href="/docs/guide/basic_config/data_entries_custom_classes/using_custom_classes.html">Requirements for Using Custom Classes in Data Caching</a>
</li>
</ul>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/topologies_and_comm/book_intro.html">Topologies and Communication</a>
+ <a href="/docs/guide/topologies_and_comm/book_intro.html">Topologies and Communication</a>
<ul>
<li class="has_submenu">
- <a href="/docs/topologies_and_comm/topology_concepts/chapter_overview.html">Topology and Communication General Concepts</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/chapter_overview.html">Topology and Communication General Concepts</a>
<ul>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/topology_types.html">Topology Types</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/topology_types.html">Topology Types</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/member_communication.html">Planning Topology and Communication
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/member_communication.html">Planning Topology and Communication
</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/how_member_discovery_works.html">How Member Discovery Works</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/how_member_discovery_works.html">How Member Discovery Works</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/how_communication_works.html">How Communication Works</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/how_communication_works.html">How Communication Works</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/using_bind_addresses.html">Using Bind Addresses</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/using_bind_addresses.html">Using Bind Addresses</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/IPv4_and_IPv6.html">Choosing Between IPv4 and IPv6</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/IPv4_and_IPv6.html">Choosing Between IPv4 and IPv6</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/topologies_and_comm/p2p_configuration/chapter_overview.html">Peer-to-Peer Configuration</a>
+ <a href="/docs/guide/topologies_and_comm/p2p_configuration/chapter_overview.html">Peer-to-Peer Configuration</a>
<ul>
<li>
- <a href="/docs/topologies_and_comm/p2p_configuration/setting_up_a_p2p_system.html">Configuring Peer-to-Peer Discovery</a>
+ <a href="/docs/guide/topologies_and_comm/p2p_configuration/setting_up_a_p2p_system.html">Configuring Peer-to-Peer Discovery</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/p2p_configuration/setting_up_peer_communication.html">Configuring Peer Communication</a>
+ <a href="/docs/guide/topologies_and_comm/p2p_configuration/setting_up_peer_communication.html">Configuring Peer Communication</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/p2p_configuration/configuring_peer_member_groups.html">Organizing Peers into Logical Member Groups</a>
+ <a href="/docs/guide/topologies_and_comm/p2p_configuration/configuring_peer_member_groups.html">Organizing Peers into Logical Member Groups</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/topologies_and_comm/cs_configuration/chapter_overview.html">Client/Server Configuration</a>
+ <a href="/docs/guide/topologies_and_comm/cs_configuration/chapter_overview.html">Client/Server Configuration</a>
<ul>
<li>
- <a href="/docs/topologies_and_comm/cs_configuration/standard_client_server_deployment.html">Standard Client/Server Deployment</a>
+ <a href="/docs/guide/topologies_and_comm/cs_configuration/standard_client_server_deployment.html">Standard Client/Server Deployment</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/how_server_discovery_works.html">How Server Discovery Works</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/how_server_discovery_works.html">How Server Discovery Works</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/how_the_pool_manages_connections.html">How Client/Server Connections Work</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/how_the_pool_manages_connections.html">How Client/Server Connections Work</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/cs_configuration/setting_up_a_client_server_system.html">Configuring a Client/Server System</a>
+ <a href="/docs/guide/topologies_and_comm/cs_configuration/setting_up_a_client_server_system.html">Configuring a Client/Server System</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/cs_configuration/configure_servers_into_logical_groups.html">Organizing Servers Into Logical Member Groups</a>
+ <a href="/docs/guide/topologies_and_comm/cs_configuration/configure_servers_into_logical_groups.html">Organizing Servers Into Logical Member Groups</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/cs_configuration/client_server_example_configurations.html">Client/Server Example Configurations</a>
+ <a href="/docs/guide/topologies_and_comm/cs_configuration/client_server_example_configurations.html">Client/Server Example Configurations</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/cs_configuration/client_server_whats_next.html">Fine-Tuning Your Client/Server Configuration</a>
+ <a href="/docs/guide/topologies_and_comm/cs_configuration/client_server_whats_next.html">Fine-Tuning Your Client/Server Configuration</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/topologies_and_comm/multi_site_configuration/chapter_overview.html">Multi-site (WAN) Configuration</a>
+ <a href="/docs/guide/topologies_and_comm/multi_site_configuration/chapter_overview.html">Multi-site (WAN) Configuration</a>
<ul>
<li class="has_submenu">
- <a href="/docs/topologies_and_comm/topology_concepts/how_multisite_systems_work.html">How Multi-site (WAN) Systems Work</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/how_multisite_systems_work.html">How Multi-site (WAN) Systems Work</a>
<ul>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/multisite_overview.html#topic_70045702D3994BC692E75102CE01BD7C">
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/multisite_overview.html#topic_70045702D3994BC692E75102CE01BD7C">
Overview of Multi-site Caching</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/multisite_overview.html#topic_C74A0961937640B199396DC925D8D782">Consistency for WAN Updates</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/multisite_overview.html#topic_C74A0961937640B199396DC925D8D782">Consistency for WAN Updates</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/multisite_overview.html#topic_1742957C8D4B4F7590847EB8DB6CD4F7">Discovery for Multi-Site Systems</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/multisite_overview.html#topic_1742957C8D4B4F7590847EB8DB6CD4F7">Discovery for Multi-Site Systems</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/multisite_overview.html#topic_9AA37B43642D4DE19072CA3367C849BA">Gateway Senders</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/multisite_overview.html#topic_9AA37B43642D4DE19072CA3367C849BA">Gateway Senders</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/topology_concepts/multisite_overview.html#topic_4DB3D9CF01AD4F4899457D1250468D00">Gateway Receivers</a>
+ <a href="/docs/guide/topologies_and_comm/topology_concepts/multisite_overview.html#topic_4DB3D9CF01AD4F4899457D1250468D00">Gateway Receivers</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/topologies_and_comm/multi_site_configuration/multisite_topologies.html">Multi-site (WAN) Topologies</a>
+ <a href="/docs/guide/topologies_and_comm/multi_site_configuration/multisite_topologies.html">Multi-site (WAN) Topologies</a>
</li>
<li>
- <a href="/docs/topologies_and_comm/multi_site_configuration/setting_up_a_multisite_system.html">Configuring a Multi-site (WAN) System</a>
+ <a href="/docs/guide/topologies_and_comm/multi_site_configuration/setting_up_a_multisite_system.html">Configuring a Multi-site (WAN) System</a>
</li>
<li>
- <a href="/docs/developing/events/filtering_multisite_events.html">Filtering Events for Multi-Site (WAN) Distribution</a>
+ <a href="/docs/guide/developing/events/filtering_multisite_events.html">Filtering Events for Multi-Site (WAN) Distribution</a>
</li>
<li>
- <a href="/docs/developing/events/resolving_multisite_conflicts.html">Resolving Conflicting Events</a>
+ <a href="/docs/guide/developing/events/resolving_multisite_conflicts.html">Resolving Conflicting Events</a>
</li>
</ul>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/book_intro.html">Managing Apache Geode</a>
+ <a href="/docs/guide/managing/book_intro.html">Managing Apache Geode</a>
<ul>
<li class="has_submenu">
- <a href="/docs/managing/management/management_and_monitoring.html">Apache Geode Management and Monitoring</a>
+ <a href="/docs/guide/managing/management/management_and_monitoring.html">Apache Geode Management and Monitoring</a>
<ul>
<li>
- <a href="/docs/managing/management/management_and_monitoring_features.html">Management and Monitoring Features</a>
+ <a href="/docs/guide/managing/management/management_and_monitoring_features.html">Management and Monitoring Features</a>
</li>
<li>
- <a href="/docs/managing/management/mm_overview.html">Overview of Geode Management and Monitoring Tools</a>
+ <a href="/docs/guide/managing/management/mm_overview.html">Overview of Geode Management and Monitoring Tools</a>
</li>
<li>
- <a href="/docs/managing/management/management_system_overview.html">
+ <a href="/docs/guide/managing/management/management_system_overview.html">
Architecture and Components</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/management/jmx_manager_node.html#topic_36C918B4202D45F3AC225FFD23B11D7C">JMX Manager Operations</a>
+ <a href="/docs/guide/managing/management/jmx_manager_node.html#topic_36C918B4202D45F3AC225FFD23B11D7C">JMX Manager Operations</a>
<ul>
<li>
- <a href="/docs/managing/management/jmx_manager_operations.html">Starting a JMX Manager</a>
+ <a href="/docs/guide/managing/management/jmx_manager_operations.html">Starting a JMX Manager</a>
</li>
<li>
- <a href="/docs/managing/management/jmx_manager_operations.html#topic_263072624B8D4CDBAD18B82E07AA44B6">Configuring a JMX Manager</a>
+ <a href="/docs/guide/managing/management/jmx_manager_operations.html#topic_263072624B8D4CDBAD18B82E07AA44B6">Configuring a JMX Manager</a>
</li>
<li>
- <a href="/docs/managing/management/jmx_manager_operations.html#topic_5B6DF783A14241399DC25C6EE8D0048A">Stopping a JMX Manager</a>
+ <a href="/docs/guide/managing/management/jmx_manager_operations.html#topic_5B6DF783A14241399DC25C6EE8D0048A">Stopping a JMX Manager</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/management/mbean_architecture.html">Federated MBean Architecture</a>
+ <a href="/docs/guide/managing/management/mbean_architecture.html">Federated MBean Architecture</a>
<ul>
<li class="has_submenu">
- <a href="/docs/managing/management/list_of_mbeans.html">List of Geode JMX MBeans</a>
+ <a href="/docs/guide/managing/management/list_of_mbeans.html">List of Geode JMX MBeans</a>
<ul>
<li>
- <a href="/docs/managing/management/list_of_mbeans_full.html">JMX Manager MBeans</a>
+ <a href="/docs/guide/managing/management/list_of_mbeans_full.html">JMX Manager MBeans</a>
</li>
<li>
- <a href="/docs/managing/management/list_of_mbeans_full.html#topic_48194A5BDF3F40F68E95A114DD702413">Managed Node MBeans</a>
+ <a href="/docs/guide/managing/management/list_of_mbeans_full.html#topic_48194A5BDF3F40F68E95A114DD702413">Managed Node MBeans</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/managing/management/mbeans_jconsole.html">Browsing Geode MBeans through JConsole</a>
+ <a href="/docs/guide/managing/management/mbeans_jconsole.html">Browsing Geode MBeans through JConsole</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/management/mbean_notifications.html">Geode JMX MBean Notifications</a>
+ <a href="/docs/guide/managing/management/mbean_notifications.html">Geode JMX MBean Notifications</a>
<ul>
<li>
- <a href="/docs/managing/management/notification_federation_and_alerts.html">Notification Federation</a>
+ <a href="/docs/guide/managing/management/notification_federation_and_alerts.html">Notification Federation</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/management/list_of_mbean_notifications.html">List of JMX MBean Notifications</a>
+ <a href="/docs/guide/managing/management/list_of_mbean_notifications.html">List of JMX MBean Notifications</a>
<ul>
<li>
- <a href="/docs/managing/management/list_of_mbean_notifications.html#reference_czt_hq2_vj">MemberMXBean Notifications</a>
+ <a href="/docs/guide/managing/management/list_of_mbean_notifications.html#reference_czt_hq2_vj">MemberMXBean Notifications</a>
</li>
<li>
- <a href="/docs/managing/management/list_of_mbean_notifications.html#reference_dzt_hq2_vj">MemberMXBean Gateway Notifications</a>
+ <a href="/docs/guide/managing/management/list_of_mbean_notifications.html#reference_dzt_hq2_vj">MemberMXBean Gateway Notifications</a>
</li>
<li>
- <a href="/docs/managing/management/list_of_mbean_notifications.html#cacheservermxbean_notifications">CacheServerMXBean Notifications</a>
+ <a href="/docs/guide/managing/management/list_of_mbean_notifications.html#cacheservermxbean_notifications">CacheServerMXBean Notifications</a>
</li>
<li>
- <a href="/docs/managing/management/list_of_mbean_notifications.html#distributedsystemmxbean_notifications">DistributedSystemMXBean Notifications</a>
+ <a href="/docs/guide/managing/management/list_of_mbean_notifications.html#distributedsystemmxbean_notifications">DistributedSystemMXBean Notifications</a>
</li>
</ul>
</li>
@@ -400,1363 +400,1360 @@ limitations under the License.
</ul>
</li>
<li>
- <a href="/docs/managing/management/configuring_rmi_connector.html">Configuring RMI Registry Ports and RMI Connectors</a>
+ <a href="/docs/guide/managing/management/configuring_rmi_connector.html">Configuring RMI Registry Ports and RMI Connectors</a>
</li>
<li>
- <a href="/docs/managing/management/gfsh_and_management_api.html">Executing gfsh Commands through the Management API</a>
+ <a href="/docs/guide/managing/management/gfsh_and_management_api.html">Executing gfsh Commands through the Management API</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/heap_use/heap_management.html">Managing Heap and Off-heap Memory</a>
+ <a href="/docs/guide/managing/heap_use/heap_management.html">Managing Heap and Off-heap Memory</a>
<ul>
<li>
- <a href="/docs/managing/heap_use/heap_management.html#section_590DA955523246ED980E4E351FF81F71">Tuning the JVM's Garbage Collection Parameters</a>
+ <a href="/docs/guide/managing/heap_use/heap_management.html#section_590DA955523246ED980E4E351FF81F71">Tuning the JVM's Garbage Collection Parameters</a>
</li>
<li>
- <a href="/docs/managing/heap_use/heap_management.html#how_the_resource_manager_works">Using the Geode Resource Manager</a>
+ <a href="/docs/guide/managing/heap_use/heap_management.html#how_the_resource_manager_works">Using the Geode Resource Manager</a>
</li>
<li>
- <a href="/docs/managing/heap_use/heap_management.html#configuring_resource_manager_controlling_heap_use">Controlling Heap Use with the Resource Manager</a>
+ <a href="/docs/guide/managing/heap_use/heap_management.html#configuring_resource_manager_controlling_heap_use">Controlling Heap Use with the Resource Manager</a>
</li>
<li>
- <a href="/docs/managing/heap_use/heap_management.html#configuring_resource_manager__section_4949882892DA46F6BB8588FA97037F45">Configure Geode for Heap LRU Management</a>
+ <a href="/docs/guide/managing/heap_use/heap_management.html#configuring_resource_manager__section_4949882892DA46F6BB8588FA97037F45">Configure Geode for Heap LRU Management</a>
</li>
<li>
- <a href="/docs/managing/heap_use/heap_management.html#set_jvm_gc_tuning_params">Set the JVM GC Tuning Parameters</a>
+ <a href="/docs/guide/managing/heap_use/heap_management.html#set_jvm_gc_tuning_params">Set the JVM GC Tuning Parameters</a>
</li>
<li>
- <a href="/docs/managing/heap_use/heap_management.html#configuring_resource_manager__section_DE1CC494C2B547B083AA00821250972A">Monitor and Tune Heap LRU Configurations</a>
+ <a href="/docs/guide/managing/heap_use/heap_management.html#configuring_resource_manager__section_DE1CC494C2B547B083AA00821250972A">Monitor and Tune Heap LRU Configurations</a>
</li>
<li>
- <a href="/docs/managing/heap_use/heap_management.html#resource_manager_example_configurations">Resource Manager Example Configurations</a>
+ <a href="/docs/guide/managing/heap_use/heap_management.html#resource_manager_example_configurations">Resource Manager Example Configurations</a>
</li>
<li>
- <a href="/docs/managing/heap_use/off_heap_management.html">Managing Off-Heap Memory</a>
+ <a href="/docs/guide/managing/heap_use/off_heap_management.html">Managing Off-Heap Memory</a>
</li>
<li>
- <a href="/docs/managing/heap_use/lock_memory.html">Locking Memory (Linux Systems Only)</a>
+ <a href="/docs/guide/managing/heap_use/lock_memory.html">Locking Memory (Linux Systems Only)</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/disk_storage/chapter_overview.html">Disk Storage</a>
+ <a href="/docs/guide/managing/disk_storage/chapter_overview.html">Disk Storage</a>
<ul>
<li>
- <a href="/docs/managing/disk_storage/how_disk_stores_work.html">How Disk Stores Work</a>
+ <a href="/docs/guide/managing/disk_storage/how_disk_stores_work.html">How Disk Stores Work</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/file_names_and_extensions.html">Disk Store File Names and Extensions</a>
+ <a href="/docs/guide/managing/disk_storage/file_names_and_extensions.html">Disk Store File Names and Extensions</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/operation_logs.html">Disk Store Operation Logs</a>
+ <a href="/docs/guide/managing/disk_storage/operation_logs.html">Disk Store Operation Logs</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/disk_storage/overview_using_disk_stores.html">Configuring Disk Stores</a>
+ <a href="/docs/guide/managing/disk_storage/overview_using_disk_stores.html">Configuring Disk Stores</a>
<ul>
<li>
- <a href="/docs/managing/disk_storage/using_disk_stores.html">Designing and Configuring Disk Stores</a>
+ <a href="/docs/guide/managing/disk_storage/using_disk_stores.html">Designing and Configuring Disk Stores</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/disk_store_configuration_params.html">Disk Store Configuration Parameters</a>
+ <a href="/docs/guide/managing/disk_storage/disk_store_configuration_params.html">Disk Store Configuration Parameters</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/using_the_default_disk_store.html">Modifying the Default Disk Store</a>
+ <a href="/docs/guide/managing/disk_storage/using_the_default_disk_store.html">Modifying the Default Disk Store</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/managing/disk_storage/optimize_availability_and_performance.html">
+ <a href="/docs/guide/managing/disk_storage/optimize_availability_and_performance.html">
Optimizing a System with Disk Stores</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/starting_system_with_disk_stores.html">Start Up and Shut Down with Disk Stores</a>
+ <a href="/docs/guide/managing/disk_storage/starting_system_with_disk_stores.html">Start Up and Shut Down with Disk Stores</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/disk_storage/managing_disk_stores.html">Disk Store Management</a>
+ <a href="/docs/guide/managing/disk_storage/managing_disk_stores.html">Disk Store Management</a>
<ul>
<li>
- <a href="/docs/managing/disk_storage/managing_disk_stores_cmds.html">Disk Store Management Commands and Operations</a>
+ <a href="/docs/guide/managing/disk_storage/managing_disk_stores_cmds.html">Disk Store Management Commands and Operations</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/validating_disk_store.html">Validating a Disk Store</a>
+ <a href="/docs/guide/managing/disk_storage/validating_disk_store.html">Validating a Disk Store</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/compacting_disk_stores.html">Running Compaction on Disk Store Log Files</a>
+ <a href="/docs/guide/managing/disk_storage/compacting_disk_stores.html">Running Compaction on Disk Store Log Files</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/keeping_offline_disk_store_in_sync.html">Keeping a Disk Store Synchronized with the Cache</a>
+ <a href="/docs/guide/managing/disk_storage/keeping_offline_disk_store_in_sync.html">Keeping a Disk Store Synchronized with the Cache</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/disk_free_space_monitoring.html">Configuring Disk Free Space Monitoring
+ <a href="/docs/guide/managing/disk_storage/disk_free_space_monitoring.html">Configuring Disk Free Space Monitoring
</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/handling_missing_disk_stores.html">Handling Missing Disk Stores</a>
+ <a href="/docs/guide/managing/disk_storage/handling_missing_disk_stores.html">Handling Missing Disk Stores</a>
</li>
<li>
- <a href="/docs/managing/disk_storage/managing_disk_buffer_flushes.html">Altering When Buffers Are Flushed to Disk</a>
+ <a href="/docs/guide/managing/disk_storage/managing_disk_buffer_flushes.html">Altering When Buffers Are Flushed to Disk</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/managing/disk_storage/backup_restore_disk_store.html">Creating Backups for System Recovery and Operational Management</a>
+ <a href="/docs/guide/managing/disk_storage/backup_restore_disk_store.html">Creating Backups for System Recovery and Operational Management</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/cache_snapshots/chapter_overview.html">Cache and Region Snapshots</a>
+ <a href="/docs/guide/managing/cache_snapshots/chapter_overview.html">Cache and Region Snapshots</a>
<ul>
<li>
- <a href="/docs/managing/cache_snapshots/using_cache_and_region_snapshots.html">Usage and Performance Notes</a>
+ <a href="/docs/guide/managing/cache_snapshots/using_cache_and_region_snapshots.html">Usage and Performance Notes</a>
</li>
<li>
- <a href="/docs/managing/cache_snapshots/exporting_a_snapshot.html">Exporting Cache and Region Snapshots</a>
+ <a href="/docs/guide/managing/cache_snapshots/exporting_a_snapshot.html">Exporting Cache and Region Snapshots</a>
</li>
<li>
- <a href="/docs/managing/cache_snapshots/importing_a_snapshot.html">Importing Cache and Region Snapshots</a>
+ <a href="/docs/guide/managing/cache_snapshots/importing_a_snapshot.html">Importing Cache and Region Snapshots</a>
</li>
<li>
- <a href="/docs/managing/cache_snapshots/filtering_snapshot_entries.html">Filtering Entries During Import or Export</a>
+ <a href="/docs/guide/managing/cache_snapshots/filtering_snapshot_entries.html">Filtering Entries During Import or Export</a>
</li>
<li>
- <a href="/docs/managing/cache_snapshots/read_snapshots_programmatically.html">Reading Snapshots Programmatically</a>
+ <a href="/docs/guide/managing/cache_snapshots/read_snapshots_programmatically.html">Reading Snapshots Programmatically</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/region_compression/region_compression.html">Region Compression</a>
+ <a href="/docs/guide/managing/region_compression/region_compression.html">Region Compression</a>
<ul>
<li>
- <a href="/docs/managing/region_compression/region_compression.html#concept_a2c_rhc_gl">Guidelines on Using Compression</a>
+ <a href="/docs/guide/managing/region_compression/region_compression.html#concept_a2c_rhc_gl">Guidelines on Using Compression</a>
</li>
<li>
- <a href="/docs/managing/region_compression/region_compression.html#topic_inm_whc_gl">How to Enable Compression in a Region</a>
+ <a href="/docs/guide/managing/region_compression/region_compression.html#topic_inm_whc_gl">How to Enable Compression in a Region</a>
</li>
<li>
- <a href="/docs/managing/region_compression/region_compression.html#topic_hqf_syj_g4">Working with Compressors
+ <a href="/docs/guide/managing/region_compression/region_compression.html#topic_hqf_syj_g4">Working with Compressors
</a>
</li>
<li>
- <a href="/docs/managing/region_compression/region_compression.html#topic_omw_j3c_gl">Comparing Performance of Compressed and Non-Compressed Regions</a>
+ <a href="/docs/guide/managing/region_compression/region_compression.html#topic_omw_j3c_gl">Comparing Performance of Compressed and Non-Compressed Regions</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/network_partitioning/chapter_overview.html">Network Partitioning</a>
+ <a href="/docs/guide/managing/network_partitioning/chapter_overview.html">Network Partitioning</a>
<ul>
<li>
- <a href="/docs/managing/network_partitioning/how_network_partitioning_management_works.html">How Network Partitioning Management Works</a>
+ <a href="/docs/guide/managing/network_partitioning/how_network_partitioning_management_works.html">How Network Partitioning Management Works</a>
</li>
<li>
- <a href="/docs/managing/network_partitioning/failure_detection.html">Failure Detection and Membership Views</a>
+ <a href="/docs/guide/managing/network_partitioning/failure_detection.html">Failure Detection and Membership Views</a>
</li>
<li>
- <a href="/docs/managing/network_partitioning/membership_coordinators_lead_members_and_weighting.html">Membership Coordinators, Lead Members and Member Weighting</a>
+ <a href="/docs/guide/managing/network_partitioning/membership_coordinators_lead_members_and_weighting.html">Membership Coordinators, Lead Members and Member Weighting</a>
</li>
<li>
- <a href="/docs/managing/network_partitioning/network_partitioning_scenarios.html">Network Partitioning Scenarios</a>
+ <a href="/docs/guide/managing/network_partitioning/network_partitioning_scenarios.html">Network Partitioning Scenarios</a>
</li>
<li>
- <a href="/docs/managing/network_partitioning/handling_network_partitioning.html">Configure Apache Geode to Handle Network Partitioning</a>
+ <a href="/docs/guide/managing/network_partitioning/handling_network_partitioning.html">Configure Apache Geode to Handle Network Partitioning</a>
</li>
<li>
- <a href="/docs/managing/network_partitioning/preventing_network_partitions.html">Preventing Network Partitions</a>
+ <a href="/docs/guide/managing/network_partitioning/preventing_network_partitions.html">Preventing Network Partitions</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/security/chapter_overview.html">Security</a>
+ <a href="/docs/guide/managing/security/chapter_overview.html">Security</a>
<ul>
<li>
- <a href="/docs/managing/security/implementing_security.html">Security Implementation Introduction and Overview</a>
+ <a href="/docs/guide/managing/security/implementing_security.html">Security Implementation Introduction and Overview</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/security/security_audit_overview.html">Security Detail Considerations</a>
+ <a href="/docs/guide/managing/security/security_audit_overview.html">Security Detail Considerations</a>
<ul>
<li>
- <a href="/docs/managing/security/security-audit.html">External Interfaces, Ports, and Services</a>
+ <a href="/docs/guide/managing/security/security-audit.html">External Interfaces, Ports, and Services</a>
</li>
<li>
- <a href="/docs/managing/security/security-audit.html#topic_263072624B8D4CDBAD18B82E07AA44B6">Resources That Must Be Protected</a>
+ <a href="/docs/guide/managing/security/security-audit.html#topic_263072624B8D4CDBAD18B82E07AA44B6">Resources That Must Be Protected</a>
</li>
<li>
- <a href="/docs/managing/security/security-audit.html#topic_5B6DF783A14241399DC25C6EE8D0048A">Log File Locations</a>
+ <a href="/docs/guide/managing/security/security-audit.html#topic_5B6DF783A14241399DC25C6EE8D0048A">Log File Locations</a>
</li>
<li>
- <a href="/docs/managing/security/properties_file.html">Where to Place Security Configuration Settings</a>
+ <a href="/docs/guide/managing/security/properties_file.html">Where to Place Security Configuration Settings</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/managing/security/enable_security.html">Enable Security with Property Definitions</a>
+ <a href="/docs/guide/managing/security/enable_security.html">Enable Security with Property Definitions</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/security/authentication_overview.html">Authentication</a>
+ <a href="/docs/guide/managing/security/authentication_overview.html">Authentication</a>
<ul>
<li>
- <a href="/docs/managing/security/implementing_authentication.html">Implementing Authentication</a>
+ <a href="/docs/guide/managing/security/implementing_authentication.html">Implementing Authentication</a>
</li>
<li>
- <a href="/docs/managing/security/encrypting_passwords.html">Encrypting Passwords for Use in cache.xml</a>
+ <a href="/docs/guide/managing/security/encrypting_passwords.html">Encrypting Passwords for Use in cache.xml</a>
</li>
<li>
- <a href="/docs/managing/security/encrypting_with_diffie_helman.html">Encrypt Credentials with Diffie-Hellman</a>
+ <a href="/docs/guide/managing/security/encrypting_with_diffie_helman.html">Encrypt Credentials with Diffie-Hellman</a>
</li>
<li>
- <a href="/docs/managing/security/authentication_examples.html">Authentication Example</a>
+ <a href="/docs/guide/managing/security/authentication_examples.html">Authentication Example</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/security/authorization_overview.html">Authorization</a>
+ <a href="/docs/guide/managing/security/authorization_overview.html">Authorization</a>
<ul>
<li>
- <a href="/docs/managing/security/implementing_authorization.html">Implementing Authorization</a>
+ <a href="/docs/guide/managing/security/implementing_authorization.html">Implementing Authorization</a>
</li>
<li>
- <a href="/docs/managing/security/authorization_example.html">Authorization Example</a>
+ <a href="/docs/guide/managing/security/authorization_example.html">Authorization Example</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/managing/security/post_processing.html">Post Processing of Region Data</a>
+ <a href="/docs/guide/managing/security/post_processing.html">Post Processing of Region Data</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/security/ssl_overview.html">SSL</a>
+ <a href="/docs/guide/managing/security/ssl_overview.html">SSL</a>
<ul>
<li class="has_submenu">
- <a href="/docs/managing/security/implementing_ssl.html">Configuring SSL</a>
+ <a href="/docs/guide/managing/security/implementing_ssl.html">Configuring SSL</a>
<ul>
<li>
- <a href="/docs/managing/security/implementing_ssl.html#ssl_configurable_components">SSL-Configurable Components</a>
+ <a href="/docs/guide/managing/security/implementing_ssl.html#ssl_configurable_components">SSL-Configurable Components</a>
</li>
<li>
- <a href="/docs/managing/security/implementing_ssl.html#ssl_configuration_properties">SSL Configuration Properties</a>
+ <a href="/docs/guide/managing/security/implementing_ssl.html#ssl_configuration_properties">SSL Configuration Properties</a>
</li>
<li>
- <a href="/docs/managing/security/implementing_ssl.html#ssl_property_reference_tables">SSL Property Reference Tables</a>
+ <a href="/docs/guide/managing/security/implementing_ssl.html#ssl_property_reference_tables">SSL Property Reference Tables</a>
</li>
<li>
- <a href="/docs/managing/security/implementing_ssl.html#implementing_ssl__sec_ssl_impl_proc">Procedure</a>
+ <a href="/docs/guide/managing/security/implementing_ssl.html#implementing_ssl__sec_ssl_impl_proc">Procedure</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/managing/security/ssl_example.html">SSL Sample Implementation</a>
+ <a href="/docs/guide/managing/security/ssl_example.html">SSL Sample Implementation</a>
</li>
</ul>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/monitor_tune/chapter_overview.html">Performance Tuning and Configuration</a>
+ <a href="/docs/guide/managing/monitor_tune/chapter_overview.html">Performance Tuning and Configuration</a>
<ul>
<li class="has_submenu">
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere.html">Improving Geode Performance on vSphere</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere.html">Improving Geode Performance on vSphere</a>
<ul>
<li>
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_F48990A6A37144988D49E132E17E117C">Operating System Guidelines</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_F48990A6A37144988D49E132E17E117C">Operating System Guidelines</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_D8393B1A75364E46B0F959F0DE820E9E">NUMA, CPU, and BIOS Settings</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_D8393B1A75364E46B0F959F0DE820E9E">NUMA, CPU, and BIOS Settings</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_7A5F1EAD7A6C4E21BB1FF7CF3B625BC5">Physical and Virtual NIC Settings</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_7A5F1EAD7A6C4E21BB1FF7CF3B625BC5">Physical and Virtual NIC Settings</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_E6EB8AB6CCEF435A98B48B867FE9BFEB">VMware vSphere vMotion and DRS Cluster Usage</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_E6EB8AB6CCEF435A98B48B867FE9BFEB">VMware vSphere vMotion and DRS Cluster Usage</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_E53BBF3D09A54953B02DCE2BD00D51E0">Placement and Organization of Virtual Machines</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_E53BBF3D09A54953B02DCE2BD00D51E0">Placement and Organization of Virtual Machines</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_567308E9DE07406BB5BF420BE77B6558">Virtual Machine Memory Reservation</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_567308E9DE07406BB5BF420BE77B6558">Virtual Machine Memory Reservation</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_424B940584044CF6A685E86802548A27">vSphere High Availability and Apache Geode</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_424B940584044CF6A685E86802548A27">vSphere High Availability and Apache Geode</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_913B15841C4249A68697F3D91281A645">Storage Guidelines</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_913B15841C4249A68697F3D91281A645">Storage Guidelines</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_628F038FD4954E56BF4192F17FD3D119">Additional Resources</a>
+ <a href="/docs/guide/managing/monitor_tune/gemfire_performance_on_vsphere_guidelines.html#topic_628F038FD4954E56BF4192F17FD3D119">Additional Resources</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/monitor_tune/performance_controls.html">Performance Controls</a>
+ <a href="/docs/guide/managing/monitor_tune/performance_controls.html">Performance Controls</a>
<ul>
<li>
- <a href="/docs/managing/monitor_tune/performance_controls_data_serialization.html">Data Serialization</a>
+ <a href="/docs/guide/managing/monitor_tune/performance_controls_data_serialization.html">Data Serialization</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/performance_controls_setting_cache_timeouts.html">Setting Cache Timeouts</a>
+ <a href="/docs/guide/managing/monitor_tune/performance_controls_setting_cache_timeouts.html">Setting Cache Timeouts</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/performance_controls_controlling_socket_use.html">Controlling Socket Use</a>
+ <a href="/docs/guide/managing/monitor_tune/performance_controls_controlling_socket_use.html">Controlling Socket Use</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/performance_controls_managing_slow_receivers.html">Management of Slow Receivers</a>
+ <a href="/docs/guide/managing/monitor_tune/performance_controls_managing_slow_receivers.html">Management of Slow Receivers</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/performance_controls_increasing_cache_hits.html">Increasing the Ratio of Cache Hits</a>
+ <a href="/docs/guide/managing/monitor_tune/performance_controls_increasing_cache_hits.html">Increasing the Ratio of Cache Hits</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/monitor_tune/system_member_performance.html">System Member Performance</a>
+ <a href="/docs/guide/managing/monitor_tune/system_member_performance.html">System Member Performance</a>
<ul>
<li>
- <a href="/docs/managing/monitor_tune/system_member_performance_distributed_system_member.html">Distributed System Member Properties</a>
+ <a href="/docs/guide/managing/monitor_tune/system_member_performance_distributed_system_member.html">Distributed System Member Properties</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/system_member_performance_jvm_mem_settings.html">JVM Memory Settings and System Performance</a>
+ <a href="/docs/guide/managing/monitor_tune/system_member_performance_jvm_mem_settings.html">JVM Memory Settings and System Performance</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/system_member_performance_garbage.html">Garbage Collection and System Performance</a>
+ <a href="/docs/guide/managing/monitor_tune/system_member_performance_garbage.html">Garbage Collection and System Performance</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/system_member_performance_connection_thread_settings.html">Connection Thread Settings and Performance</a>
+ <a href="/docs/guide/managing/monitor_tune/system_member_performance_connection_thread_settings.html">Connection Thread Settings and Performance</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/monitor_tune/slow_receivers.html">Slow Receivers with TCP/IP</a>
+ <a href="/docs/guide/managing/monitor_tune/slow_receivers.html">Slow Receivers with TCP/IP</a>
<ul>
<li>
- <a href="/docs/managing/monitor_tune/slow_receivers_preventing_problems.html">Preventing Slow Receivers</a>
+ <a href="/docs/guide/managing/monitor_tune/slow_receivers_preventing_problems.html">Preventing Slow Receivers</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/slow_receivers_managing.html">Managing Slow Receivers</a>
+ <a href="/docs/guide/managing/monitor_tune/slow_receivers_managing.html">Managing Slow Receivers</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/managing/monitor_tune/slow_messages.html">Slow distributed-ack Messages</a>
+ <a href="/docs/guide/managing/monitor_tune/slow_messages.html">Slow distributed-ack Messages</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/monitor_tune/socket_communication.html">Socket Communication</a>
+ <a href="/docs/guide/managing/monitor_tune/socket_communication.html">Socket Communication</a>
<ul>
<li>
- <a href="/docs/managing/monitor_tune/socket_communication_setting_socket_buffer_sizes.html">Setting Socket Buffer Sizes</a>
+ <a href="/docs/guide/managing/monitor_tune/socket_communication_setting_socket_buffer_sizes.html">Setting Socket Buffer Sizes</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/socket_communication_ephemeral_tcp_port_limits.html">Ephemeral TCP Port Limits</a>
+ <a href="/docs/guide/managing/monitor_tune/socket_communication_ephemeral_tcp_port_limits.html">Ephemeral TCP Port Limits</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/socket_communication_have_enough_sockets.html">Making Sure You Have Enough Sockets</a>
+ <a href="/docs/guide/managing/monitor_tune/socket_communication_have_enough_sockets.html">Making Sure You Have Enough Sockets</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/socket_tcp_keepalive.html">TCP/IP KeepAlive Configuration</a>
+ <a href="/docs/guide/managing/monitor_tune/socket_tcp_keepalive.html">TCP/IP KeepAlive Configuration</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/socket_communication_tcpip_p2p_handshake_timeouts.html">TCP/IP Peer-to-Peer Handshake Timeouts</a>
+ <a href="/docs/guide/managing/monitor_tune/socket_communication_tcpip_p2p_handshake_timeouts.html">TCP/IP Peer-to-Peer Handshake Timeouts</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/managing/monitor_tune/udp_communication.html">UDP Communication</a>
+ <a href="/docs/guide/managing/monitor_tune/udp_communication.html">UDP Communication</a>
</li>
<li class="has_submenu">
- <a href="/docs/managing/monitor_tune/multicast_communication.html">Multicast Communication</a>
+ <a href="/docs/guide/managing/monitor_tune/multicast_communication.html">Multicast Communication</a>
<ul>
<li>
- <a href="/docs/managing/monitor_tune/multicast_communication_provisioning_bandwidth.html">Provisioning Bandwidth for Multicast</a>
+ <a href="/docs/guide/managing/monitor_tune/multicast_communication_provisioning_bandwidth.html">Provisioning Bandwidth for Multicast</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/multicast_communication_testing_multicast_speed_limits.html">Testing Multicast Speed Limits</a>
+ <a href="/docs/guide/managing/monitor_tune/multicast_communication_testing_multicast_speed_limits.html">Testing Multicast Speed Limits</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/multicast_communication_configuring_speed_limits.html">Configuring Multicast Speed Limits</a>
+ <a href="/docs/guide/managing/monitor_tune/multicast_communication_configuring_speed_limits.html">Configuring Multicast Speed Limits</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/multicast_communication_runtime_considerations.html">Run-time Considerations for Multicast</a>
+ <a href="/docs/guide/managing/monitor_tune/multicast_communication_runtime_considerations.html">Run-time Considerations for Multicast</a>
</li>
<li>
- <a href="/docs/managing/monitor_tune/multicast_communication_troubleshooting.html">Troubleshooting the Multicast Tuning Process</a>
+ <a href="/docs/guide/managing/monitor_tune/multicast_communication_troubleshooting.html">Troubleshooting the Multicast Tuning Process</a>
</li>
</ul>
</li>
<li>
- <a href="/docs/managing/monitor_tune/cache_consistency.html">Maintaining Cache Consistency</a>
+ <a href="/docs/guide/managing/monitor_tune/cache_consistency.html">Maintaining Cache Consistency</a>
</li>
</ul>
</li>
<li class="has_submenu">
- <a href="/docs/managing/logging/logging.html">Logging</a>
+ <a href="/docs/guide/managing/logging/logging.html">Logging</a>
<ul>
<li>
- <a href="/docs/managing/logging/how_logging_works.html">How Geode Logging Works</a>
+ <a href="/docs/guide/managing/logging/how_logging_works.html">How Geode Logging Works</a>
</li>
<li>
- <a href="/docs/managing/logging/logging_categories.html">Understanding Log Messages and Their Categories</a>
+ <a href="/docs/guide/managing/logging/logging_categories.html">Understanding Log Messages and Their Categories</a>
</li>
<li>
- <a href="/docs/managing/logging/logging_whats_next.html">Naming, Searching, and Creating Log Files</a>
+ <a href="/docs/guide/managing/logging/logging_whats_next.html">Naming, Searching, and Creating Log Files</a>
</li>
<li>
- <a href="/docs/managing/logging/setting_up_logging.html">Set Up Logging</a>
+ <a href="/docs/guide/managing/logging/setting_up_logging.html">Set Up
<TRUNCATED>
[58/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js b/geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js
deleted file mode 100644
index aa14db8..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
- * http://benalman.com/projects/jquery-bbq-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.no
Escape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M<N?O[P]||(R[M+1]&&isNaN(R[M+1])?{}:[]):J}}else{if($.isArray(H[P])){H[P].push(J)}else{if(H[P]!==i){H[P]=[H[P],J]}else{H[P]=J}}}}else{if(P){H[P]=F?i:""}}});return H};function z(H,F,G){if(F===i||typeof F==="boolean"){G=F;F=a[H?D:A]()}else{F=E(F)?F.replace(H?w:x,""):F}return l(F,G)}l[A]=B(z,0);l[D]=v=B(z,1);$[y]||($[y]=function(F){return $.extend(C,F)})({a:k,base:k,iframe:t,img:t,input:t,form:"action",link:k,script:t});j=$[y];function s(I,G,H,F){if(!E(H)&&typeof H!=="object"){F=H;H=G;G=i}return this.each(function(){var L=$(this)
,J=G||j()[(this.nodeName||"").toLowerCase()]||"",K=J&&L.attr(J)||"";L.attr(J,a[I](K,H,F))})}$.fn[A]=B(s,A);$.fn[D]=B(s,D);b.pushState=q=function(I,F){if(E(I)&&/^#/.test(I)&&F===i){F=2}var H=I!==i,G=c(p[g][k],H?I:{},H?F:2);p[g][k]=G+(/#/.test(G)?"":"#")};b.getState=u=function(F,G){return F===i||typeof F==="boolean"?v(F):v(G)[F]};b.removeState=function(F){var G={};if(F!==i){G=u();$.each($.isArray(F)?F:arguments,function(I,H){delete G[H]})}q(G,2)};e[d]=$.extend(e[d],{add:function(F){var H;function G(J){var I=J[D]=c();J.getState=function(K,L){return K===i||typeof K==="boolean"?l(I,K):l(I,L)[K]};H.apply(this,arguments)}if($.isFunction(F)){H=F;return G}else{H=F.handler;F.handler=G}}})})(jQuery,this);
-/*
- * jQuery hashchange event - v1.2 - 2/11/2010
- * http://benalman.com/projects/jquery-hashchange-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,i,b){var j,k=$.event.special,c="location",d="hashchange",l="href",f=$.browser,g=document.documentMode,h=f.msie&&(g===b||g<8),e="on"+d in i&&!h;function a(m){m=m||i[c][l];return m.replace(/^[^#]*#?(.*)$/,"$1")}$[d+"Delay"]=100;k[d]=$.extend(k[d],{setup:function(){if(e){return false}$(j.start)},teardown:function(){if(e){return false}$(j.stop)}});j=(function(){var m={},r,n,o,q;function p(){o=q=function(s){return s};if(h){n=$('<iframe src="javascript:0"/>').hide().insertAfter("body")[0].contentWindow;q=function(){return a(n.document[c][l])};o=function(u,s){if(u!==s){var t=n.document;t.open().close();t[c].hash="#"+u}};o(a())}}m.start=function(){if(r){return}var t=a();o||p();(function s(){var v=a(),u=q(t);if(v!==t){o(t=v,u);$(i).trigger(d)}else{if(u!==t){i[c][l]=i[c][l].replace(/#.*/,"")+"#"+u}}r=setTimeout(s,$[d+"Delay"])})()};m.stop=function(){if(!n){r&&clearTimeout(r);r=0}};return m})()})(jQuery,this);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/jquery.slideto.min.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/jquery.slideto.min.js b/geode-web-api/src/main/webapp/docs/lib/jquery.slideto.min.js
deleted file mode 100644
index 193334e..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/jquery.slideto.min.js
+++ /dev/null
@@ -1 +0,0 @@
-(function(b){b.fn.slideto=function(a){a=b.extend({slide_duration:"slow",highlight_duration:3E3,highlight:true,highlight_color:"#FFFF99"},a);return this.each(function(){obj=b(this);b("body").animate({scrollTop:obj.offset().top},a.slide_duration,function(){a.highlight&&b.ui.version&&obj.effect("highlight",{color:a.highlight_color},a.highlight_duration)})})}})(jQuery);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/jquery.wiggle.min.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/jquery.wiggle.min.js b/geode-web-api/src/main/webapp/docs/lib/jquery.wiggle.min.js
deleted file mode 100644
index 933880f..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/jquery.wiggle.min.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-jQuery Wiggle
-Author: WonderGroup, Jordan Thomas
-URL: http://labs.wondergroup.com/demos/mini-ui/index.html
-License: MIT (http://en.wikipedia.org/wiki/MIT_License)
-*/
-jQuery.fn.wiggle=function(o){var d={speed:50,wiggles:3,travel:5,callback:null};var o=jQuery.extend(d,o);return this.each(function(){var cache=this;var wrap=jQuery(this).wrap('<div class="wiggle-wrap"></div>').css("position","relative");var calls=0;for(i=1;i<=o.wiggles;i++){jQuery(this).animate({left:"-="+o.travel},o.speed).animate({left:"+="+o.travel*2},o.speed*2).animate({left:"-="+o.travel},o.speed,function(){calls++;if(jQuery(cache).parent().hasClass('wiggle-wrap')){jQuery(cache).parent().replaceWith(cache);}
-if(calls==o.wiggles&&jQuery.isFunction(o.callback)){o.callback();}});}});};
\ No newline at end of file
[30/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/SystemFailure.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/SystemFailure.java b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
index 8acf473..99b0671 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemFailure.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
@@ -1,18 +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
+ * 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.
*/
/**
*
@@ -28,97 +26,76 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
/**
* Catches and responds to JVM failure
* <p>
- * This class represents a catastrophic failure of the system,
- * especially the Java virtual machine. Any class may,
- * at any time, indicate that a system failure has occurred by calling
- * {@link #initiateFailure(Error)} (or, less commonly,
- * {@link #setFailure(Error)}).
+ * This class represents a catastrophic failure of the system, especially the Java virtual machine.
+ * Any class may, at any time, indicate that a system failure has occurred by calling
+ * {@link #initiateFailure(Error)} (or, less commonly, {@link #setFailure(Error)}).
* <p>
- * In practice, the most common type of failure that is likely to be
- * reported by an otherwise healthy JVM is {@link OutOfMemoryError}. However,
- * GemFire will report any occurrence of {@link VirtualMachineError} as
- * a JVM failure.
+ * In practice, the most common type of failure that is likely to be reported by an otherwise
+ * healthy JVM is {@link OutOfMemoryError}. However, GemFire will report any occurrence of
+ * {@link VirtualMachineError} as a JVM failure.
* <p>
- * When a failure is reported, you must assume that the JVM has <em>broken
- * its fundamental execution contract</em> with your application.
- * No programming invariant can be assumed to be true, and your
+ * When a failure is reported, you must assume that the JVM has <em>broken its fundamental execution
+ * contract</em> with your application. No programming invariant can be assumed to be true, and your
* entire application must be regarded as corrupted.
- * <h1>Failure Hooks</h1>
- * GemFire uses this class to disable its distributed system (group
- * communication) and any open caches. It also provides a hook for you
- * to respond to after GemFire disables itself.
- * <h1>Failure WatchDog</h1>
- * When {@link #startThreads()} is called, a "watchdog" {@link Thread} is started that
- * periodically checks to see if system corruption has been reported. When
- * system corruption is detected, this thread proceeds to:
+ * <h1>Failure Hooks</h1> GemFire uses this class to disable its distributed system (group
+ * communication) and any open caches. It also provides a hook for you to respond to after GemFire
+ * disables itself.
+ * <h1>Failure WatchDog</h1> When {@link #startThreads()} is called, a "watchdog" {@link Thread} is
+ * started that periodically checks to see if system corruption has been reported. When system
+ * corruption is detected, this thread proceeds to:
* <p>
* <ol>
- * <li>
- * <em>Close GemFire</em> -- Group communication is ceased (this cache
- * member recuses itself from the distributed system) and the cache
- * is further poisoned (it is pointless to try to cleanly close it at this
- * point.).
+ * <li><em>Close GemFire</em> -- Group communication is ceased (this cache member recuses itself
+ * from the distributed system) and the cache is further poisoned (it is pointless to try to cleanly
+ * close it at this point.).
* <p>
- * After this has successfully ended, we launch a
- * </li>
- * <li>
- * <em>failure action</em>, a user-defined Runnable
- * {@link #setFailureAction(Runnable)}.
- * By default, this Runnable performs nothing. If you feel you need to perform
- * an action before exiting the JVM, this hook gives you a
- * means of attempting some action. Whatever you attempt should be extremely
- * simple, since your Java execution environment has been corrupted.
+ * After this has successfully ended, we launch a</li>
+ * <li><em>failure action</em>, a user-defined Runnable {@link #setFailureAction(Runnable)}. By
+ * default, this Runnable performs nothing. If you feel you need to perform an action before exiting
+ * the JVM, this hook gives you a means of attempting some action. Whatever you attempt should be
+ * extremely simple, since your Java execution environment has been corrupted.
* <p>
- * GemStone recommends that you employ
- * <a href="http://wrapper.tanukisoftware.org/doc/english/introduction.html">
- * Java Service Wrapper</a> to detect when your JVM exits and to perform
- * appropriate failure and restart actions.
- * </li>
- * <li>
- * Finally, if the application has granted the watchdog permission to exit the JVM
- * (via {@link #setExitOK(boolean)}), the watchdog calls {@link System#exit(int)} with
- * an argument of 1. If you have not granted this class permission to
- * close the JVM, you are <em>strongly</em> advised to call it in your
- * failure action (in the previous step).
+ * GemStone recommends that you employ
+ * <a href="http://wrapper.tanukisoftware.org/doc/english/introduction.html"> Java Service
+ * Wrapper</a> to detect when your JVM exits and to perform appropriate failure and restart actions.
* </li>
+ * <li>Finally, if the application has granted the watchdog permission to exit the JVM (via
+ * {@link #setExitOK(boolean)}), the watchdog calls {@link System#exit(int)} with an argument of 1.
+ * If you have not granted this class permission to close the JVM, you are <em>strongly</em> advised
+ * to call it in your failure action (in the previous step).</li>
* </ol>
- * <p>
- * Each of these actions will be run exactly once in the above described
- * order. However, if either step throws any type of error ({@link Throwable}),
- * the watchdog will assume that the JVM is still under duress (esp. an
- * {@link OutOfMemoryError}), will wait a bit, and then retry the failed action.
* <p>
- * It bears repeating that you should be very cautious of any Runnables you
- * ask this class to run. By definition the JVM is <em>very sick</em>
- * when failure has been signalled.
+ * Each of these actions will be run exactly once in the above described order. However, if either
+ * step throws any type of error ({@link Throwable}), the watchdog will assume that the JVM is still
+ * under duress (esp. an {@link OutOfMemoryError}), will wait a bit, and then retry the failed
+ * action.
* <p>
- * <h1>Failure Proctor</h1>
- * In addition to the failure watchdog, {@link #startThreads()} creates a second
- * thread (the "proctor") that monitors free memory. It does this by examining
- * {@link Runtime#freeMemory() free memory},
- * {@link Runtime#totalMemory() total memory} and
- * {@link Runtime#maxMemory() maximum memory}. If the amount of available
- * memory stays below a given
- * {@link #setFailureMemoryThreshold(long) threshold}, for
- * more than {@link #WATCHDOG_WAIT} seconds, the watchdog is notified.
+ * It bears repeating that you should be very cautious of any Runnables you ask this class to run.
+ * By definition the JVM is <em>very sick</em> when failure has been signalled.
+ * <p>
+ * <h1>Failure Proctor</h1> In addition to the failure watchdog, {@link #startThreads()} creates a
+ * second thread (the "proctor") that monitors free memory. It does this by examining
+ * {@link Runtime#freeMemory() free memory}, {@link Runtime#totalMemory() total memory} and
+ * {@link Runtime#maxMemory() maximum memory}. If the amount of available memory stays below a given
+ * {@link #setFailureMemoryThreshold(long) threshold}, for more than {@link #WATCHDOG_WAIT} seconds,
+ * the watchdog is notified.
* <p>
* Note that the proctor can be effectively disabled by
- * {@link SystemFailure#setFailureMemoryThreshold(long) setting} the failure memory threshold
- * to a negative value.
+ * {@link SystemFailure#setFailureMemoryThreshold(long) setting} the failure memory threshold to a
+ * negative value.
* <p>
- * The proctor is a second line of defense, attempting to detect
- * OutOfMemoryError conditions in circumstances where nothing alerted the
- * watchdog. For instance, a third-party jar might incorrectly handle this
- * error and leave your virtual machine in a "stuck" state.
+ * The proctor is a second line of defense, attempting to detect OutOfMemoryError conditions in
+ * circumstances where nothing alerted the watchdog. For instance, a third-party jar might
+ * incorrectly handle this error and leave your virtual machine in a "stuck" state.
* <p>
- * Note that the proctor does not relieve you of the obligation to
- * follow the best practices in the next section.
+ * Note that the proctor does not relieve you of the obligation to follow the best practices in the
+ * next section.
* <h1>Best Practices</h1>
- * <h2>Catch and Handle VirtualMachineError</h2>
- * If you feel obliged to catch <em>either</em> {@link Error}, or
- * {@link Throwable}, you <em>must</em>also check for
- * {@link VirtualMachineError} like so:
+ * <h2>Catch and Handle VirtualMachineError</h2> If you feel obliged to catch <em>either</em>
+ * {@link Error}, or {@link Throwable}, you <em>must</em>also check for {@link VirtualMachineError}
+ * like so:
* <p>
+ *
* <pre>
catch (VirtualMachineError err) {
SystemFailure.{@link #initiateFailure(Error) initiateFailure}(err);
@@ -127,17 +104,16 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
throw err;
}
* </pre>
- * <h2>Periodically Check For Errors</h2>
- * Check for serious system errors at
- * appropriate points in your algorithms. You may elect to use
- * the {@link #checkFailure()} utility function, but you are
- * not required to (you could just see if {@link SystemFailure#getFailure()}
- * returns a non-null result).
+ *
+ * <h2>Periodically Check For Errors</h2> Check for serious system errors at appropriate points in
+ * your algorithms. You may elect to use the {@link #checkFailure()} utility function, but you are
+ * not required to (you could just see if {@link SystemFailure#getFailure()} returns a non-null
+ * result).
* <p>
- * A job processing loop is a good candidate, for
- * instance, in org.apache.org.jgroups.protocols.UDP#run(),
- * which implements {@link Thread#run}:
+ * A job processing loop is a good candidate, for instance, in
+ * org.apache.org.jgroups.protocols.UDP#run(), which implements {@link Thread#run}:
* <p>
+ *
* <pre>
for (;;) {
SystemFailure.{@link #checkFailure() checkFailure}();
@@ -145,15 +121,15 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
if (Thread.currentThread().isInterrupted()) break;
...
* </pre>
- * <h2>Create Logging ThreadGroups</h2>
- * If you create any Thread, a best practice is to catch severe errors
- * and signal failure appropriately. One trick to do this is to create a
- * ThreadGroup that handles uncaught exceptions by overriding
- * {@link ThreadGroup#uncaughtException(Thread, Throwable)} and to declare
- * your thread as a member of that {@link ThreadGroup}. This also has a
- * significant side-benefit in that most uncaught exceptions
- * can be detected:
+ *
+ * <h2>Create Logging ThreadGroups</h2> If you create any Thread, a best practice is to catch severe
+ * errors and signal failure appropriately. One trick to do this is to create a ThreadGroup that
+ * handles uncaught exceptions by overriding
+ * {@link ThreadGroup#uncaughtException(Thread, Throwable)} and to declare your thread as a member
+ * of that {@link ThreadGroup}. This also has a significant side-benefit in that most uncaught
+ * exceptions can be detected:
* <p>
+ *
* <pre>
ThreadGroup tg = new ThreadGroup("Worker Threads") {
public void uncaughtException(Thread t, Throwable e) {
@@ -167,56 +143,62 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
}
Thread t = new Thread(myRunnable, tg, "My Thread");
t.start();
- }; * </pre>
+ }; *
+ * </pre>
* <p>
- * <h2>Catches of Error and Throwable Should Check for Failure</h2>
- * Keep in mind that peculiar or flat-out<em>impossible</em> exceptions may
- * ensue after a VirtualMachineError has been thrown <em>anywhere</em> in
- * your virtual machine. Whenever you catch {@link Error} or {@link Throwable},
- * you should also make sure that you aren't dealing with a corrupted JVM:
- * <p>
- * <pre>
- catch (Throwable t) {
- // Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
- // _still_ a possibility that you are dealing with a cascading
- // error condition, so you also need to check to see if the JVM
- // is still usable:
- SystemFailure.{@link #checkFailure() checkFailure}();
- ...
- }
+ * <h2>Catches of Error and Throwable Should Check for Failure</h2> Keep in mind that peculiar or
+ * flat-out<em>impossible</em> exceptions may ensue after a VirtualMachineError has been thrown
+ * <em>anywhere</em> in your virtual machine. Whenever you catch {@link Error} or {@link Throwable},
+ * you should also make sure that you aren't dealing with a corrupted JVM:
+ * <p>
+ *
+ * <pre>
+ catch (Throwable t) {
+ // Whenever you catch Error or Throwable, you must also
+ // catch VirtualMachineError (see above). However, there is
+ // _still_ a possibility that you are dealing with a cascading
+ // error condition, so you also need to check to see if the JVM
+ // is still usable:
+ SystemFailure.{@link #checkFailure() checkFailure}();
+ ...
+ }
* </pre>
+ *
* @since GemFire 5.1
*/
-@edu.umd.cs.findbugs.annotations.SuppressWarnings(value="DM_GC", justification="This class performs System.gc as last ditch effort during out-of-memory condition.")
+@edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "DM_GC",
+ justification = "This class performs System.gc as last ditch effort during out-of-memory condition.")
public final class SystemFailure {
/**
- * Time to wait during stopWatchdog and stopProctor. Not final
- * for tests
+ * Time to wait during stopWatchdog and stopProctor. Not final for tests
*/
static int SHUTDOWN_WAIT = 1000;
/**
- * Preallocated error messages\
- * LocalizedStrings may use memory (in the form of an iterator)
- * so we must get the translated messages in advance.
+ * Preallocated error messages\ LocalizedStrings may use memory (in the form of an iterator) so we
+ * must get the translated messages in advance.
**/
- static final String JVM_CORRUPTION = LocalizedStrings.SystemFailure_JVM_CORRUPTION_HAS_BEEN_DETECTED.toLocalizedString();
- static final String CALLING_SYSTEM_EXIT = LocalizedStrings.SystemFailure_SINCE_THIS_IS_A_DEDICATED_CACHE_SERVER_AND_THE_JVM_HAS_BEEN_CORRUPTED_THIS_PROCESS_WILL_NOW_TERMINATE_PERMISSION_TO_CALL_SYSTEM_EXIT_INT_WAS_GIVEN_IN_THE_FOLLOWING_CONTEXT.toLocalizedString();
- public static final String DISTRIBUTION_HALTED_MESSAGE = LocalizedStrings.SystemFailure_DISTRIBUTION_HALTED_DUE_TO_JVM_CORRUPTION.toLocalizedString();
- public static final String DISTRIBUTED_SYSTEM_DISCONNECTED_MESSAGE = LocalizedStrings.SystemFailure_DISTRIBUTED_SYSTEM_DISCONNECTED_DUE_TO_JVM_CORRUPTION.toLocalizedString();
+ static final String JVM_CORRUPTION =
+ LocalizedStrings.SystemFailure_JVM_CORRUPTION_HAS_BEEN_DETECTED.toLocalizedString();
+ static final String CALLING_SYSTEM_EXIT =
+ LocalizedStrings.SystemFailure_SINCE_THIS_IS_A_DEDICATED_CACHE_SERVER_AND_THE_JVM_HAS_BEEN_CORRUPTED_THIS_PROCESS_WILL_NOW_TERMINATE_PERMISSION_TO_CALL_SYSTEM_EXIT_INT_WAS_GIVEN_IN_THE_FOLLOWING_CONTEXT
+ .toLocalizedString();
+ public static final String DISTRIBUTION_HALTED_MESSAGE =
+ LocalizedStrings.SystemFailure_DISTRIBUTION_HALTED_DUE_TO_JVM_CORRUPTION.toLocalizedString();
+ public static final String DISTRIBUTED_SYSTEM_DISCONNECTED_MESSAGE =
+ LocalizedStrings.SystemFailure_DISTRIBUTED_SYSTEM_DISCONNECTED_DUE_TO_JVM_CORRUPTION
+ .toLocalizedString();
/**
* the underlying failure
*
- * This is usually an instance of {@link VirtualMachineError}, but it
- * is not required to be such.
+ * This is usually an instance of {@link VirtualMachineError}, but it is not required to be such.
*
* @see #getFailure()
* @see #initiateFailure(Error)
*/
protected static volatile Error failure = null;
-
+
/**
* user-defined runnable to run last
*
@@ -228,21 +210,20 @@ public final class SystemFailure {
failure.printStackTrace();
}
};
-
+
/**
* @see #setExitOK(boolean)
*/
private static volatile boolean exitOK = false;
-
+
/**
- * If we're going to exit the JVM, I want to be accountable for who
- * told us it was OK.
+ * If we're going to exit the JVM, I want to be accountable for who told us it was OK.
*/
private static volatile Throwable exitExcuse;
-
+
/**
- * Indicate whether it is acceptable to call {@link System#exit(int)} after
- * failure processing has completed.
+ * Indicate whether it is acceptable to call {@link System#exit(int)} after failure processing has
+ * completed.
* <p>
* This may be dynamically modified while the system is running.
*
@@ -254,41 +235,40 @@ public final class SystemFailure {
exitOK = newVal;
if (exitOK) {
exitExcuse = new Throwable("SystemFailure exitOK set");
- }
- else {
+ } else {
exitExcuse = null;
}
return result;
}
-
- //merge42180: Added this method while merging 42180. It should have already be here through different merges or will come later
+
+ // merge42180: Added this method while merging 42180. It should have already be here through
+ // different merges or will come later
/**
- * Returns true if the given Error is a fatal to the JVM and it should be shut
- * down. Code should call {@link #initiateFailure(Error)} or
- * {@link #setFailure(Error)} if this returns true.
+ * Returns true if the given Error is a fatal to the JVM and it should be shut down. Code should
+ * call {@link #initiateFailure(Error)} or {@link #setFailure(Error)} if this returns true.
*/
public static boolean isJVMFailureError(Error err) {
// all VirtualMachineErrors are not fatal to the JVM, in particular
// StackOverflowError is not
return err instanceof OutOfMemoryError || err instanceof UnknownError;
}
+
/**
* Disallow instance creation
*/
private SystemFailure() {
-
+
}
-
+
/**
- * Synchronizes access to state variables, used to notify the watchdog
- * when to run
+ * Synchronizes access to state variables, used to notify the watchdog when to run
*
* @see #notifyWatchDog()
* @see #startProctor()
* @see #startWatchDog()
*/
private static final Object failureSync = new Object();
-
+
/**
* True if we have closed GemFire
*
@@ -301,7 +281,7 @@ public final class SystemFailure {
*
* @see #setFailureAction(Runnable)
*/
- private static volatile boolean failureActionCompleted = false;
+ private static volatile boolean failureActionCompleted = false;
/**
* This is a logging ThreadGroup, created only once.
@@ -319,42 +299,41 @@ public final class SystemFailure {
System.err.println("Internal error in SystemFailure watchdog:" + e);
e.printStackTrace();
}
- };
- }
-
+ };
+ }
+
/**
- * This is the amount of time, in seconds, the watchdog periodically awakens
- * to see if the system has been corrupted.
+ * This is the amount of time, in seconds, the watchdog periodically awakens to see if the system
+ * has been corrupted.
* <p>
- * The watchdog will be explicitly awakened by calls to
- * {@link #setFailure(Error)} or {@link #initiateFailure(Error)}, but
- * it will awaken of its own accord periodically to check for failure even
- * if the above calls do not occur.
+ * The watchdog will be explicitly awakened by calls to {@link #setFailure(Error)} or
+ * {@link #initiateFailure(Error)}, but it will awaken of its own accord periodically to check for
+ * failure even if the above calls do not occur.
* <p>
- * This can be set with the system property
- * <code>gemfire.WATCHDOG_WAIT</code>. The default is 15 sec.
+ * This can be set with the system property <code>gemfire.WATCHDOG_WAIT</code>. The default is 15
+ * sec.
*/
- static public final int WATCHDOG_WAIT = Integer
- .getInteger(DistributionConfig.GEMFIRE_PREFIX + "WATCHDOG_WAIT", 15).intValue();
-
+ static public final int WATCHDOG_WAIT =
+ Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + "WATCHDOG_WAIT", 15).intValue();
+
/**
* This is the watchdog thread
*
* @guarded.By {@link #failureSync}
*/
private static Thread watchDog;
-
+
private static volatile boolean isCacheClosing = false;
/**
- * Should be invoked when GemFire cache is being created.
+ * Should be invoked when GemFire cache is being created.
*/
public static void signalCacheCreate() {
isCacheClosing = false;
}
/**
- * Should be invoked when GemFire cache is closing or closed.
+ * Should be invoked when GemFire cache is closing or closed.
*/
public static void signalCacheClose() {
isCacheClosing = true;
@@ -387,7 +366,7 @@ public final class SystemFailure {
watchDog.start();
}
}
-
+
private static void stopWatchDog() {
Thread watchDogSnapshot = null;
synchronized (failureSync) {
@@ -397,7 +376,7 @@ public final class SystemFailure {
watchDogSnapshot = watchDog;
}
}
- if(watchDogSnapshot != null) {
+ if (watchDogSnapshot != null) {
try {
watchDogSnapshot.join(100);
} catch (InterruptedException ignore) {
@@ -411,19 +390,18 @@ public final class SystemFailure {
}
}
}
-
+
/**
* This is the run loop for the watchdog thread.
*/
static protected void runWatchDog() {
-
+
boolean warned = false;
-
+
logFine(WATCHDOG_NAME, "Starting");
try {
basicLoadEmergencyClasses();
- }
- catch (ExceptionInInitializerError e) {
+ } catch (ExceptionInInitializerError e) {
// Uhhh...are we shutting down?
boolean noSurprise = false;
Throwable cause = e.getCause();
@@ -440,11 +418,9 @@ public final class SystemFailure {
}
// In any event, we're toast
return;
- }
- catch (CancelException e) {
+ } catch (CancelException e) {
// ignore this because we are shutting down anyway
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
logWarning(WATCHDOG_NAME, "Unable to initialize watchdog", t);
return;
}
@@ -461,11 +437,10 @@ public final class SystemFailure {
if (stopping) {
return;
}
- logFine(WATCHDOG_NAME, "Waiting for disaster");
+ logFine(WATCHDOG_NAME, "Waiting for disaster");
try {
- failureSync.wait(WATCHDOG_WAIT * 1000);
- }
- catch (InterruptedException e) {
+ failureSync.wait(WATCHDOG_WAIT * 1000);
+ } catch (InterruptedException e) {
// Ignore
}
if (stopping) {
@@ -473,35 +448,34 @@ public final class SystemFailure {
}
}
// Poke nose in the air, take a sniff...
-
+
if (failureActionCompleted) {
// early out, for testing
logInfo(WATCHDOG_NAME, "all actions completed; exiting");
}
if (failure == null) {
- // Tail wag. Go back to sleep.
+ // Tail wag. Go back to sleep.
logFine(WATCHDOG_NAME, "no failure detected");
continue;
}
- // BOW WOW WOW WOW WOW! Corrupted system.
- if (!warned ) {
+ // BOW WOW WOW WOW WOW! Corrupted system.
+ if (!warned) {
warned = logWarning(WATCHDOG_NAME, "failure detected", failure);
}
-
+
// If any of the following fail, we will go back to sleep and
// retry.
if (!gemfireCloseCompleted) {
logInfo(WATCHDOG_NAME, "closing GemFire");
try {
emergencyClose();
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
logWarning(WATCHDOG_NAME, "trouble closing GemFire", t);
continue; // go back to sleep
}
gemfireCloseCompleted = true;
}
-
+
if (!failureActionCompleted) {
// avoid potential race condition setting the runnable
Runnable r = failureAction;
@@ -509,26 +483,24 @@ public final class SystemFailure {
logInfo(WATCHDOG_NAME, "running user's runnable");
try {
r.run();
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
logWarning(WATCHDOG_NAME, "trouble running user's runnable", t);
continue; // go back to sleep
}
}
failureActionCompleted = true;
}
-
+
stopping = true;
stopProctor();
-
+
if (exitOK) {
logWarning(WATCHDOG_NAME,
// No "+" in this long message, we're out of memory!
- CALLING_SYSTEM_EXIT,
- exitExcuse);
-
+ CALLING_SYSTEM_EXIT, exitExcuse);
+
// ATTENTION: there are VERY FEW places in GemFire where it is
- // acceptable to call System.exit. This is one of those
+ // acceptable to call System.exit. This is one of those
// places...
System.exit(1);
}
@@ -537,14 +509,13 @@ public final class SystemFailure {
// Our job here is done
logInfo(WATCHDOG_NAME, "exiting");
return;
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
// We *never* give up. NEVER EVER!
logWarning(WATCHDOG_NAME, "thread encountered a problem: " + t, t);
}
} // for
}
-
+
/**
* Spies on system statistics looking for low memory threshold
*
@@ -556,66 +527,64 @@ public final class SystemFailure {
private static Thread proctor;
/**
- * This mutex controls access to {@link #firstStarveTime} and
- * {@link #minimumMemoryThreshold}.
+ * This mutex controls access to {@link #firstStarveTime} and {@link #minimumMemoryThreshold}.
* <p>
- * I'm hoping that a fat lock is never created here, so that
- * an object allocation isn't necessary to acquire this
- * mutex. You'd have to have A LOT of contention on this mutex
- * in order for a fat lock to be created, which indicates IMHO
- * a serious problem in your applications.
+ * I'm hoping that a fat lock is never created here, so that an object allocation isn't necessary
+ * to acquire this mutex. You'd have to have A LOT of contention on this mutex in order for a fat
+ * lock to be created, which indicates IMHO a serious problem in your applications.
*/
private static final Object memorySync = new Object();
-
+
/**
- * This is the minimum amount of memory that the proctor will
- * tolerate before declaring a system failure.
+ * This is the minimum amount of memory that the proctor will tolerate before declaring a system
+ * failure.
*
* @see #setFailureMemoryThreshold(long)
* @guarded.By {@link #memorySync}
*/
- static long minimumMemoryThreshold = Long.getLong(
- DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.chronic_memory_threshold", 1048576).longValue();
-
+ static long minimumMemoryThreshold =
+ Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.chronic_memory_threshold",
+ 1048576).longValue();
+
/**
- * This is the interval, in seconds, that the proctor
- * thread will awaken and poll system free memory.
+ * This is the interval, in seconds, that the proctor thread will awaken and poll system free
+ * memory.
*
- * The default is 1 sec. This can be set using the system property
+ * The default is 1 sec. This can be set using the system property
* <code>gemfire.SystemFailure.MEMORY_POLL_INTERVAL</code>.
*
* @see #setFailureMemoryThreshold(long)
*/
- static final public long MEMORY_POLL_INTERVAL = Long.getLong(
- DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MEMORY_POLL_INTERVAL", 1).longValue();
-
+ static final public long MEMORY_POLL_INTERVAL =
+ Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MEMORY_POLL_INTERVAL", 1)
+ .longValue();
+
/**
- * This is the maximum amount of time, in seconds, that the proctor thread
- * will tolerate seeing free memory stay below
- * {@link #setFailureMemoryThreshold(long)}, after which point it will
+ * This is the maximum amount of time, in seconds, that the proctor thread will tolerate seeing
+ * free memory stay below {@link #setFailureMemoryThreshold(long)}, after which point it will
* declare a system failure.
*
- * The default is 15 sec. This can be set using the system property
+ * The default is 15 sec. This can be set using the system property
* <code>gemfire.SystemFailure.MEMORY_MAX_WAIT</code>.
*
* @see #setFailureMemoryThreshold(long)
*/
- static final public long MEMORY_MAX_WAIT = Long.getLong(
- DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MEMORY_MAX_WAIT", 15).longValue();
-
+ static final public long MEMORY_MAX_WAIT = Long
+ .getLong(DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MEMORY_MAX_WAIT", 15).longValue();
+
/**
- * Flag that determines whether or not we monitor memory on our own.
- * If this flag is set, we will check freeMemory, invoke GC if free memory
- * gets low, and start throwing our own OutOfMemoryException if
+ * Flag that determines whether or not we monitor memory on our own. If this flag is set, we will
+ * check freeMemory, invoke GC if free memory gets low, and start throwing our own
+ * OutOfMemoryException if
*
- * The default is false, so this monitoring is turned off. This monitoring has been found
- * to be unreliable in non-Sun VMs when the VM is under stress or behaves in unpredictable ways.
+ * The default is false, so this monitoring is turned off. This monitoring has been found to be
+ * unreliable in non-Sun VMs when the VM is under stress or behaves in unpredictable ways.
*
* @since GemFire 6.5
*/
- static final public boolean MONITOR_MEMORY = Boolean.getBoolean(
- DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MONITOR_MEMORY");
-
+ static final public boolean MONITOR_MEMORY =
+ Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + "SystemFailure.MONITOR_MEMORY");
+
/**
* Start the proctor thread, if it isn't already running.
*
@@ -640,7 +609,7 @@ public final class SystemFailure {
proctor.start();
}
}
-
+
private static void stopProctor() {
Thread proctorSnapshot = null;
synchronized (failureSync) {
@@ -655,41 +624,43 @@ public final class SystemFailure {
}
}
}
-
+
/**
* Symbolic representation of an invalid starve time
*/
static private final long NEVER_STARVED = Long.MAX_VALUE;
-
+
/**
* this is the last time we saw memory starvation
*
* @guarded.By {@link #memorySync}}}
*/
static private long firstStarveTime = NEVER_STARVED;
-
+
/**
- * This is the previous measure of total memory. If it changes,
- * we reset the proctor's starve statistic.
+ * This is the previous measure of total memory. If it changes, we reset the proctor's starve
+ * statistic.
*/
static private long lastTotalMemory = 0;
-
+
/**
- * This is the run loop for the proctor thread (formally known
- * as the "watchcat" (grin)
+ * This is the run loop for the proctor thread (formally known as the "watchcat" (grin)
*/
static protected void runProctor() {
// Note that the javadocs say this can return Long.MAX_VALUE.
// If it does, the proctor will never do its job...
final long maxMemory = Runtime.getRuntime().maxMemory();
-
+
// Allocate this error in advance, since it's too late once
// it's been detected!
- final OutOfMemoryError oome = new OutOfMemoryError(LocalizedStrings.SystemFailure_0_MEMORY_HAS_REMAINED_CHRONICALLY_BELOW_1_BYTES_OUT_OF_A_MAXIMUM_OF_2_FOR_3_SEC.toLocalizedString(new Object[] {PROCTOR_NAME, Long.valueOf(minimumMemoryThreshold), Long.valueOf(maxMemory), Integer.valueOf(WATCHDOG_WAIT)}));
-
+ final OutOfMemoryError oome = new OutOfMemoryError(
+ LocalizedStrings.SystemFailure_0_MEMORY_HAS_REMAINED_CHRONICALLY_BELOW_1_BYTES_OUT_OF_A_MAXIMUM_OF_2_FOR_3_SEC
+ .toLocalizedString(new Object[] {PROCTOR_NAME, Long.valueOf(minimumMemoryThreshold),
+ Long.valueOf(maxMemory), Integer.valueOf(WATCHDOG_WAIT)}));
+
// Catenation, but should be OK when starting up
- logFine(PROCTOR_NAME, "Starting, threshold = " + minimumMemoryThreshold
- + "; max = " + maxMemory);
+ logFine(PROCTOR_NAME,
+ "Starting, threshold = " + minimumMemoryThreshold + "; max = " + maxMemory);
for (;;) {
if (isCacheClosing) {
break;
@@ -699,19 +670,18 @@ public final class SystemFailure {
}
try {
- //*** catnap...
+ // *** catnap...
try {
Thread.sleep(MEMORY_POLL_INTERVAL * 1000);
- }
- catch (InterruptedException e) {
+ } catch (InterruptedException e) {
// ignore
}
-
+
if (stopping) {
return;
}
- //*** Twitch ear, take a bath...
+ // *** Twitch ear, take a bath...
if (failureActionCompleted) {
// it's all over, we're late
return;
@@ -721,20 +691,20 @@ public final class SystemFailure {
logFine(PROCTOR_NAME, "Failure has been reported, exiting");
return;
}
-
- if(!MONITOR_MEMORY) {
+
+ if (!MONITOR_MEMORY) {
continue;
}
- //*** Sit up, stretch...
+ // *** Sit up, stretch...
long totalMemory = Runtime.getRuntime().totalMemory();
if (totalMemory < maxMemory) {
// We haven't finished growing the heap, so no worries...yet
if (DEBUG) {
// This message has catenation, we don't want this in
// production code :-)
- logFine(PROCTOR_NAME, "totalMemory (" + totalMemory
- + ") < maxMemory (" + maxMemory + ")");
+ logFine(PROCTOR_NAME,
+ "totalMemory (" + totalMemory + ") < maxMemory (" + maxMemory + ")");
}
firstStarveTime = NEVER_STARVED;
continue;
@@ -747,16 +717,16 @@ public final class SystemFailure {
}
lastTotalMemory = totalMemory; // make a note of this
- //*** Hey, is that the food bowl?
-
+ // *** Hey, is that the food bowl?
+
// At this point, freeMemory really indicates how much
// trouble we're in.
long freeMemory = Runtime.getRuntime().freeMemory();
- if(freeMemory==0) {
+ if (freeMemory == 0) {
/*
- * This is to workaround X bug #41821 in JRockit.
- * Often, Jrockit returns 0 from Runtime.getRuntime().freeMemory()
- * Allocating this one object and calling again seems to workaround the problem.
+ * This is to workaround X bug #41821 in JRockit. Often, Jrockit returns 0 from
+ * Runtime.getRuntime().freeMemory() Allocating this one object and calling again seems to
+ * workaround the problem.
*/
new Object();
freeMemory = Runtime.getRuntime().freeMemory();
@@ -769,7 +739,7 @@ public final class SystemFailure {
curThreshold = minimumMemoryThreshold;
lastStarveTime = firstStarveTime;
}
-
+
if (freeMemory >= curThreshold /* enough memory */
|| curThreshold == 0 /* disabled */) {
// Memory is FINE, reset everything
@@ -778,7 +748,7 @@ public final class SystemFailure {
// production code :-)
logFine(PROCTOR_NAME, "Current free memory is: " + freeMemory);
}
-
+
if (lastStarveTime != NEVER_STARVED) {
logFine(PROCTOR_NAME, "...low memory has self-corrected.");
}
@@ -788,20 +758,19 @@ public final class SystemFailure {
continue;
}
// Memory is low
-
- //*** Leap to feet, nose down, tail switching...
+
+ // *** Leap to feet, nose down, tail switching...
long now = System.currentTimeMillis();
if (lastStarveTime == NEVER_STARVED) {
// first sighting
if (DEBUG) {
// Catenation in this message, don't put in production
- logFine(PROCTOR_NAME, "Noting current memory " + freeMemory
- + " is less than threshold " + curThreshold);
- }
- else {
- logWarning(
- PROCTOR_NAME,
- "Noting that current memory available is less than the currently designated threshold", null);
+ logFine(PROCTOR_NAME,
+ "Noting current memory " + freeMemory + " is less than threshold " + curThreshold);
+ } else {
+ logWarning(PROCTOR_NAME,
+ "Noting that current memory available is less than the currently designated threshold",
+ null);
}
synchronized (memorySync) {
@@ -810,69 +779,62 @@ public final class SystemFailure {
System.gc(); // at least TRY...
continue;
}
-
- //*** squirm, wait for the right moment...wait...wait...
+
+ // *** squirm, wait for the right moment...wait...wait...
if (now - lastStarveTime < MEMORY_MAX_WAIT * 1000) {
// Very recent; problem may correct itself.
if (DEBUG) {
// catenation
- logFine(PROCTOR_NAME, "...memory is still below threshold: "
- + freeMemory);
- }
- else {
- logWarning(
- PROCTOR_NAME,
- "Noting that current memory available is still below currently designated threshold", null);
+ logFine(PROCTOR_NAME, "...memory is still below threshold: " + freeMemory);
+ } else {
+ logWarning(PROCTOR_NAME,
+ "Noting that current memory available is still below currently designated threshold",
+ null);
}
continue;
}
-
- //*** Meow! Meow! MEOWWWW!!!!!
-
+
+ // *** Meow! Meow! MEOWWWW!!!!!
+
// Like any smart cat, let the Dog do all the work.
logWarning(PROCTOR_NAME, "Memory is chronically low; setting failure!", null);
SystemFailure.setFailure(oome);
notifyWatchDog();
return; // we're done!
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
logWarning(PROCTOR_NAME, "thread encountered a problem", t);
// We *never* give up. NEVER EVER!
}
} // for
}
-
+
/**
* Enables some fine logging
*/
static private final boolean DEBUG = false;
-
+
/**
- * If true, we track the progress of emergencyClose
- * on System.err
+ * If true, we track the progress of emergencyClose on System.err
*/
static public final boolean TRACE_CLOSE = false;
-
+
static protected final String WATCHDOG_NAME = "SystemFailure Watchdog";
-
+
static protected final String PROCTOR_NAME = "SystemFailure Proctor";
-
+
/**
* break any potential circularity in {@link #loadEmergencyClasses()}
*/
private static volatile boolean emergencyClassesLoaded = false;
-
+
/**
- * Since it requires object memory to unpack a jar file,
- * make sure this JVM has loaded the classes necessary for
- * closure <em>before</em> it becomes necessary to use them.
+ * Since it requires object memory to unpack a jar file, make sure this JVM has loaded the classes
+ * necessary for closure <em>before</em> it becomes necessary to use them.
* <p>
- * Note that just touching the class in order to load it
- * is usually sufficient, so all an implementation needs
- * to do is to reference the same classes used in
- * {@link #emergencyClose()}. Just make sure to do it while
- * you still have memory to succeed!
+ * Note that just touching the class in order to load it is usually sufficient, so all an
+ * implementation needs to do is to reference the same classes used in {@link #emergencyClose()}.
+ * Just make sure to do it while you still have memory to succeed!
*/
public static void loadEmergencyClasses() {
// This method was called to basically load this class
@@ -881,31 +843,31 @@ public final class SystemFailure {
// call startThreads. The watchdog thread will call basicLoadEmergencyClasses.
startThreads();
}
+
private static void basicLoadEmergencyClasses() {
- if (emergencyClassesLoaded) return;
+ if (emergencyClassesLoaded)
+ return;
emergencyClassesLoaded = true;
SystemFailureTestHook.loadEmergencyClasses(); // bug 50516
GemFireCacheImpl.loadEmergencyClasses();
RemoteGfManagerAgent.loadEmergencyClasses();
}
-
+
/**
* Attempt to close any and all GemFire resources.
*
- * The contract of this method is that it should not
- * acquire any synchronization mutexes nor create any objects.
+ * The contract of this method is that it should not acquire any synchronization mutexes nor
+ * create any objects.
* <p>
- * The former is because the system is in an undefined state and
- * attempting to acquire the mutex may cause a hang.
+ * The former is because the system is in an undefined state and attempting to acquire the mutex
+ * may cause a hang.
* <p>
- * The latter is because the likelihood is that we are invoking
- * this method due to memory exhaustion, so any attempt to create
- * an object will also cause a hang.
+ * The latter is because the likelihood is that we are invoking this method due to memory
+ * exhaustion, so any attempt to create an object will also cause a hang.
* <p>
- * This method is not meant to be called directly (but, well, I
- * guess it could). It is public to document the contract
- * that is implemented by <code>emergencyClose</code> in other
- * parts of the system.
+ * This method is not meant to be called directly (but, well, I guess it could). It is public to
+ * document the contract that is implemented by <code>emergencyClose</code> in other parts of the
+ * system.
*/
public static void emergencyClose() {
// Make the cache (more) useless and inaccessible...
@@ -913,19 +875,19 @@ public final class SystemFailure {
System.err.println("SystemFailure: closing GemFireCache");
}
GemFireCacheImpl.emergencyClose();
-
+
// Arcane strange DS's exist in this class:
- if (TRACE_CLOSE) {
+ if (TRACE_CLOSE) {
System.err.println("SystemFailure: closing admins");
}
RemoteGfManagerAgent.emergencyClose();
-
+
// If memory was the problem, make an explicit attempt at
// this point to clean up.
-
- System.gc(); // This will fail if we're out of memory?/
- if (TRACE_CLOSE) {
+ System.gc(); // This will fail if we're out of memory?/
+
+ if (TRACE_CLOSE) {
System.err.println("SystemFailure: end of emergencyClose");
}
}
@@ -935,19 +897,18 @@ public final class SystemFailure {
*
* This method does not return normally.
* <p>
- * Unfortunately, attempting to create a new Throwable at this
- * point may cause the thread to hang (instead of generating
- * another OutOfMemoryError), so we have to make do with whatever
- * Error we have, instead of wrapping it with one pertinent
- * to the current context. See bug 38394.
+ * Unfortunately, attempting to create a new Throwable at this point may cause the thread to hang
+ * (instead of generating another OutOfMemoryError), so we have to make do with whatever Error we
+ * have, instead of wrapping it with one pertinent to the current context. See bug 38394.
*
* @throws Error
*/
static private void throwFailure() throws InternalGemFireError, Error {
// Do not return normally...
- if (failure != null) throw failure;
+ if (failure != null)
+ throw failure;
}
-
+
/**
* Notifies the watchdog thread (assumes that {@link #failure} has been set)
*/
@@ -957,15 +918,15 @@ public final class SystemFailure {
failureSync.notifyAll();
}
}
-
+
/**
- * Utility function to check for failures. If a failure is
- * detected, this methods throws an AssertionFailure.
+ * Utility function to check for failures. If a failure is detected, this methods throws an
+ * AssertionFailure.
*
* @see #initiateFailure(Error)
* @throws InternalGemFireError if the system has been corrupted
- * @throws Error if the system has been corrupted and a thread-specific
- * AssertionError cannot be allocated
+ * @throws Error if the system has been corrupted and a thread-specific AssertionError cannot be
+ * allocated
*/
public static void checkFailure() throws InternalGemFireError, Error {
if (failure == null) {
@@ -976,8 +937,7 @@ public final class SystemFailure {
}
/**
- * Signals that a system failure has occurred and then throws an
- * AssertionError.
+ * Signals that a system failure has occurred and then throws an AssertionError.
*
* @param f the failure to set
* @throws IllegalArgumentException if f is null
@@ -992,52 +952,50 @@ public final class SystemFailure {
/**
* Set the underlying system failure, if not already set.
* <p>
- * This method does not generate an error, and should only be used
- * in circumstances where execution needs to continue, such as when
- * re-implementing {@link ThreadGroup#uncaughtException(Thread, Throwable)}.
+ * This method does not generate an error, and should only be used in circumstances where
+ * execution needs to continue, such as when re-implementing
+ * {@link ThreadGroup#uncaughtException(Thread, Throwable)}.
*
* @param failure the system failure
* @throws IllegalArgumentException if you attempt to set the failure to null
*/
public static void setFailure(Error failure) {
if (failure == null) {
- throw new IllegalArgumentException(LocalizedStrings.SystemFailure_YOU_ARE_NOT_PERMITTED_TO_UNSET_A_SYSTEM_FAILURE.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.SystemFailure_YOU_ARE_NOT_PERMITTED_TO_UNSET_A_SYSTEM_FAILURE
+ .toLocalizedString());
}
if (SystemFailureTestHook.errorIsExpected(failure)) {
return;
}
// created (OutOfMemoryError), and no stack frames are created
- // (StackOverflowError). There is a slight chance that the
+ // (StackOverflowError). There is a slight chance that the
// very first error may get overwritten, but this avoids the
// potential of object creation via a fat lock
SystemFailure.failure = failure;
notifyWatchDog();
}
-
+
/**
* Returns the catastrophic system failure, if any.
* <p>
- * This is usually (though not necessarily) an instance of
- * {@link VirtualMachineError}.
+ * This is usually (though not necessarily) an instance of {@link VirtualMachineError}.
* <p>
- * A return value of null indicates that no system failure has yet been
- * detected.
+ * A return value of null indicates that no system failure has yet been detected.
* <p>
- * Object synchronization can implicitly require object creation (fat locks
- * in JRockit for instance), so the underlying value is not synchronized
- * (it is a volatile). This means the return value from this call is not
- * necessarily the <em>first</em> failure reported by the JVM.
+ * Object synchronization can implicitly require object creation (fat locks in JRockit for
+ * instance), so the underlying value is not synchronized (it is a volatile). This means the
+ * return value from this call is not necessarily the <em>first</em> failure reported by the JVM.
* <p>
- * Note that even if it <em>were</em> synchronized, it would only be a
- * proximal indicator near the time that the JVM crashed, and may not
- * actually reflect the underlying root cause that generated the failure.
- * For instance, if your JVM is running short of memory, this Throwable is
- * probably an innocent victim and <em>not</em> the actual allocation (or
- * series of allocations) that caused your JVM to exhaust memory.
+ * Note that even if it <em>were</em> synchronized, it would only be a proximal indicator near the
+ * time that the JVM crashed, and may not actually reflect the underlying root cause that
+ * generated the failure. For instance, if your JVM is running short of memory, this Throwable is
+ * probably an innocent victim and <em>not</em> the actual allocation (or series of allocations)
+ * that caused your JVM to exhaust memory.
* <p>
- * If this function returns a non-null value, keep in mind that the JVM is
- * very limited. In particular, any attempt to allocate objects may fail
- * if the original failure was an OutOfMemoryError.
+ * If this function returns a non-null value, keep in mind that the JVM is very limited. In
+ * particular, any attempt to allocate objects may fail if the original failure was an
+ * OutOfMemoryError.
*
* @return the failure, if any
*/
@@ -1046,13 +1004,11 @@ public final class SystemFailure {
}
/**
- * Sets a user-defined action that is run in the event
- * that failure has been detected.
- * <p>
- * This action is run <em>after</em> the GemFire cache has been shut down.
- * If it throws any error, it will be reattempted indefinitely until it
- * succeeds. This action may be dynamically modified while the system
- * is running.
+ * Sets a user-defined action that is run in the event that failure has been detected.
+ * <p>
+ * This action is run <em>after</em> the GemFire cache has been shut down. If it throws any error,
+ * it will be reattempted indefinitely until it succeeds. This action may be dynamically modified
+ * while the system is running.
* <p>
* The default action prints the failure stack trace to System.err.
*
@@ -1067,12 +1023,11 @@ public final class SystemFailure {
}
/**
- * Set the memory threshold under which system failure will be
- * notified.
+ * Set the memory threshold under which system failure will be notified.
*
- * This value may be dynamically modified while the system
- * is running. The default is 1048576 bytes. This can be set using the
- * system property <code>gemfire.SystemFailure.chronic_memory_threshold</code>.
+ * This value may be dynamically modified while the system is running. The default is 1048576
+ * bytes. This can be set using the system property
+ * <code>gemfire.SystemFailure.chronic_memory_threshold</code>.
*
* @param newVal threshold in bytes
* @return the old threshold
@@ -1088,39 +1043,39 @@ public final class SystemFailure {
startProctor(); // just in case
return result;
}
-
-// /**
-// * For use by GemStone Quality Assurance Only
-// *
-// * @deprecated TODO remove this
-// */
-// public static void reset() {
-// System.gc();
-// logWarning("DJP", "do not commit SystemFailure#reset", null);
-// failure = null;
-// failureAction = new Runnable() {
-// public void run() {
-// System.err.println("(SystemFailure) JVM corruption has been detected!");
-// failure.printStackTrace();
-// }
-// };
-// gemfireCloseCompleted = false;
-// failureActionCompleted = false;
-// synchronized (failureSync) {
-// if (watchDog != null) {
-// watchDog.interrupt();
-// }
-// watchDog = null;
-// if (watchCat != null) {
-// watchCat.interrupt();
-// }
-// watchCat = null;
-// }
-//
-// startWatchDog();
-// startWatchCat();
-// }
-
+
+ // /**
+ // * For use by GemStone Quality Assurance Only
+ // *
+ // * @deprecated TODO remove this
+ // */
+ // public static void reset() {
+ // System.gc();
+ // logWarning("DJP", "do not commit SystemFailure#reset", null);
+ // failure = null;
+ // failureAction = new Runnable() {
+ // public void run() {
+ // System.err.println("(SystemFailure) JVM corruption has been detected!");
+ // failure.printStackTrace();
+ // }
+ // };
+ // gemfireCloseCompleted = false;
+ // failureActionCompleted = false;
+ // synchronized (failureSync) {
+ // if (watchDog != null) {
+ // watchDog.interrupt();
+ // }
+ // watchDog = null;
+ // if (watchCat != null) {
+ // watchCat.interrupt();
+ // }
+ // watchCat = null;
+ // }
+ //
+ // startWatchDog();
+ // startWatchCat();
+ // }
+
static private boolean logStdErr(String kind, String name, String s, Throwable t) {
// As far as I can tell, this code path doesn't allocate
// any objects!!!!
@@ -1134,16 +1089,15 @@ public final class SystemFailure {
t.printStackTrace();
}
return true;
- }
- catch (Throwable t2) {
+ } catch (Throwable t2) {
// out of luck
return false;
}
}
-
+
/**
- * Logging can require allocation of objects, so we wrap the
- * logger so that failures are silently ignored.
+ * Logging can require allocation of objects, so we wrap the logger so that failures are silently
+ * ignored.
*
* @param s string to print
* @param t the call stack, if any
@@ -1151,41 +1105,41 @@ public final class SystemFailure {
*/
static protected boolean logWarning(String name, String s, Throwable t) {
return logStdErr("warning", name, s, t);
-// if (PREFER_STDERR) {
-// return logStdErr("warning", name, s, t);
-// }
-// try {
-// log.warning(name + ": " + s, t);
-// return true;
-// }
-// catch (Throwable t2) {
-// return logStdErr("warning", name, s, t);
-// }
+ // if (PREFER_STDERR) {
+ // return logStdErr("warning", name, s, t);
+ // }
+ // try {
+ // log.warning(name + ": " + s, t);
+ // return true;
+ // }
+ // catch (Throwable t2) {
+ // return logStdErr("warning", name, s, t);
+ // }
}
-
+
/**
- * Logging can require allocation of objects, so we wrap the
- * logger so that failures are silently ignored.
+ * Logging can require allocation of objects, so we wrap the logger so that failures are silently
+ * ignored.
*
* @param s string to print
*/
static protected void logInfo(String name, String s) {
logStdErr("info", name, s, null);
-// if (PREFER_STDERR) {
-// logStdErr("info", name, s, null);
-// return;
-// }
-// try {
-// log.info(name + ": " + s);
-// }
-// catch (Throwable t) {
-// logStdErr("info", name, s, t);
-// }
+ // if (PREFER_STDERR) {
+ // logStdErr("info", name, s, null);
+ // return;
+ // }
+ // try {
+ // log.info(name + ": " + s);
+ // }
+ // catch (Throwable t) {
+ // logStdErr("info", name, s, t);
+ // }
}
-
+
/**
- * Logging can require allocation of objects, so we wrap the
- * logger so that failures are silently ignored.
+ * Logging can require allocation of objects, so we wrap the logger so that failures are silently
+ * ignored.
*
* @param s string to print
*/
@@ -1193,34 +1147,34 @@ public final class SystemFailure {
if (DEBUG) {
logStdErr("fine", name, s, null);
}
-// if (DEBUG && PREFER_STDERR) {
-// logStdErr("fine", name, s, null);
-// return;
-// }
-// try {
-// log.fine(name + ": " + s);
-// }
-// catch (Throwable t) {
-// if (DEBUG) {
-// logStdErr("fine", name, s, null);
-// }
-// }
+ // if (DEBUG && PREFER_STDERR) {
+ // logStdErr("fine", name, s, null);
+ // return;
+ // }
+ // try {
+ // log.fine(name + ": " + s);
+ // }
+ // catch (Throwable t) {
+ // if (DEBUG) {
+ // logStdErr("fine", name, s, null);
+ // }
+ // }
}
-
+
private static volatile boolean stopping;
-
+
/**
- * This starts up the watchdog and proctor threads.
- * This method is called when a Cache is created.
+ * This starts up the watchdog and proctor threads. This method is called when a Cache is created.
*/
public static void startThreads() {
stopping = false;
startWatchDog();
startProctor();
}
+
/**
- * This stops the threads that implement this service.
- * This method is called when a Cache is closed.
+ * This stops the threads that implement this service. This method is called when a Cache is
+ * closed.
*/
public static void stopThreads() {
// this method fixes bug 45409
@@ -1228,11 +1182,11 @@ public final class SystemFailure {
stopProctor();
stopWatchDog();
}
-
+
static Thread getWatchDogForTest() {
return watchDog;
}
-
+
static Thread getProctorForTest() {
return proctor;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java b/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java
index 06dd0c7..1a4d2d9 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemIsRunningException.java
@@ -1,34 +1,32 @@
/*
- * 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
+ * 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;
/**
- * A <code>SystemIsRunningException</code> is thrown when an operation
- * is attempted that requires that the locator is stopped.
+ * A <code>SystemIsRunningException</code> is thrown when an operation is attempted that requires
+ * that the locator is stopped.
* <p>
- * In some cases this exception may be thrown and the locator will
- * not be running. This will happen if the locator was not stopped
- * cleanly.
- * <p>As of GemFire 5.0 this exception should be named LocatorIsRunningException.
+ * In some cases this exception may be thrown and the locator will not be running. This will happen
+ * if the locator was not stopped cleanly.
+ * <p>
+ * As of GemFire 5.0 this exception should be named LocatorIsRunningException.
*/
public class SystemIsRunningException extends GemFireException {
-private static final long serialVersionUID = 3516268055878767189L;
+ private static final long serialVersionUID = 3516268055878767189L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>SystemIsRunningException</code>.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java b/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java
index 373cead..ae341f5 100644
--- a/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java
+++ b/geode-core/src/main/java/org/apache/geode/ThreadInterruptedException.java
@@ -1,18 +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
+ * 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;
@@ -22,10 +20,11 @@ package org.apache.geode;
@Deprecated
public final class ThreadInterruptedException extends CancelException {
-private static final long serialVersionUID = 6169940883541267514L;
+ private static final long serialVersionUID = 6169940883541267514L;
+
/**
* Do not create instances of this class
*/
- private ThreadInterruptedException() { }
-
+ private ThreadInterruptedException() {}
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/ToDataException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/ToDataException.java b/geode-core/src/main/java/org/apache/geode/ToDataException.java
index e602f3c..a0055a5 100644
--- a/geode-core/src/main/java/org/apache/geode/ToDataException.java
+++ b/geode-core/src/main/java/org/apache/geode/ToDataException.java
@@ -1,41 +1,39 @@
/*
- * 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
+ * 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;
/**
- * A <code>ToDataException</code> is thrown during serialization if
- * {@link DataSerializable#toData} throws an exception or if
- * {@link DataSerializer#toData} is called and returns false.
+ * A <code>ToDataException</code> is thrown during serialization if {@link DataSerializable#toData}
+ * throws an exception or if {@link DataSerializer#toData} is called and returns false.
*
* @since GemFire 6.5
*/
public class ToDataException extends SerializationException {
private static final long serialVersionUID = -2329606027453879918L;
+
/**
* Creates a new <code>ToDataException</code> with the given message
*/
public ToDataException(String message) {
- super(message);
+ super(message);
}
+
/**
- * Creates a new <code>ToDataException</code> with the given message
- * and cause.
+ * Creates a new <code>ToDataException</code> with the given message and cause.
*/
public ToDataException(String message, Throwable cause) {
- super(message, cause);
+ super(message, cause);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java b/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java
index 685e8fc..2cc94db 100644
--- a/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java
+++ b/geode-core/src/main/java/org/apache/geode/UncreatedSystemException.java
@@ -1,36 +1,35 @@
/*
- * 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
+ * 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;
/**
- * An <code>UncreatedSystemException</code> is thrown when the specified
- * locator's directory or configuration file can not be found.
+ * An <code>UncreatedSystemException</code> is thrown when the specified locator's directory or
+ * configuration file can not be found.
* <p>
* The most likely reasons for this are:
* <ul>
- * <li> The wrong locator directory was given.
- * <li> The locator was deleted or never created.
+ * <li>The wrong locator directory was given.
+ * <li>The locator was deleted or never created.
* </ul>
- * <p>As of GemFire 5.0 this exception should be named UncreatedLocatorException.
+ * <p>
+ * As of GemFire 5.0 this exception should be named UncreatedLocatorException.
*/
public class UncreatedSystemException extends NoSystemException {
-private static final long serialVersionUID = 5424354567878425435L;
+ private static final long serialVersionUID = 5424354567878425435L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>UncreatedSystemException</code>.
@@ -38,11 +37,11 @@ private static final long serialVersionUID = 5424354567878425435L;
public UncreatedSystemException(String message) {
super(message);
}
+
/**
- * Creates a new <code>UncreatedSystemException</code> with the given message
- * and cause.
+ * Creates a new <code>UncreatedSystemException</code> with the given message and cause.
*/
public UncreatedSystemException(String message, Throwable cause) {
- super(message, cause);
+ super(message, cause);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java b/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java
index 640629c..4b602e6 100644
--- a/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java
+++ b/geode-core/src/main/java/org/apache/geode/UnmodifiableException.java
@@ -1,31 +1,28 @@
/*
- * 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
+ * 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;
/**
- * A <code>UnmodifiableException</code> is thrown when a
- * an attempt is made to modify a GemFire member configuration attribute
- * that can not currently be modified. In most cases the reason it can
- * not be modified is that the member is active.
+ * A <code>UnmodifiableException</code> is thrown when a an attempt is made to modify a GemFire
+ * member configuration attribute that can not currently be modified. In most cases the reason it
+ * can not be modified is that the member is active.
*/
public class UnmodifiableException extends GemFireException {
-private static final long serialVersionUID = -1043243260052395455L;
+ private static final long serialVersionUID = -1043243260052395455L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>UnmodifiableException</code>.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java b/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java
index c390089..438983a 100644
--- a/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java
+++ b/geode-core/src/main/java/org/apache/geode/UnstartedSystemException.java
@@ -1,37 +1,36 @@
/*
- * 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
+ * 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;
/**
- * An <code>UnstartedSystemException</code> is thrown when the specified
- * locator exists but is not running or could not be connected to.
+ * An <code>UnstartedSystemException</code> is thrown when the specified locator exists but is not
+ * running or could not be connected to.
* <p>
* The most likely reasons for this are:
* <ul>
- * <li> The locator has not completely started.
- * <li> The locator is stopping.
- * <li> The locator died or was killed.
+ * <li>The locator has not completely started.
+ * <li>The locator is stopping.
+ * <li>The locator died or was killed.
* </ul>
- * <p>As of GemFire 5.0 this exception should be named UnstartedLocatorException.
+ * <p>
+ * As of GemFire 5.0 this exception should be named UnstartedLocatorException.
*/
public class UnstartedSystemException extends NoSystemException {
-private static final long serialVersionUID = -4285897556527521788L;
+ private static final long serialVersionUID = -4285897556527521788L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>UnstartedSystemException</code>.
@@ -39,11 +38,11 @@ private static final long serialVersionUID = -4285897556527521788L;
public UnstartedSystemException(String message) {
super(message);
}
+
/**
- * Creates a new <code>UnstartedSystemException</code> with the given message
- * and cause.
+ * Creates a new <code>UnstartedSystemException</code> with the given message and cause.
*/
public UnstartedSystemException(String message, Throwable cause) {
- super(message, cause);
+ super(message, cause);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java b/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
index ec5ed73..7a4bd6a 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminConfig.java
@@ -1,18 +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
+ * 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.admin;
@@ -29,24 +27,23 @@ import java.util.Date;
/**
- * AdminConfig loads/stores the member information list. The list contains
- * all of the members being monitored.
+ * AdminConfig loads/stores the member information list. The list contains all of the members being
+ * monitored.
*
* Config must be of the format:
* <p>
- * <li> Name=What you want displayed as a name for the instance
- * <li> Type=SERVER|CLIENT
- * <li> Host=A valid hostname or IP Address where the instance is
- * running
- * <li> Port=The port you are using to open the monitor port for
- * the instance
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * <li>Name=What you want displayed as a name for the instance
+ * <li>Type=SERVER|CLIENT
+ * <li>Host=A valid hostname or IP Address where the instance is running
+ * <li>Port=The port you are using to open the monitor port for the instance
+ *
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
-public class AdminConfig
-{
+public class AdminConfig {
// Name, Type, Host, Port
- public static Entry[] loadConfig(File file) throws IOException
- {
+ public static Entry[] loadConfig(File file) throws IOException {
// Place all lines into stack
ArrayList entryList = new ArrayList();
@@ -65,17 +62,16 @@ public class AdminConfig
line = line.replace('\t', ' ');
// Skip all empty and comment lines
- if (line.length() != 0 && line.startsWith("#") == false) {
- try {
- entryList.add(new Entry(line));
- } catch (Exception ex) {
- // ignore - drop any lines that are not valid
- }
+ if (line.length() != 0 && line.startsWith("#") == false) {
+ try {
+ entryList.add(new Entry(line));
+ } catch (Exception ex) {
+ // ignore - drop any lines that are not valid
}
- line = fileReader.readLine();
+ }
+ line = fileReader.readLine();
}
- }
- finally {
+ } finally {
if (fileReader != null) {
fileReader.close();
}
@@ -84,20 +80,21 @@ public class AdminConfig
}
}
- return (Entry[])entryList.toArray(new Entry[0]);
+ return (Entry[]) entryList.toArray(new Entry[0]);
}
- public static void storeConfig(File file, AdminConfig.Entry entries[]) throws IOException
- {
+ public static void storeConfig(File file, AdminConfig.Entry entries[]) throws IOException {
FileOutputStream fos = null;
PrintStream ps = null;
try {
fos = new FileOutputStream(file);
ps = new PrintStream(fos);
-
+
// Header
ps.print("#");
- ps.println(LocalizedStrings.AdminConfig_THIS_FILE_IS_GENERATED_BY_ADMINCONSOLE_EDIT_AS_YOU_WISH_BUT_IT_WILL_BE_OVERWRITTEN_IF_IT_IS_MODIFIED_IN_ADMINCONSOLE.toLocalizedString());
+ ps.println(
+ LocalizedStrings.AdminConfig_THIS_FILE_IS_GENERATED_BY_ADMINCONSOLE_EDIT_AS_YOU_WISH_BUT_IT_WILL_BE_OVERWRITTEN_IF_IT_IS_MODIFIED_IN_ADMINCONSOLE
+ .toLocalizedString());
ps.println("#");
ps.println(LocalizedStrings.AdminConfig_MODIFIED_0.toLocalizedString(new Date()));
ps.println("#");
@@ -108,8 +105,7 @@ public class AdminConfig
ps.println(entries[i].toString());
}
ps.flush();
- }
- finally {
+ } finally {
if (ps != null) {
ps.close();
}
@@ -120,27 +116,24 @@ public class AdminConfig
}
- public static class Entry
- {
+ public static class Entry {
public String name;
public String type;
public String host;
public int port;
- public Entry(String line)
- {
- // Split
- String split[] = line.split(",");
+ public Entry(String line) {
+ // Split
+ String split[] = line.split(",");
- // Convert line to parameters
- name = split[0].trim();
- type = split[1].trim();
- host = split[2].trim();
- port = Integer.parseInt(split[3]);
+ // Convert line to parameters
+ name = split[0].trim();
+ type = split[1].trim();
+ host = split[2].trim();
+ port = Integer.parseInt(split[3]);
}
- public Entry(String name, String type, String host, int port)
- {
+ public Entry(String name, String type, String host, int port) {
this.name = name;
this.type = type;
this.host = host;
@@ -148,8 +141,7 @@ public class AdminConfig
}
@Override // GemStoneAddition
- public String toString()
- {
+ public String toString() {
return name + "," + type + "," + host + "," + port;
}
}
[05/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index 6d3fd4b..b62feac 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -1,18 +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
+ * 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;
@@ -33,28 +31,38 @@ import org.apache.geode.pdx.PdxSerializer;
/**
- * Factory class used to create the singleton {@link Cache cache} and connect to the GemFire singleton {@link DistributedSystem distributed system}. If the application wants to connect to GemFire as a client it should use {@link org.apache.geode.cache.client.ClientCacheFactory} instead.
-<p> Once the factory has been configured using its {@link #set(String, String)} method you produce a {@link Cache} by calling the {@link #create()} method.
+ * Factory class used to create the singleton {@link Cache cache} and connect to the GemFire
+ * singleton {@link DistributedSystem distributed system}. If the application wants to connect to
+ * GemFire as a client it should use {@link org.apache.geode.cache.client.ClientCacheFactory}
+ * instead.
+ * <p>
+ * Once the factory has been configured using its {@link #set(String, String)} method you produce a
+ * {@link Cache} by calling the {@link #create()} method.
* <p>
* To get the existing unclosed singleton cache instance call {@link #getAnyInstance}.
* <p>
- * If an instance of {@link DistributedSystem} already exists when this factory
- * creates a cache, that instance will be used if it is compatible with this factory.
-<p>
-The following examples illustrate bootstrapping the cache using region shortcuts:
-<p>
-Example 1: Create a cache and a replicate region named customers.
-<PRE>
- Cache c = new CacheFactory().create();
- Region r = c.createRegionFactory(REPLICATE).create("customers");
-</PRE>
-Example 2: Create a cache and a partition region with redundancy
-<PRE>
- Cache c = new CacheFactory().create();
- Region r = c.createRegionFactory(PARTITION_REDUNDANT).create("customers");
-</PRE>
-Example 3: Construct the cache region declaratively in cache.xml
-<PRE>
+ * If an instance of {@link DistributedSystem} already exists when this factory creates a cache,
+ * that instance will be used if it is compatible with this factory.
+ * <p>
+ * The following examples illustrate bootstrapping the cache using region shortcuts:
+ * <p>
+ * Example 1: Create a cache and a replicate region named customers.
+ *
+ * <PRE>
+ * Cache c = new CacheFactory().create();
+ * Region r = c.createRegionFactory(REPLICATE).create("customers");
+ * </PRE>
+ *
+ * Example 2: Create a cache and a partition region with redundancy
+ *
+ * <PRE>
+ * Cache c = new CacheFactory().create();
+ * Region r = c.createRegionFactory(PARTITION_REDUNDANT).create("customers");
+ * </PRE>
+ *
+ * Example 3: Construct the cache region declaratively in cache.xml
+ *
+ * <PRE>
<!DOCTYPE cache PUBLIC
"-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
"http://www.gemstone.com/dtd/cache8_0.dtd">
@@ -63,17 +71,19 @@ Example 3: Construct the cache region declaratively in cache.xml
<!-- you can override or add to the REPLICATE attributes by adding
a region-attributes sub element here -->
</cache>
-</PRE>
-Now, create the cache telling it to read your cache.xml file:
-<PRE>
- Cache c = new CacheFactory()
- .set("cache-xml-file", "myCache.xml")
- .create();
- Region r = c.getRegion("myRegion");
-</PRE>
-
-<p> For a complete list of all region shortcuts see {@link RegionShortcut}.
-Applications that need to explicitly control the individual region attributes can do this declaratively in XML or using APIs.
+ * </PRE>
+ *
+ * Now, create the cache telling it to read your cache.xml file:
+ *
+ * <PRE>
+ * Cache c = new CacheFactory().set("cache-xml-file", "myCache.xml").create();
+ * Region r = c.getRegion("myRegion");
+ * </PRE>
+ *
+ * <p>
+ * For a complete list of all region shortcuts see {@link RegionShortcut}. Applications that need to
+ * explicitly control the individual region attributes can do this declaratively in XML or using
+ * APIs.
*
*
*
@@ -82,20 +92,22 @@ Applications that need to explicitly control the individual region attributes ca
public class CacheFactory {
private final Properties dsProps;
-
- private final CacheConfig cacheConfig = new CacheConfig();
-
+
+ private final CacheConfig cacheConfig = new CacheConfig();
+
/**
* Creates a default cache factory.
+ *
* @since GemFire 6.5
*/
public CacheFactory() {
this(null);
}
+
/**
- * Create a CacheFactory initialized with the given gemfire properties.
- * For a list of valid GemFire properties and their meanings
- * see {@linkplain ConfigurationProperties}.
+ * Create a CacheFactory initialized with the given gemfire properties. For a list of valid
+ * GemFire properties and their meanings see {@linkplain ConfigurationProperties}.
+ *
* @param props the gemfire properties to initialize the factory with.
* @since GemFire 6.5
*/
@@ -107,9 +119,9 @@ public class CacheFactory {
}
/**
- * Sets a gemfire property that will be used when creating the Cache.
- * For a list of valid GemFire properties and their meanings
- * see {@link ConfigurationProperties}.
+ * Sets a gemfire property that will be used when creating the Cache. For a list of valid GemFire
+ * properties and their meanings see {@link ConfigurationProperties}.
+ *
* @param name the name of the gemfire property
* @param value the value of the gemfire property
* @return a reference to this CacheFactory object
@@ -119,107 +131,80 @@ public class CacheFactory {
this.dsProps.setProperty(name, value);
return this;
}
+
/**
* Creates a new cache that uses the specified <code>system</code>.
*
* <p>
*
- * The <code>system</code> can specify a <A
- * href="../distributed/DistributedSystem.html#cache-xml-file">"cache-xml-file"</a>
- * property which will cause this creation to also create the
- * regions, objects, and attributes declared in the file. The
- * contents of the file must comply with the
- * <code>"doc-files/cache8_0.dtd"></code> file.
- * Note that when parsing the XML file {@link Declarable} classes
- * are loaded using the current thread's {@linkplain
- * Thread#getContextClassLoader context class loader}.
+ * The <code>system</code> can specify a
+ * <A href="../distributed/DistributedSystem.html#cache-xml-file">"cache-xml-file"</a> property
+ * which will cause this creation to also create the regions, objects, and attributes declared in
+ * the file. The contents of the file must comply with the <code>"doc-files/cache8_0.dtd"></code>
+ * file. Note that when parsing the XML file {@link Declarable} classes are loaded using the
+ * current thread's {@linkplain Thread#getContextClassLoader context class loader}.
*
- * @param system
- * a <code>DistributedSystem</code> obtained by calling
+ * @param system a <code>DistributedSystem</code> obtained by calling
* {@link DistributedSystem#connect}.
*
- * @return a <code>Cache</code> that uses the specified
- * <code>system</code> for distribution.
+ * @return a <code>Cache</code> that uses the specified <code>system</code> for distribution.
*
- * @throws IllegalArgumentException
- * If <code>system</code> is not {@link
- * DistributedSystem#isConnected connected}.
- * @throws CacheExistsException
- * If an open cache already exists.
- * @throws CacheXmlException
- * If a problem occurs while parsing the declarative caching
- * XML file.
- * @throws TimeoutException
- * If a {@link Region#put(Object, Object)} times out while initializing the
- * cache.
- * @throws CacheWriterException
- * If a <code>CacheWriterException</code> is thrown while
+ * @throws IllegalArgumentException If <code>system</code> is not
+ * {@link DistributedSystem#isConnected connected}.
+ * @throws CacheExistsException If an open cache already exists.
+ * @throws CacheXmlException If a problem occurs while parsing the declarative caching XML file.
+ * @throws TimeoutException If a {@link Region#put(Object, Object)} times out while initializing
+ * the cache.
+ * @throws CacheWriterException If a <code>CacheWriterException</code> is thrown while
* initializing the cache.
- * @throws GatewayException
- * If a <code>GatewayException</code> is thrown while
- * initializing the cache.
- * @throws RegionExistsException
- * If the declarative caching XML file describes a region
- * that already exists (including the root region).
+ * @throws GatewayException If a <code>GatewayException</code> is thrown while initializing the
+ * cache.
+ * @throws RegionExistsException If the declarative caching XML file describes a region that
+ * already exists (including the root region).
* @deprecated as of 6.5 use {@link #CacheFactory(Properties)} instead.
*/
@Deprecated
- public static synchronized Cache create(DistributedSystem system)
- throws CacheExistsException, TimeoutException, CacheWriterException,
- GatewayException,
- RegionExistsException
- {
+ public static synchronized Cache create(DistributedSystem system) throws CacheExistsException,
+ TimeoutException, CacheWriterException, GatewayException, RegionExistsException {
return create(system, false, new CacheConfig());
}
-
- private static synchronized Cache create(DistributedSystem system, boolean existingOk, CacheConfig cacheConfig)
- throws CacheExistsException, TimeoutException, CacheWriterException,
- GatewayException,
- RegionExistsException
- {
+
+ private static synchronized Cache create(DistributedSystem system, boolean existingOk,
+ CacheConfig cacheConfig) throws CacheExistsException, TimeoutException, CacheWriterException,
+ GatewayException, RegionExistsException {
// Moved code in this method to GemFireCacheImpl.create
return GemFireCacheImpl.create(system, existingOk, cacheConfig);
}
/**
- * Creates a new cache that uses the configured distributed system.
- * If a connected distributed system already exists it will be used
- * if it is compatible with the properties on this factory.
- * Otherwise a a distributed system will be created with the configured properties.
- * If a cache already exists it will be returned.
- * <p>If the cache does need to be created it will also be initialized from
- * cache.xml if it exists.
+ * Creates a new cache that uses the configured distributed system. If a connected distributed
+ * system already exists it will be used if it is compatible with the properties on this factory.
+ * Otherwise a a distributed system will be created with the configured properties. If a cache
+ * already exists it will be returned.
+ * <p>
+ * If the cache does need to be created it will also be initialized from cache.xml if it exists.
*
* @return the created or already existing singleton cache
*
- * @throws CacheXmlException
- * If a problem occurs while parsing the declarative caching
- * XML file.
- * @throws TimeoutException
- * If a {@link Region#put(Object, Object)} times out while initializing the
- * cache.
- * @throws CacheWriterException
- * If a <code>CacheWriterException</code> is thrown while
+ * @throws CacheXmlException If a problem occurs while parsing the declarative caching XML file.
+ * @throws TimeoutException If a {@link Region#put(Object, Object)} times out while initializing
+ * the cache.
+ * @throws CacheWriterException If a <code>CacheWriterException</code> is thrown while
* initializing the cache.
- * @throws GatewayException
- * If a <code>GatewayException</code> is thrown while
- * initializing the cache.
- * @throws RegionExistsException
- * If the declarative caching XML file describes a region
- * that already exists (including the root region).
- * @throws IllegalStateException if cache already exists and is not compatible
- * with the new configuration.
+ * @throws GatewayException If a <code>GatewayException</code> is thrown while initializing the
+ * cache.
+ * @throws RegionExistsException If the declarative caching XML file describes a region that
+ * already exists (including the root region).
+ * @throws IllegalStateException if cache already exists and is not compatible with the new
+ * configuration.
* @throws AuthenticationFailedException if authentication fails.
- * @throws AuthenticationRequiredException if the distributed system is in secure mode
- * and this new member is not configured with security credentials.
+ * @throws AuthenticationRequiredException if the distributed system is in secure mode and this
+ * new member is not configured with security credentials.
* @since GemFire 6.5
*/
public Cache create()
- throws TimeoutException, CacheWriterException,
- GatewayException,
- RegionExistsException
- {
- synchronized(CacheFactory.class) {
+ throws TimeoutException, CacheWriterException, GatewayException, RegionExistsException {
+ synchronized (CacheFactory.class) {
DistributedSystem ds = null;
if (this.dsProps.isEmpty()) {
// any ds will do
@@ -233,20 +218,21 @@ public class CacheFactory {
}
/**
- * Gets the instance of {@link Cache} produced by an
- * earlier call to {@link #create()}.
+ * Gets the instance of {@link Cache} produced by an earlier call to {@link #create()}.
+ *
* @param system the <code>DistributedSystem</code> the cache was created with.
* @return the {@link Cache} associated with the specified system.
- * @throws CacheClosedException if a cache has not been created
- * or the created one is {@link Cache#isClosed closed}
+ * @throws CacheClosedException if a cache has not been created or the created one is
+ * {@link Cache#isClosed closed}
*/
public static Cache getInstance(DistributedSystem system) {
return basicGetInstance(system, false);
}
/**
- * Gets the instance of {@link Cache} produced by an
- * earlier call to {@link #create()} even if it has been closed.
+ * Gets the instance of {@link Cache} produced by an earlier call to {@link #create()} even if it
+ * has been closed.
+ *
* @param system the <code>DistributedSystem</code> the cache was created with.
* @return the {@link Cache} associated with the specified system.
* @throws CacheClosedException if a cache has not been created
@@ -261,8 +247,8 @@ public class CacheFactory {
// Avoid synchronization if this is an initialization thread to avoid
// deadlock when messaging returns to this VM
final int initReq = LocalRegion.threadInitLevelRequirement();
- if (initReq == LocalRegion.ANY_INIT
- || initReq == LocalRegion.BEFORE_INITIAL_IMAGE) { // fix bug 33471
+ if (initReq == LocalRegion.ANY_INIT || initReq == LocalRegion.BEFORE_INITIAL_IMAGE) { // fix bug
+ // 33471
return basicGetInstancePart2(system, closeOk);
} else {
synchronized (CacheFactory.class) {
@@ -270,70 +256,80 @@ public class CacheFactory {
}
}
}
+
private static Cache basicGetInstancePart2(DistributedSystem system, boolean closeOk) {
GemFireCacheImpl instance = GemFireCacheImpl.getInstance();
if (instance == null) {
- throw new CacheClosedException(LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED.toLocalizedString());
+ throw new CacheClosedException(
+ LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED.toLocalizedString());
} else {
if (instance.isClosed() && !closeOk) {
- throw instance.getCacheClosedException(LocalizedStrings.CacheFactory_THE_CACHE_HAS_BEEN_CLOSED.toLocalizedString(), null);
+ throw instance.getCacheClosedException(
+ LocalizedStrings.CacheFactory_THE_CACHE_HAS_BEEN_CLOSED.toLocalizedString(), null);
}
if (!instance.getDistributedSystem().equals(system)) {
- throw new CacheClosedException(LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED_FOR_THE_GIVEN_DISTRIBUTED_SYSTEM.toLocalizedString());
+ throw new CacheClosedException(
+ LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED_FOR_THE_GIVEN_DISTRIBUTED_SYSTEM
+ .toLocalizedString());
}
return instance;
}
}
/**
- * Gets an arbitrary open instance of {@link Cache} produced by an
- * earlier call to {@link #create()}.
- * @throws CacheClosedException if a cache has not been created
- * or the only created one is {@link Cache#isClosed closed}
+ * Gets an arbitrary open instance of {@link Cache} produced by an earlier call to
+ * {@link #create()}.
+ *
+ * @throws CacheClosedException if a cache has not been created or the only created one is
+ * {@link Cache#isClosed closed}
*/
public static synchronized Cache getAnyInstance() {
GemFireCacheImpl instance = GemFireCacheImpl.getInstance();
if (instance == null) {
- throw new CacheClosedException(LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED.toLocalizedString());
+ throw new CacheClosedException(
+ LocalizedStrings.CacheFactory_A_CACHE_HAS_NOT_YET_BEEN_CREATED.toLocalizedString());
} else {
instance.getCancelCriterion().checkCancelInProgress(null);
return instance;
}
}
- /** Returns the version of the cache implementation.
+ /**
+ * Returns the version of the cache implementation.
+ *
* @return the version of the cache implementation as a <code>String</code>
*/
public static String getVersion() {
return GemFireVersion.getGemFireVersion();
}
-
- /** Sets the object preference to PdxInstance type.
- * When a cached object that was serialized as a PDX is read
- * from the cache a {@link PdxInstance} will be returned instead of the actual domain class.
- * The PdxInstance is an interface that provides run time access to
- * the fields of a PDX without deserializing the entire PDX.
- * The PdxInstance implementation is a light weight wrapper
- * that simply refers to the raw bytes of the PDX that are kept
- * in the cache. Using this method applications can choose to
- * access PdxInstance instead of Java object.
- * <p>Note that a PdxInstance is only returned if a serialized PDX is found in the cache.
- * If the cache contains a deserialized PDX, then a domain class instance is returned instead of a PdxInstance.
- *
- * @param readSerialized true to prefer PdxInstance
- * @return this CacheFactory
- * @since GemFire 6.6
- * @see org.apache.geode.pdx.PdxInstance
+
+ /**
+ * Sets the object preference to PdxInstance type. When a cached object that was serialized as a
+ * PDX is read from the cache a {@link PdxInstance} will be returned instead of the actual domain
+ * class. The PdxInstance is an interface that provides run time access to the fields of a PDX
+ * without deserializing the entire PDX. The PdxInstance implementation is a light weight wrapper
+ * that simply refers to the raw bytes of the PDX that are kept in the cache. Using this method
+ * applications can choose to access PdxInstance instead of Java object.
+ * <p>
+ * Note that a PdxInstance is only returned if a serialized PDX is found in the cache. If the
+ * cache contains a deserialized PDX, then a domain class instance is returned instead of a
+ * PdxInstance.
+ *
+ * @param readSerialized true to prefer PdxInstance
+ * @return this CacheFactory
+ * @since GemFire 6.6
+ * @see org.apache.geode.pdx.PdxInstance
*/
- public CacheFactory setPdxReadSerialized(boolean readSerialized) {
+ public CacheFactory setPdxReadSerialized(boolean readSerialized) {
this.cacheConfig.setPdxReadSerialized(readSerialized);
return this;
}
-
+
/**
- * Set the PDX serializer for the cache. If this serializer is set,
- * it will be consulted to see if it can serialize any domain classes which are
- * added to the cache in portable data exchange format.
+ * Set the PDX serializer for the cache. If this serializer is set, it will be consulted to see if
+ * it can serialize any domain classes which are added to the cache in portable data exchange
+ * format.
+ *
* @param serializer the serializer to use
* @return this CacheFactory
* @since GemFire 6.6
@@ -343,16 +339,15 @@ public class CacheFactory {
this.cacheConfig.setPdxSerializer(serializer);
return this;
}
-
+
/**
- * Set the disk store that is used for PDX meta data. When
- * serializing objects in the PDX format, the type definitions
- * are persisted to disk. This setting controls which disk store
- * is used for that persistence.
+ * Set the disk store that is used for PDX meta data. When serializing objects in the PDX format,
+ * the type definitions are persisted to disk. This setting controls which disk store is used for
+ * that persistence.
*
* If not set, the metadata will go in the default disk store.
- * @param diskStoreName the name of the disk store to use
- * for the PDX metadata.
+ *
+ * @param diskStoreName the name of the disk store to use for the PDX metadata.
* @return this CacheFactory
* @since GemFire 6.6
*/
@@ -362,14 +357,12 @@ public class CacheFactory {
}
/**
- * Control whether the type metadata for PDX objects is persisted to disk. The
- * default for this setting is false. If you are using persistent regions with
- * PDX then you must set this to true. If you are using a
- * <code>GatewaySender</code> or <code>AsyncEventQueue</code> with PDX then
- * you should set this to true.
+ * Control whether the type metadata for PDX objects is persisted to disk. The default for this
+ * setting is false. If you are using persistent regions with PDX then you must set this to true.
+ * If you are using a <code>GatewaySender</code> or <code>AsyncEventQueue</code> with PDX then you
+ * should set this to true.
*
- * @param isPersistent
- * true if the metadata should be persistent
+ * @param isPersistent true if the metadata should be persistent
* @return this CacheFactory
* @since GemFire 6.6
*/
@@ -377,17 +370,18 @@ public class CacheFactory {
this.cacheConfig.setPdxPersistent(isPersistent);
return this;
}
+
/**
- * Control whether pdx ignores fields that were unread during deserialization.
- * The default is to preserve unread fields be including their data during serialization.
- * But if you configure the cache to ignore unread fields then their data will be lost
- * during serialization.
- * <P>You should only set this attribute to <code>true</code> if you know this member
- * will only be reading cache data. In this use case you do not need to pay the cost
- * of preserving the unread fields since you will never be reserializing pdx data.
+ * Control whether pdx ignores fields that were unread during deserialization. The default is to
+ * preserve unread fields be including their data during serialization. But if you configure the
+ * cache to ignore unread fields then their data will be lost during serialization.
+ * <P>
+ * You should only set this attribute to <code>true</code> if you know this member will only be
+ * reading cache data. In this use case you do not need to pay the cost of preserving the unread
+ * fields since you will never be reserializing pdx data.
*
- * @param ignore <code>true</code> if fields not read during pdx deserialization should be ignored;
- * <code>false</code>, the default, if they should be preserved.
+ * @param ignore <code>true</code> if fields not read during pdx deserialization should be
+ * ignored; <code>false</code>, the default, if they should be preserved.
* @return this CacheFactory
* @since GemFire 6.6
*/
@@ -395,5 +389,5 @@ public class CacheFactory {
this.cacheConfig.setPdxIgnoreUnreadFields(ignore);
return this;
}
-}
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java b/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
index db4bb3c..8f23238 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheListener.java
@@ -1,18 +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
+ * 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;
@@ -28,35 +26,30 @@ package org.apache.geode.cache;
*
* <h4>Avoiding the risk of deadlock</h4>
* <p>
- * The methods on a <code>CacheListener</code> are invoked while holding a lock
- * on the entry described by the {@link EntryEvent}, as a result if the listener
- * method takes a long time to execute then it will cause the operation that
- * caused it to be invoked to take a long time. In addition, listener code which
- * calls {@link Region} methods could result in a deadlock. For example, in
- * {@link #afterUpdate(EntryEvent)} for entry key k1,
- * {@link Region#put(Object, Object) put(k2, someVal)} is called at the same
- * time {@link #afterUpdate(EntryEvent)} for entry key k2 calls
- * {@link Region#put(Object, Object) put(k1, someVal)} a deadlock may result.
- * This co-key dependency example can be extended to a co-Region dependency
- * where listener code in Region "A" performs Region operations on "B" and
- * listener code in Region "B" performs Region operations on "A". Deadlocks may
- * be either java-level or distributed multi-VM dead locks depending on Region
- * configuration. To be assured of no deadlocks, listener code should cause some
- * other thread to access the region and must not wait for that thread to
- * complete the task.
+ * The methods on a <code>CacheListener</code> are invoked while holding a lock on the entry
+ * described by the {@link EntryEvent}, as a result if the listener method takes a long time to
+ * execute then it will cause the operation that caused it to be invoked to take a long time. In
+ * addition, listener code which calls {@link Region} methods could result in a deadlock. For
+ * example, in {@link #afterUpdate(EntryEvent)} for entry key k1, {@link Region#put(Object, Object)
+ * put(k2, someVal)} is called at the same time {@link #afterUpdate(EntryEvent)} for entry key k2
+ * calls {@link Region#put(Object, Object) put(k1, someVal)} a deadlock may result. This co-key
+ * dependency example can be extended to a co-Region dependency where listener code in Region "A"
+ * performs Region operations on "B" and listener code in Region "B" performs Region operations on
+ * "A". Deadlocks may be either java-level or distributed multi-VM dead locks depending on Region
+ * configuration. To be assured of no deadlocks, listener code should cause some other thread to
+ * access the region and must not wait for that thread to complete the task.
* </p>
*
* <h4>Concurrency</h4>
* <p>
* Multiple events, on different entries, can cause concurrent invocation of
- * <code>CacheListener</code> methods. Any exceptions thrown by the listener are
- * caught by GemFire and logged.
+ * <code>CacheListener</code> methods. Any exceptions thrown by the listener are caught by GemFire
+ * and logged.
* </p>
*
- * <h4>Declaring instances in Cache XML files</h4>
+ * <h4>Declaring instances in Cache XML files</h4>
* <p>
- * To declare a CacheListener in a Cache XML file, it must also implement
- * {@link Declarable}
+ * To declare a CacheListener in a Cache XML file, it must also implement {@link Declarable}
* </p>
*
*
@@ -68,29 +61,27 @@ package org.apache.geode.cache;
* @see AttributesMutator#initCacheListeners
* @since GemFire 3.0
*/
-public interface CacheListener<K,V> extends CacheCallback {
+public interface CacheListener<K, V> extends CacheCallback {
/**
- * Handles the event of new key being added to a region. The entry did not
- * previously exist in this region in the local cache (even with a null
- * value).
+ * Handles the event of new key being added to a region. The entry did not previously exist in
+ * this region in the local cache (even with a null value).
*
* @param event the EntryEvent
* @see Region#create(Object, Object)
* @see Region#put(Object, Object)
* @see Region#get(Object)
*/
- public void afterCreate(EntryEvent<K,V> event);
+ public void afterCreate(EntryEvent<K, V> event);
/**
- * Handles the event of an entry's value being modified in a region. This
- * entry previously existed in this region in the local cache, but its
- * previous value may have been null.
+ * Handles the event of an entry's value being modified in a region. This entry previously existed
+ * in this region in the local cache, but its previous value may have been null.
*
* @param event the EntryEvent
* @see Region#put(Object, Object)
*/
- public void afterUpdate(EntryEvent<K,V> event);
+ public void afterUpdate(EntryEvent<K, V> event);
/**
* Handles the event of an entry's value being invalidated.
@@ -98,7 +89,7 @@ public interface CacheListener<K,V> extends CacheCallback {
* @param event the EntryEvent
* @see Region#invalidate(Object)
*/
- public void afterInvalidate(EntryEvent<K,V> event);
+ public void afterInvalidate(EntryEvent<K, V> event);
/**
* Handles the event of an entry being destroyed.
@@ -106,25 +97,23 @@ public interface CacheListener<K,V> extends CacheCallback {
* @param event the EntryEvent
* @see Region#destroy(Object)
*/
- public void afterDestroy(EntryEvent<K,V> event);
+ public void afterDestroy(EntryEvent<K, V> event);
/**
- * Handles the event of a region being invalidated. Events are not invoked for
- * each individual value that is invalidated as a result of the region being
- * invalidated. Each subregion, however, gets its own
- * <code>regionInvalidated</code> event invoked on its listener.
+ * Handles the event of a region being invalidated. Events are not invoked for each individual
+ * value that is invalidated as a result of the region being invalidated. Each subregion, however,
+ * gets its own <code>regionInvalidated</code> event invoked on its listener.
*
* @param event the RegionEvent
* @see Region#invalidateRegion()
* @see Region#localInvalidateRegion()
*/
- public void afterRegionInvalidate(RegionEvent<K,V> event);
+ public void afterRegionInvalidate(RegionEvent<K, V> event);
/**
- * Handles the event of a region being destroyed. Events are not invoked for
- * each individual entry that is destroyed as a result of the region being
- * destroyed. Each subregion, however, gets its own
- * <code>afterRegionDestroyed</code> event invoked on its listener.
+ * Handles the event of a region being destroyed. Events are not invoked for each individual entry
+ * that is destroyed as a result of the region being destroyed. Each subregion, however, gets its
+ * own <code>afterRegionDestroyed</code> event invoked on its listener.
*
* @param event the RegionEvent
* @see Region#destroyRegion()
@@ -132,26 +121,25 @@ public interface CacheListener<K,V> extends CacheCallback {
* @see Region#close
* @see Cache#close()
*/
- public void afterRegionDestroy(RegionEvent<K,V> event);
+ public void afterRegionDestroy(RegionEvent<K, V> event);
/**
- * Handles the event of a region being cleared. Events are not invoked for
- * each individual entry that is removed as a result of the region being
- * cleared.
+ * Handles the event of a region being cleared. Events are not invoked for each individual entry
+ * that is removed as a result of the region being cleared.
*
* @param event the RegionEvent
*
* @see Region#clear
* @since GemFire 5.0
*/
- public void afterRegionClear(RegionEvent<K,V> event);
-
+ public void afterRegionClear(RegionEvent<K, V> event);
+
/**
- * Handles the event of a region being created. Events are invoked for
- * each individual region that is created.
- * <p>Note that this method is only called
- * for creates done in the local vm. To be notified of creates done in remote
- * vms use {@link RegionMembershipListener#afterRemoteRegionCreate}.
+ * Handles the event of a region being created. Events are invoked for each individual region that
+ * is created.
+ * <p>
+ * Note that this method is only called for creates done in the local vm. To be notified of
+ * creates done in remote vms use {@link RegionMembershipListener#afterRemoteRegionCreate}.
*
* @param event the RegionEvent
*
@@ -159,7 +147,7 @@ public interface CacheListener<K,V> extends CacheCallback {
* @see Region#createSubregion
* @since GemFire 5.0
*/
- public void afterRegionCreate(RegionEvent<K,V> event);
+ public void afterRegionCreate(RegionEvent<K, V> event);
/**
* Handles the event of a region being live after receiving the marker from the server.
@@ -169,5 +157,5 @@ public interface CacheListener<K,V> extends CacheCallback {
* @see Cache#readyForEvents
* @since GemFire 5.5
*/
- public void afterRegionLive(RegionEvent<K,V> event);
+ public void afterRegionLive(RegionEvent<K, V> event);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java b/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java
index 7bb30c7..8812816 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheLoader.java
@@ -1,32 +1,28 @@
/*
- * 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
+ * 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;
/**
- * Allows data from outside of the VM to be placed into a region.
- * When {@link org.apache.geode.cache.Region#get(Object)} is called for a region
- * entry that has a <code>null</code> value, the
- * {@link CacheLoader#load load} method of the
- * region's cache loader is invoked. The <code>load</code> method
- * creates the value for the desired key by performing an operation such
- * as a database query. The <code>load</code> may also perform a
- * {@linkplain LoaderHelper#netSearch net search}
- * that will look for the value in a cache instance hosted by
- * another member of the distributed system.</p>
+ * Allows data from outside of the VM to be placed into a region. When
+ * {@link org.apache.geode.cache.Region#get(Object)} is called for a region entry that has a
+ * <code>null</code> value, the {@link CacheLoader#load load} method of the region's cache loader is
+ * invoked. The <code>load</code> method creates the value for the desired key by performing an
+ * operation such as a database query. The <code>load</code> may also perform a
+ * {@linkplain LoaderHelper#netSearch net search} that will look for the value in a cache instance
+ * hosted by another member of the distributed system.
+ * </p>
*
*
*
@@ -35,29 +31,25 @@ package org.apache.geode.cache;
* @see AttributesMutator#setCacheLoader
* @since GemFire 2.0
*/
-public interface CacheLoader<K,V> extends CacheCallback {
+public interface CacheLoader<K, V> extends CacheCallback {
/**
- * Loads a value. Application writers should implement this
- * method to customize the loading of a value. This method is called
- * by the caching service when the requested value is not in the cache.
- * Any exception (including an unchecked exception) thrown by this
- * method is propagated back to and thrown by the invocation of
- * {@link Region#get(Object, Object)} that triggered this load.
+ * Loads a value. Application writers should implement this method to customize the loading of a
+ * value. This method is called by the caching service when the requested value is not in the
+ * cache. Any exception (including an unchecked exception) thrown by this method is propagated
+ * back to and thrown by the invocation of {@link Region#get(Object, Object)} that triggered this
+ * load.
* <p>
*
- * @param helper a LoaderHelper object that is passed in from cache service
- * and provides access to the key, region, argument, and <code>netSearch</code>.
- * @return the value supplied for this key, or null if no value can be
- * supplied. A local loader will always be invoked if one exists.
- * Otherwise one remote loader is invoked.
- * Returning <code>null</code> causes
- * {@link Region#get(Object, Object)} to return <code>null</code>.
- * @throws CacheLoaderException, if an error occurs. This exception or any
- * other exception thrown by this method will be propagated back to the
- * application from the get method.
+ * @param helper a LoaderHelper object that is passed in from cache service and provides access to
+ * the key, region, argument, and <code>netSearch</code>.
+ * @return the value supplied for this key, or null if no value can be supplied. A local loader
+ * will always be invoked if one exists. Otherwise one remote loader is invoked. Returning
+ * <code>null</code> causes {@link Region#get(Object, Object)} to return
+ * <code>null</code>.
+ * @throws CacheLoaderException, if an error occurs. This exception or any other exception thrown
+ * by this method will be propagated back to the application from the get method.
*
- * @see Region#get(Object, Object) Region.get
+ * @see Region#get(Object, Object) Region.get
*/
- public V load(LoaderHelper<K,V> helper)
- throws CacheLoaderException;
+ public V load(LoaderHelper<K, V> helper) throws CacheLoaderException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheLoaderException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheLoaderException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheLoaderException.java
index 30e8ebe..65d147a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheLoaderException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheLoaderException.java
@@ -1,25 +1,24 @@
/*
- * 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
+ * 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;
-/** Thrown from the {@link CacheLoader#load} method indicating that an error
- * occurred when a CacheLoader was attempting to load a value. This
- * exception is propagated back to the caller of <code>Region.get</code>.
+/**
+ * Thrown from the {@link CacheLoader#load} method indicating that an error occurred when a
+ * CacheLoader was attempting to load a value. This exception is propagated back to the caller of
+ * <code>Region.get</code>.
*
*
*
@@ -28,35 +27,37 @@ package org.apache.geode.cache;
* @since GemFire 3.0
*/
public class CacheLoaderException extends OperationAbortedException {
-private static final long serialVersionUID = -3383072059406642140L;
-
+ private static final long serialVersionUID = -3383072059406642140L;
+
/**
* Creates a new instance of <code>CacheLoaderException</code>.
*/
- public CacheLoaderException() {
- }
-
-
+ public CacheLoaderException() {}
+
+
/**
* Constructs an instance of <code>CacheLoaderException</code> with the specified detail message.
+ *
* @param msg the detail message
*/
public CacheLoaderException(String msg) {
super(msg);
}
-
+
/**
* Constructs an instance of <code>CacheLoaderException</code> with the specified detail message
* and cause.
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
public CacheLoaderException(String msg, Throwable cause) {
super(msg, cause);
}
-
+
/**
* Constructs an instance of <code>CacheLoaderException</code> with the specified cause.
+ *
* @param cause the causal Throwable
*/
public CacheLoaderException(Throwable cause) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
index d103e6a..a723b32 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheRuntimeException.java
@@ -1,27 +1,25 @@
/*
- * 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
+ * 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;
import org.apache.geode.GemFireException;
-/** A generic runtime exception that indicates
- * a cache error has occurred. All the other runtime cache exceptions are the
- * subclass of this class. This class is abstract so only subclasses can be
+/**
+ * A generic runtime exception that indicates a cache error has occurred. All the other runtime
+ * cache exceptions are the subclass of this class. This class is abstract so only subclasses can be
* instantiated
*
*
@@ -33,30 +31,32 @@ public abstract class CacheRuntimeException extends GemFireException {
/**
* Creates a new instance of <code>CacheRuntimeException</code> without detail message.
*/
- public CacheRuntimeException() {
- }
-
-
+ public CacheRuntimeException() {}
+
+
/**
* Constructs an instance of <code>CacheRuntimeException</code> with the specified detail message.
+ *
* @param msg the detail message
*/
public CacheRuntimeException(String msg) {
super(msg);
}
-
+
/**
* Constructs an instance of <code>CacheRuntimeException</code> with the specified detail message
* and cause.
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
public CacheRuntimeException(String msg, Throwable cause) {
super(msg, cause);
}
-
+
/**
* Constructs an instance of <code>CacheRuntimeException</code> with the specified cause.
+ *
* @param cause the causal Throwable
*/
public CacheRuntimeException(Throwable cause) {
@@ -71,9 +71,7 @@ public abstract class CacheRuntimeException extends GemFireException {
String causeStr = cause.toString();
final String glue = ", caused by ";
StringBuffer sb = new StringBuffer(result.length() + causeStr.length() + glue.length());
- sb.append(result)
- .append(glue)
- .append(causeStr);
+ sb.append(result).append(glue).append(causeStr);
result = sb.toString();
}
return result;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java b/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
index 5738c30..05839cc 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheStatistics.java
@@ -1,26 +1,23 @@
/*
- * 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
+ * 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;
/**
- * Defines common statistics information
- * for both region and entries. All of these methods may throw a
- * CacheClosedException, RegionDestroyedException or an EntryDestroyedException.
+ * Defines common statistics information for both region and entries. All of these methods may throw
+ * a CacheClosedException, RegionDestroyedException or an EntryDestroyedException.
*
*
*
@@ -29,26 +26,23 @@ package org.apache.geode.cache;
* @since GemFire 2.0
*/
-public interface CacheStatistics
-{
- /** For an entry, returns the time that the entry's value was last modified;
- * for a region, the last time any of the region's entries' values or the
- * values in subregions' entries were modified. The
- * modification may have been initiated locally or it may have been an update
- * distributed from another cache. It may also have been a new value provided
- * by a loader. The modification time on a region is propagated upward to parent
- * regions, transitively, to the root region.
+public interface CacheStatistics {
+ /**
+ * For an entry, returns the time that the entry's value was last modified; for a region, the last
+ * time any of the region's entries' values or the values in subregions' entries were modified.
+ * The modification may have been initiated locally or it may have been an update distributed from
+ * another cache. It may also have been a new value provided by a loader. The modification time on
+ * a region is propagated upward to parent regions, transitively, to the root region.
* <p>
- * The number is expressed as the number of milliseconds since January 1, 1970.
- * The granularity may be as course as 100ms, so the accuracy may be off by
- * up to 50ms.
+ * The number is expressed as the number of milliseconds since January 1, 1970. The granularity
+ * may be as course as 100ms, so the accuracy may be off by up to 50ms.
* <p>
- * Entry and subregion creation will update the modification time on a
- * region, but <code>destroy</code>, <code>destroyRegion</code>,
- * <code>invalidate</code>, and <code>invalidateRegion</code>
- * do not update the modification time.
- * @return the last modification time of the region or the entry;
- * returns 0 if entry is invalid or modification time is uninitialized.
+ * Entry and subregion creation will update the modification time on a region, but
+ * <code>destroy</code>, <code>destroyRegion</code>, <code>invalidate</code>, and
+ * <code>invalidateRegion</code> do not update the modification time.
+ *
+ * @return the last modification time of the region or the entry; returns 0 if entry is invalid or
+ * modification time is uninitialized.
* @see Region#put(Object, Object)
* @see Region#get(Object)
* @see Region#create(Object, Object)
@@ -57,21 +51,18 @@ public interface CacheStatistics
public long getLastModifiedTime();
/**
- * For an entry, returns the last time it was accessed via <code>Region.get</code>;
- * for a region, the last time any of its entries or the entries of its
- * subregions were accessed with <code>Region.get</code>.
- * Any modifications will also update the lastAccessedTime, so
- * <code>lastAccessedTime</code> is always <code>>= lastModifiedTime</code>.
- * The <code>lastAccessedTime</code> on a region is propagated upward to
- * parent regions, transitively, to the the root region.
+ * For an entry, returns the last time it was accessed via <code>Region.get</code>; for a region,
+ * the last time any of its entries or the entries of its subregions were accessed with
+ * <code>Region.get</code>. Any modifications will also update the lastAccessedTime, so
+ * <code>lastAccessedTime</code> is always <code>>= lastModifiedTime</code>. The
+ * <code>lastAccessedTime</code> on a region is propagated upward to parent regions, transitively,
+ * to the the root region.
* <p>
- * The number is expressed as the number of milliseconds
- * since January 1, 1970.
- * The granularity may be as course as 100ms, so the accuracy may be off by
- * up to 50ms.
+ * The number is expressed as the number of milliseconds since January 1, 1970. The granularity
+ * may be as course as 100ms, so the accuracy may be off by up to 50ms.
*
- * @return the last access time of the region or the entry's value;
- * returns 0 if entry is invalid or access time is uninitialized.
+ * @return the last access time of the region or the entry's value; returns 0 if entry is invalid
+ * or access time is uninitialized.
* @see Region#get(Object)
* @see #getLastModifiedTime
* @throws StatisticsDisabledException if statistics are not available
@@ -79,49 +70,48 @@ public interface CacheStatistics
public long getLastAccessedTime() throws StatisticsDisabledException;
/**
- * Returns the number of times that {@link Region#get(Object) Region.get} on
- * the region or the entry was called and there was no value found
- * locally. Unlike <code>lastAccessedTime</code>, the miss count is
- * not propagated to parent regions. Note that remote operations
- * such as a "net search" do not effect the miss count.
+ * Returns the number of times that {@link Region#get(Object) Region.get} on the region or the
+ * entry was called and there was no value found locally. Unlike <code>lastAccessedTime</code>,
+ * the miss count is not propagated to parent regions. Note that remote operations such as a "net
+ * search" do not effect the miss count.
*
- * @return the number of cache misses on the region or the
- * entry.
+ * @return the number of cache misses on the region or the entry.
* @throws StatisticsDisabledException if statistics are not available
*/
public long getMissCount() throws StatisticsDisabledException;
-
+
/**
- * Returns the number of hits for this region or entry. The number
- * of hits is defined as the number of times when the
- * {@link Region#get(Object) Region.get} finds a value locally. Unlike
- * <code>lastAccessedTime</code>, the hit count is not propagated to
- * parent regions. Note that remote operations such as a "net
- * search" do not effect the hit count.
+ * Returns the number of hits for this region or entry. The number of hits is defined as the
+ * number of times when the {@link Region#get(Object) Region.get} finds a value locally. Unlike
+ * <code>lastAccessedTime</code>, the hit count is not propagated to parent regions. Note that
+ * remote operations such as a "net search" do not effect the hit count.
*
* @return the number of hits for this region or entry.
* @throws StatisticsDisabledException if statistics are not available
*/
public long getHitCount() throws StatisticsDisabledException;
-
- /** Return the hit ratio, a convenience method defined as the ratio of hits
- * to the number of calls to {@link Region#get(Object) Region.get}. If there have been zero
- * calls to <code>Region.get</code>, then zero is returned.
- * <p>
- * The hit ratio is equivalent to:
- * <pre>
- * long hitCount = getHitCount();
- * long total = hitCount + getMissCount();
- * return total == 0L ? 0.0f : ((float)hitCount / total);
- * </pre>
+
+ /**
+ * Return the hit ratio, a convenience method defined as the ratio of hits to the number of calls
+ * to {@link Region#get(Object) Region.get}. If there have been zero calls to
+ * <code>Region.get</code>, then zero is returned.
+ * <p>
+ * The hit ratio is equivalent to:
+ *
+ * <pre>
+ * long hitCount = getHitCount();
+ * long total = hitCount + getMissCount();
+ * return total == 0L ? 0.0f : ((float) hitCount / total);
+ * </pre>
*
- * @throws StatisticsDisabledException if statistics are not available
- * @return the hit ratio as a float
+ * @throws StatisticsDisabledException if statistics are not available
+ * @return the hit ratio as a float
*/
public float getHitRatio() throws StatisticsDisabledException;
-
-
- /** Reset the missCount and hitCount to zero for this entry.
+
+
+ /**
+ * Reset the missCount and hitCount to zero for this entry.
*
* @throws StatisticsDisabledException if statistics are not available
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java b/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
index 90651f3..8d9c694 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheTransactionManager.java
@@ -1,18 +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
+ * 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;
@@ -20,80 +18,85 @@ package org.apache.geode.cache;
import java.util.concurrent.TimeUnit;
-/** <p>The CacheTransactionManager interface allows applications to manage
- * transactions on a per {@link Cache} basis.
+/**
+ * <p>
+ * The CacheTransactionManager interface allows applications to manage transactions on a per
+ * {@link Cache} basis.
*
- * <p>The life cycle of a GemFire transaction starts with a begin
- * operation. The life cycle ends with either a commit or rollback
- * operation. Between the begin and the commit/rollback are typically
- * {@link Region} operations. In general, those that either create,
- * destroy, invalidate or update {@link Region.Entry} are considered
- * transactional, that is they modify transactional state.
+ * <p>
+ * The life cycle of a GemFire transaction starts with a begin operation. The life cycle ends with
+ * either a commit or rollback operation. Between the begin and the commit/rollback are typically
+ * {@link Region} operations. In general, those that either create, destroy, invalidate or update
+ * {@link Region.Entry} are considered transactional, that is they modify transactional state.
*
- * <p>A GemFire transaction may involve operations on multiple regions,
- * each of which may have different attributes.
+ * <p>
+ * A GemFire transaction may involve operations on multiple regions, each of which may have
+ * different attributes.
*
- * <p>While a GemFire transaction and its operations are invoked in
- * the local VM, the resulting transaction state is distributed to
- * other VM's at commit time as per the attributes of each
+ * <p>
+ * While a GemFire transaction and its operations are invoked in the local VM, the resulting
+ * transaction state is distributed to other VM's at commit time as per the attributes of each
* participant Region.
*
- * <p>A transaction can have no more than one thread associated with
- * it and conversely a thread can only operate on one transaction at
- * any given time. Child threads will not inherit the existing
+ * <p>
+ * A transaction can have no more than one thread associated with it and conversely a thread can
+ * only operate on one transaction at any given time. Child threads will not inherit the existing
* transaction.
*
- * <p>Each of the following methods operate on the current thread. All
- * methods throw {@link CacheClosedException} if the Cache is closed.
+ * <p>
+ * Each of the following methods operate on the current thread. All methods throw
+ * {@link CacheClosedException} if the Cache is closed.
*
- * <p>GemFire Transactions currently only support Read Committed
- * isolation. In addition, they are optimistic transactions in that
- * write locking and conflict checks are performed as part of the
+ * <p>
+ * GemFire Transactions currently only support Read Committed isolation. In addition, they are
+ * optimistic transactions in that write locking and conflict checks are performed as part of the
* commit operation.
*
- * <p>For guaranteed Read Committed isolation, avoid making "in place"
- * changes, because such changes will be "seen" by other transactions
- * and break the Read Committed isolation guarantee. e.g.
+ * <p>
+ * For guaranteed Read Committed isolation, avoid making "in place" changes, because such changes
+ * will be "seen" by other transactions and break the Read Committed isolation guarantee. e.g.
*
- * <pre>
- * CacheTransactionManager txMgr = cache.getCacheTransactionManager();
- * txMgr.begin();
- * StringBuffer s = (StringBuffer) r.get("stringBuf");
- * s.append("Changes seen before commit. NOT Read Committed!");
- * r.put("stringBuf", s);
- * txMgr.commit();
- * </pre>
+ * <pre>
+ * CacheTransactionManager txMgr = cache.getCacheTransactionManager();
+ * txMgr.begin();
+ * StringBuffer s = (StringBuffer) r.get("stringBuf");
+ * s.append("Changes seen before commit. NOT Read Committed!");
+ * r.put("stringBuf", s);
+ * txMgr.commit();
+ * </pre>
*
- * <p>To aid in creating copies, the "copy on read"
- * <code>Cache</code> attribute and the {@link
- * org.apache.geode.CopyHelper#copy} method are provided.
- * The following is a Read Committed safe example using the
- * <code>CopyHelper.copy</code> method.
+ * <p>
+ * To aid in creating copies, the "copy on read" <code>Cache</code> attribute and the
+ * {@link org.apache.geode.CopyHelper#copy} method are provided. The following is a Read Committed
+ * safe example using the <code>CopyHelper.copy</code> method.
*
- * <pre>
- * CacheTransactionManager txMgr = cache.getCacheTransactionManager();
- * txMgr.begin();
- * Object o = r.get("stringBuf");
- * StringBuffer s = (StringBuffer) CopyHelper.copy(o);
- * s.append("Changes unseen before commit. Read Committed.");
- * r.put("stringBuf", s);
- * txMgr.commit();
- * </pre>
+ * <pre>
+ * CacheTransactionManager txMgr = cache.getCacheTransactionManager();
+ * txMgr.begin();
+ * Object o = r.get("stringBuf");
+ * StringBuffer s = (StringBuffer) CopyHelper.copy(o);
+ * s.append("Changes unseen before commit. Read Committed.");
+ * r.put("stringBuf", s);
+ * txMgr.commit();
+ * </pre>
*
- * <p>Its important to note that creating copies can negatively
- * impact both performance and memory consumption.
+ * <p>
+ * Its important to note that creating copies can negatively impact both performance and memory
+ * consumption.
*
- * <p>Partitioned Regions, Distributed No Ack and Distributed Ack Regions are supported
- * (see {@link AttributesFactory} for Scope). For both scopes, a
- * consistent configuration (per VM) is enforced.
+ * <p>
+ * Partitioned Regions, Distributed No Ack and Distributed Ack Regions are supported (see
+ * {@link AttributesFactory} for Scope). For both scopes, a consistent configuration (per VM) is
+ * enforced.
*
- * <p>Global Regions, client Regions (see org.apache.geode.cache.client package)
- * and persistent Regions (see {@link DiskWriteAttributes}) do not
- * support transactions.
+ * <p>
+ * Global Regions, client Regions (see org.apache.geode.cache.client package) and persistent Regions
+ * (see {@link DiskWriteAttributes}) do not support transactions.
*
- * <p>When PartitionedRegions are involved in a transaction, all data in the
- * transaction must be colocated together on one data node. See the GemFire
- * Developer Guide for details on using transactions with Partitioned Regions.
+ * <p>
+ * When PartitionedRegions are involved in a transaction, all data in the transaction must be
+ * colocated together on one data node. See the GemFire Developer Guide for details on using
+ * transactions with Partitioned Regions.
*
*
* @since GemFire 4.0
@@ -102,82 +105,75 @@ import java.util.concurrent.TimeUnit;
*
*/
public interface CacheTransactionManager {
- /** Creates a new transaction and associates it with the current thread.
- *
- * @throws IllegalStateException if the thread is already associated with a transaction
- *
- * @since GemFire 4.0
- */
- public void begin();
+ /**
+ * Creates a new transaction and associates it with the current thread.
+ *
+ * @throws IllegalStateException if the thread is already associated with a transaction
+ *
+ * @since GemFire 4.0
+ */
+ public void begin();
- /** Commit the transaction associated with the current thread. If
- * the commit operation fails due to a conflict it will destroy
- * the transaction state and throw a {@link
- * CommitConflictException}. If the commit operation succeeds,
- * it returns after the transaction state has been merged with
- * committed state. When this method completes, the thread is no
- * longer associated with a transaction.
- *
- * @throws IllegalStateException if the thread is not associated with a transaction
- *
- * @throws CommitConflictException if the commit operation fails due to
- * a write conflict.
- *
- * @throws TransactionDataNodeHasDepartedException if the node hosting the
- * transaction data has departed. This is only relevant for transaction that
- * involve PartitionedRegions.
- *
- * @throws TransactionDataNotColocatedException if at commit time, the data
- * involved in the transaction has moved away from the transaction hosting
- * node. This can only happen if rebalancing/recovery happens during a
- * transaction that involves a PartitionedRegion.
- *
- * @throws TransactionInDoubtException when GemFire cannot tell which nodes
- * have applied the transaction and which have not. This only occurs if nodes
- * fail mid-commit, and only then in very rare circumstances.
- */
- public void commit() throws CommitConflictException;
+ /**
+ * Commit the transaction associated with the current thread. If the commit operation fails due to
+ * a conflict it will destroy the transaction state and throw a {@link CommitConflictException}.
+ * If the commit operation succeeds, it returns after the transaction state has been merged with
+ * committed state. When this method completes, the thread is no longer associated with a
+ * transaction.
+ *
+ * @throws IllegalStateException if the thread is not associated with a transaction
+ *
+ * @throws CommitConflictException if the commit operation fails due to a write conflict.
+ *
+ * @throws TransactionDataNodeHasDepartedException if the node hosting the transaction data has
+ * departed. This is only relevant for transaction that involve PartitionedRegions.
+ *
+ * @throws TransactionDataNotColocatedException if at commit time, the data involved in the
+ * transaction has moved away from the transaction hosting node. This can only happen if
+ * rebalancing/recovery happens during a transaction that involves a PartitionedRegion.
+ *
+ * @throws TransactionInDoubtException when GemFire cannot tell which nodes have applied the
+ * transaction and which have not. This only occurs if nodes fail mid-commit, and only
+ * then in very rare circumstances.
+ */
+ public void commit() throws CommitConflictException;
- /** Roll back the transaction associated with the current thread. When
- * this method completes, the thread is no longer associated with a
- * transaction and the transaction context is destroyed.
- *
- * @since GemFire 4.0
- *
- * @throws IllegalStateException if the thread is not associated with a transaction
- */
- public void rollback();
+ /**
+ * Roll back the transaction associated with the current thread. When this method completes, the
+ * thread is no longer associated with a transaction and the transaction context is destroyed.
+ *
+ * @since GemFire 4.0
+ *
+ * @throws IllegalStateException if the thread is not associated with a transaction
+ */
+ public void rollback();
/**
- * Suspends the transaction on the current thread. All subsequent operations
- * performed by this thread will be non-transactional. The suspended
- * transaction can be resumed by calling {@link #resume(TransactionId)}
+ * Suspends the transaction on the current thread. All subsequent operations performed by this
+ * thread will be non-transactional. The suspended transaction can be resumed by calling
+ * {@link #resume(TransactionId)}
*
- * @return the transaction identifier of the suspended transaction or null if
- * the thread was not associated with a transaction
+ * @return the transaction identifier of the suspended transaction or null if the thread was not
+ * associated with a transaction
* @since GemFire 6.6.2
*/
public TransactionId suspend();
/**
- * On the current thread, resumes a transaction that was previously suspended
- * using {@link #suspend()}
+ * On the current thread, resumes a transaction that was previously suspended using
+ * {@link #suspend()}
*
- * @param transactionId
- * the transaction to resume
- * @throws IllegalStateException
- * if the thread is associated with a transaction or if
- * {@link #isSuspended(TransactionId)} would return false for the
- * given transactionId
+ * @param transactionId the transaction to resume
+ * @throws IllegalStateException if the thread is associated with a transaction or if
+ * {@link #isSuspended(TransactionId)} would return false for the given transactionId
* @since GemFire 6.6.2
* @see #tryResume(TransactionId)
*/
public void resume(TransactionId transactionId);
/**
- * This method can be used to determine if a transaction with the given
- * transaction identifier is currently suspended locally. This method does not
- * check other members for transaction status.
+ * This method can be used to determine if a transaction with the given transaction identifier is
+ * currently suspended locally. This method does not check other members for transaction status.
*
* @param transactionId
* @return true if the transaction is in suspended state, false otherwise
@@ -187,28 +183,29 @@ public interface CacheTransactionManager {
public boolean isSuspended(TransactionId transactionId);
/**
- * On the current thread, resumes a transaction that was previously suspended
- * using {@link #suspend()}.
+ * On the current thread, resumes a transaction that was previously suspended using
+ * {@link #suspend()}.
*
* This method is equivalent to
+ *
* <pre>
* if (isSuspended(txId)) {
* resume(txId);
* }
* </pre>
+ *
* except that this action is performed atomically
*
- * @param transactionId
- * the transaction to resume
+ * @param transactionId the transaction to resume
* @return true if the transaction was resumed, false otherwise
* @since GemFire 6.6.2
*/
public boolean tryResume(TransactionId transactionId);
/**
- * On the current thread, resumes a transaction that was previously suspended
- * using {@link #suspend()}, or waits for the specified timeout interval if
- * the transaction has not been suspended. This method will return if:
+ * On the current thread, resumes a transaction that was previously suspended using
+ * {@link #suspend()}, or waits for the specified timeout interval if the transaction has not been
+ * suspended. This method will return if:
* <ul>
* <li>Another thread suspends the transaction</li>
* <li>Another thread calls commit/rollback on the transaction</li>
@@ -217,12 +214,9 @@ public interface CacheTransactionManager {
*
* This method returns immediately if {@link #exists(TransactionId)} returns false.
*
- * @param transactionId
- * the transaction to resume
- * @param time
- * the maximum time to wait
- * @param unit
- * the time unit of the <code>time</code> argument
+ * @param transactionId the transaction to resume
+ * @param time the maximum time to wait
+ * @param unit the time unit of the <code>time</code> argument
* @return true if the transaction was resumed, false otherwise
* @since GemFire 6.6.2
* @see #tryResume(TransactionId)
@@ -230,120 +224,129 @@ public interface CacheTransactionManager {
public boolean tryResume(TransactionId transactionId, long time, TimeUnit unit);
/**
- * Reports the existence of a transaction for the given transactionId. This
- * method can be used to determine if a transaction with the given transaction
- * identifier is currently in progress locally.
+ * Reports the existence of a transaction for the given transactionId. This method can be used to
+ * determine if a transaction with the given transaction identifier is currently in progress
+ * locally.
*
- * @param transactionId
- * the given transaction identifier
+ * @param transactionId the given transaction identifier
* @return true if the transaction is in progress, false otherwise.
* @since GemFire 6.6.2
* @see #isSuspended(TransactionId)
*/
public boolean exists(TransactionId transactionId);
-
- /** Reports the existence of a Transaction for this thread
- *
- * @return true if a transaction exists, false otherwise
- *
- * @since GemFire 4.0
- */
- public boolean exists();
- /** Returns the transaction identifier for the current thread
- *
- * @return the transaction identifier or null if no transaction exists
- *
- * @since GemFire 4.0
- */
- public TransactionId getTransactionId();
+ /**
+ * Reports the existence of a Transaction for this thread
+ *
+ * @return true if a transaction exists, false otherwise
+ *
+ * @since GemFire 4.0
+ */
+ public boolean exists();
- /**
- * Gets the transaction listener for this Cache.
- *
- * @return The TransactionListener instance or null if no listener.
- * @throws IllegalStateException if more than one listener exists on this cache
- * @deprecated as of GemFire 5.0, use {@link #getListeners} instead
- */
- @Deprecated
- public TransactionListener getListener();
+ /**
+ * Returns the transaction identifier for the current thread
+ *
+ * @return the transaction identifier or null if no transaction exists
+ *
+ * @since GemFire 4.0
+ */
+ public TransactionId getTransactionId();
- /** Returns an array of all the transaction listeners on this cache.
- * Modifications to the returned array will not effect what listeners are on this cache.
- * @return the cache's <code>TransactionListener</code>s; an empty array if no listeners
- * @since GemFire 5.0
- */
- public TransactionListener[] getListeners();
+ /**
+ * Gets the transaction listener for this Cache.
+ *
+ * @return The TransactionListener instance or null if no listener.
+ * @throws IllegalStateException if more than one listener exists on this cache
+ * @deprecated as of GemFire 5.0, use {@link #getListeners} instead
+ */
+ @Deprecated
+ public TransactionListener getListener();
- /**
- * Sets the transaction listener for this Cache.
- *
- * @param newListener the TransactionListener to register with the Cache.
- * Use a <code>null</code> to deregister the current listener without
- * registering a new one.
- * @return the previous TransactionListener
- * @throws IllegalStateException if more than one listener exists on this cache
- * @deprecated as of GemFire 5.0, use {@link #addListener} or {@link #initListeners} instead.
- */
- @Deprecated
- public TransactionListener setListener(TransactionListener newListener);
- /**
- * Adds a transaction listener to the end of the list of transaction listeners on this cache.
- * @param aListener the user defined transaction listener to add to the cache.
- * @throws IllegalArgumentException if <code>aListener</code> is null
- * @since GemFire 5.0
- */
- public void addListener(TransactionListener aListener);
- /**
- * Removes a transaction listener from the list of transaction listeners on this cache.
- * Does nothing if the specified listener has not been added.
- * If the specified listener has been added then {@link CacheCallback#close} will
- * be called on it; otherwise does nothing.
- * @param aListener the transaction listener to remove from the cache.
- * @throws IllegalArgumentException if <code>aListener</code> is null
- * @since GemFire 5.0
- */
- public void removeListener(TransactionListener aListener);
- /**
- * Removes all transaction listeners, calling {@link CacheCallback#close} on each of them, and then adds each listener in the specified array.
- * @param newListeners a possibly null or empty array of listeners to add to this cache.
- * @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
- * @since GemFire 5.0
- */
- public void initListeners(TransactionListener[] newListeners);
+ /**
+ * Returns an array of all the transaction listeners on this cache. Modifications to the returned
+ * array will not effect what listeners are on this cache.
+ *
+ * @return the cache's <code>TransactionListener</code>s; an empty array if no listeners
+ * @since GemFire 5.0
+ */
+ public TransactionListener[] getListeners();
- /**
- * Set the TransactionWriter for the cache
- * @param writer
- * @see TransactionWriter
- * @since GemFire 6.5
- */
- public void setWriter(TransactionWriter writer);
+ /**
+ * Sets the transaction listener for this Cache.
+ *
+ * @param newListener the TransactionListener to register with the Cache. Use a <code>null</code>
+ * to deregister the current listener without registering a new one.
+ * @return the previous TransactionListener
+ * @throws IllegalStateException if more than one listener exists on this cache
+ * @deprecated as of GemFire 5.0, use {@link #addListener} or {@link #initListeners} instead.
+ */
+ @Deprecated
+ public TransactionListener setListener(TransactionListener newListener);
- /**
- * Returns the current {@link TransactionWriter}
- * @see CacheTransactionManager#setWriter(TransactionWriter)
- * @return the current {@link TransactionWriter}
- * @since GemFire 6.5
- */
- public TransactionWriter getWriter();
-
- /**
- * Sets whether transactions should be executed in distributed or
- * non-distributed mode. Once set this mode should not be changed during
- * the course of transactions.
- *
- * @throws IllegalStateException if a transaction is already in progress
- * and this method sets the distributed mode to a different value.
- * @since Geode 1.0
- */
- public void setDistributed(boolean distributed);
-
- /**
- * Returns the execution mode of transactions
- * @return true if distributed,
- * false otherwise.
- * @since Geode 1.0
- */
- public boolean isDistributed();
+ /**
+ * Adds a transaction listener to the end of the list of transaction listeners on this cache.
+ *
+ * @param aListener the user defined transaction listener to add to the cache.
+ * @throws IllegalArgumentException if <code>aListener</code> is null
+ * @since GemFire 5.0
+ */
+ public void addListener(TransactionListener aListener);
+
+ /**
+ * Removes a transaction listener from the list of transaction listeners on this cache. Does
+ * nothing if the specified listener has not been added. If the specified listener has been added
+ * then {@link CacheCallback#close} will be called on it; otherwise does nothing.
+ *
+ * @param aListener the transaction listener to remove from the cache.
+ * @throws IllegalArgumentException if <code>aListener</code> is null
+ * @since GemFire 5.0
+ */
+ public void removeListener(TransactionListener aListener);
+
+ /**
+ * Removes all transaction listeners, calling {@link CacheCallback#close} on each of them, and
+ * then adds each listener in the specified array.
+ *
+ * @param newListeners a possibly null or empty array of listeners to add to this cache.
+ * @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
+ * @since GemFire 5.0
+ */
+ public void initListeners(TransactionListener[] newListeners);
+
+ /**
+ * Set the TransactionWriter for the cache
+ *
+ * @param writer
+ * @see TransactionWriter
+ * @since GemFire 6.5
+ */
+ public void setWriter(TransactionWriter writer);
+
+ /**
+ * Returns the current {@link TransactionWriter}
+ *
+ * @see CacheTransactionManager#setWriter(TransactionWriter)
+ * @return the current {@link TransactionWriter}
+ * @since GemFire 6.5
+ */
+ public TransactionWriter getWriter();
+
+ /**
+ * Sets whether transactions should be executed in distributed or non-distributed mode. Once set
+ * this mode should not be changed during the course of transactions.
+ *
+ * @throws IllegalStateException if a transaction is already in progress and this method sets the
+ * distributed mode to a different value.
+ * @since Geode 1.0
+ */
+ public void setDistributed(boolean distributed);
+
+ /**
+ * Returns the execution mode of transactions
+ *
+ * @return true if distributed, false otherwise.
+ * @since Geode 1.0
+ */
+ public boolean isDistributed();
}
[59/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js b/geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js
deleted file mode 100644
index f121291..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v@1.8.0 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(
a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="scri
pt"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bX(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bV.length;while(e--){b=bV[e]+c;if(b in a)return b}return d}function bY(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function bZ(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bY(c)&&(e[f]=p._data(c,"olddisplay",cb(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b$(a,b,c){
var d=bO.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function b_(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bU[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bU[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bU[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bU[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bU[e]+"Width"))||0));return f}function ca(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bP.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+b_(a,b,c||(f?"border":"content"),e)+"px"}function cb(a){if(bR[a])return bR[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createEle
ment)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bR[a]=c,c}function ch(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cz(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cu;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cz(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cz(a,c,d,e,"*",g)),h}function cA(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c
)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cB(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cC(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"succe
ss",data:b}}function cK(){try{return new a.XMLHttpRequest}catch(b){}}function cL(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cT(){return setTimeout(function(){cM=b},0),cM=p.now()}function cU(a,b){p.each(b,function(b,c){var d=(cS[b]||[]).concat(cS["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cV(a,b,c){var d,e=0,f=0,g=cR.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cM||cT(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cM||cT(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.t
weens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cW(k,j.opts.specialEasing);for(;e<g;e++){d=cR[e].call(j,a,k,j.opts);if(d)return d}return cU(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cW(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cX(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bY(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||
"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cb(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cO.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cY(a,b,c,d,e){return new cY.prototype.init(a,b,c,d,e)}function cZ(a,b){var c,d={height:a},e=0;for(;e<4;e+=2-b)c=bU[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d
.width=a),d}function c_(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=r.test("�")?/^[\s\xA0]+|[\s\xA0]+$/g:/^\s+|\s+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:fu
nction(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.0",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return
d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)contin
ue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.p
rototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("In
valid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":a.toString().replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:functi
on(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||f.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if
(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete"||e.readyState!=="loading"&&e.addEventListener)setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;
h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){p.isFunction(c)&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callba
cks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return typeof a=="object"?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.n
otifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML=" <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length||!d)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkO
n:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).c
loneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display
:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/^(?:\{.*\}|\[.*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQu
ery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||++p.uuid:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];
if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")===0&&(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,
c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.shift(),e=p._queueHooks(a,b),f=function(){p.dequeue(a,b)};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),delete e.stop,d.call(a,f,e)),!c.length&&e&&e.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue
:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)(d=p._data(g[h],a+"queueHooks"))&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.pro
p,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)~f.indexOf(" "+b[g]+" ")||(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>-1)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleCla
ss:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.va
l()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;
if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,""+d),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b
,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:
!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selec
tedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,argu
ments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(
".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join(
"\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[
m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,k,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=[].slice.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click")){g=p(this),g.context=this;for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){i={},k=[],g[0]=f;for(d=0;d<q;d++)l=o[d],m=l.selector,i[m]===b&&(i[m]=g.is(m)),i[m]&&k.push(l);k.length&&u.push({elem:f,matches:k})}}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){j=u[d],c.currentTarget=j.elem;for(e=0;e<j.matches.length&&!c.isImmediatePropagationStopped();e++){l=j.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=
l,h=((p.event.special[l.origType]||{}).handle||l.handler).apply(j.elem,r),h!==b&&(c.result=h,h===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&
&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{ready:{setup:p.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventList
ener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStop
ped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(t
his.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simul
ate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(t
his,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown m
ouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bd(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)Z(a,b[e],c,d)}function be(a,b,c,d,e,f){var g,h=$.setFilters[b.toLowerCase()];return h||Z.error(b),(a||!(g=e))&&bd(a||"*",d,g=[],e),g.length>0?h(g,c,f):[]}function bf(a,c,d,e,f){var g,h,i,j,k,l,m,n,p=0,q=f.length,s=L.POS,t=new RegExp("^"+s.source+"(?!"+r+")","i"),u=function(){var a=1,c=arguments.length-2;for(;a<c;a++)arguments[a]===b&&(g[a]=b)};for(;p<q;p++){s.exec(""),a=f[p],j=[],i=0,k=e;while(g=s.exec(a)){n=s.lastIndex=g.index+g[0].length;if(n>i){m=a.slice(i,g.index),i=n,l=[c],B.test(m)&&(k&&(l=k),k=e);if(h=H.test(m))m=m.slice(0,-5).replace(B,"$&*");g.length>1&&g[0]
.replace(t,u),k=be(m,g[1],g[2],l,k,h)}}k?(j=j.concat(k),(m=a.slice(i))&&m!==")"?B.test(m)?bd(m,j,d,e):Z(m,c,d,e?e.concat(k):k):o.apply(d,j)):Z(a,c,d,e)}return q===1?d:Z.uniqueSort(d)}function bg(a,b,c){var d,e,f,g=[],i=0,j=D.exec(a),k=!j.pop()&&!j.pop(),l=k&&a.match(C)||[""],m=$.preFilter,n=$.filter,o=!c&&b!==h;for(;(e=l[i])!=null&&k;i++){g.push(d=[]),o&&(e=" "+e);while(e){k=!1;if(j=B.exec(e))e=e.slice(j[0].length),k=d.push({part:j.pop().replace(A," "),captures:j});for(f in n)(j=L[f].exec(e))&&(!m[f]||(j=m[f](j,b,c)))&&(e=e.slice(j.shift().length),k=d.push({part:f,captures:j}));if(!k)break}}return k||Z.error(a),g}function bh(a,b,e){var f=b.dir,g=m++;return a||(a=function(a){return a===e}),b.first?function(b,c){while(b=b[f])if(b.nodeType===1)return a(b,c)&&b}:function(b,e){var h,i=g+"."+d,j=i+"."+c;while(b=b[f])if(b.nodeType===1){if((h=b[q])===j)return b.sizset;if(typeof h=="string"&&h.indexOf(i)===0){if(b.sizset)return b}else{b[q]=j;if(a(b,e))return b.sizset=!0,b;b.sizset=!1}}}}func
tion bi(a,b){return a?function(c,d){var e=b(c,d);return e&&a(e===!0?c:e,d)}:b}function bj(a,b,c){var d,e,f=0;for(;d=a[f];f++)$.relative[d.part]?e=bh(e,$.relative[d.part],b):(d.captures.push(b,c),e=bi(e,$.filter[d.part].apply(null,d.captures)));return e}function bk(a){return function(b,c){var d,e=0;for(;d=a[e];e++)if(d(b,c))return!0;return!1}}var c,d,e,f,g,h=a.document,i=h.documentElement,j="undefined",k=!1,l=!0,m=0,n=[].slice,o=[].push,q=("sizcache"+Math.random()).replace(".",""),r="[\\x20\\t\\r\\n\\f]",s="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",t=s.replace("w","w#"),u="([*^$|!~]?=)",v="\\["+r+"*("+s+")"+r+"*(?:"+u+r+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+t+")|)|)"+r+"*\\]",w=":("+s+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|((?:[^,]|\\\\,|(?:,(?=[^\\[]*\\]))|(?:,(?=[^\\(]*\\))))*))\\)|)",x=":(nth|eq|gt|lt|first|last|even|odd)(?:\\((\\d*)\\)|)(?=[^-]|$)",y=r+"*([\\x20\\t\\r\\n\\f>+~])"+r+"*",z="(?=[^\\x20\\t\\r\\n\\f])(?:\\\\.|"+v+"|"+w.replace(2,7)+"|[^\\\\(),])+",A=new RegExp("^"+r+"+|
((?:^|[^\\\\])(?:\\\\.)*)"+r+"+$","g"),B=new RegExp("^"+y),C=new RegExp(z+"?(?="+r+"*,|$)","g"),D=new RegExp("^(?:(?!,)(?:(?:^|,)"+r+"*"+z+")*?|"+r+"*(.*?))(\\)|$)"),E=new RegExp(z.slice(19,-6)+"\\x20\\t\\r\\n\\f>+~])+|"+y,"g"),F=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,G=/[\x20\t\r\n\f]*[+~]/,H=/:not\($/,I=/h\d/i,J=/input|select|textarea|button/i,K=/\\(?!\\)/g,L={ID:new RegExp("^#("+s+")"),CLASS:new RegExp("^\\.("+s+")"),NAME:new RegExp("^\\[name=['\"]?("+s+")['\"]?\\]"),TAG:new RegExp("^("+s.replace("[-","[-\\*")+")"),ATTR:new RegExp("^"+v),PSEUDO:new RegExp("^"+w),CHILD:new RegExp("^:(only|nth|last|first)-child(?:\\("+r+"*(even|odd|(([+-]|)(\\d*)n|)"+r+"*(?:([+-]|)"+r+"*(\\d+)|))"+r+"*\\)|)","i"),POS:new RegExp(x,"ig"),needsContext:new RegExp("^"+r+"*[>+~]|"+x,"i")},M={},N=[],O={},P=[],Q=function(a){return a.sizzleFilter=!0,a},R=function(a){return function(b){return b.nodeName.toLowerCase()==="input"&&b.type===a}},S=function(a){return function(b){var c=b.nodeName.toLowerCase();return
(c==="input"||c==="button")&&b.type===a}},T=function(a){var b=!1,c=h.createElement("div");try{b=a(c)}catch(d){}return c=null,b},U=T(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),V=T(function(a){a.id=q+0,a.innerHTML="<a name='"+q+"'></a><div name='"+q+"'></div>",i.insertBefore(a,i.firstChild);var b=h.getElementsByName&&h.getElementsByName(q).length===2+h.getElementsByName(q+0).length;return g=!h.getElementById(q),i.removeChild(a),b}),W=T(function(a){return a.appendChild(h.createComment("")),a.getElementsByTagName("*").length===0}),X=T(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==j&&a.firstChild.getAttribute("href")==="#"}),Y=T(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||a.getElementsByClassName("e").length===0?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length!=
=1)}),Z=function(a,b,c,d){c=c||[],b=b||h;var e,f,g,i,j=b.nodeType;if(j!==1&&j!==9)return[];if(!a||typeof a!="string")return c;g=ba(b);if(!g&&!d)if(e=F.exec(a))if(i=e[1]){if(j===9){f=b.getElementById(i);if(!f||!f.parentNode)return c;if(f.id===i)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(i))&&bb(b,f)&&f.id===i)return c.push(f),c}else{if(e[2])return o.apply(c,n.call(b.getElementsByTagName(a),0)),c;if((i=e[3])&&Y&&b.getElementsByClassName)return o.apply(c,n.call(b.getElementsByClassName(i),0)),c}return bm(a,b,c,d,g)},$=Z.selectors={cacheLength:50,match:L,order:["ID","TAG"],attrHandle:{},createPseudo:Q,find:{ID:g?function(a,b,c){if(typeof b.getElementById!==j&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==j&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==j&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:W?function(a,b){if(typeof b.getElementsByTagName!==j)retur
n b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(K,""),a[3]=(a[4]||a[5]||"").replace(K,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||Z.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&Z.error(a[0]),a},PSEUDO:function(a){var b,c=a[4];return L.CHILD.test(a[0])?null:(c&&(b=D.exec(c))&&b.pop()&&(a[0]=a[0].slice(0,b[0].length-c.length-1),c=b[0].slice(0,-1)),a.splice(2,3,c||a[3]),a)}},filter:{ID:g?function(a){return a=a.replace(K,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(K,""),function(b){var c=typeof b.getAttributeNode!==j
&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(K,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=M[a];return b||(b=M[a]=new RegExp("(^|"+r+")"+a+"("+r+"|$)"),N.push(a),N.length>$.cacheLength&&delete M[N.shift()]),function(a){return b.test(a.className||typeof a.getAttribute!==j&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return b?function(d){var e=Z.attr(d,a),f=e+"";if(e==null)return b==="!=";switch(b){case"=":return f===c;case"!=":return f!==c;case"^=":return c&&f.indexOf(c)===0;case"*=":return c&&f.indexOf(c)>-1;case"$=":return c&&f.substr(f.length-c.length)===c;case"~=":return(" "+f+" ").indexOf(c)>-1;case"|=":return f===c||f.substr(0,c.length+1)===c+"-"}}:function(b){return Z.attr(b,a)!=null}},CHILD:function(a,b,c,d){if(a==="nth"){var e=m++;return function(a){var b,f,g=0,h=a;if(c===1&&d===0)return!0;b=a.parentNode;if(b&&(b[q]!==e||!a.sizset)){for(
h=b.firstChild;h;h=h.nextSibling)if(h.nodeType===1){h.sizset=++g;if(h===a)break}b[q]=e}return f=a.sizset-d,c===0?f===0:f%c===0&&f/c>=0}}return function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b,c,d){var e=$.pseudos[a]||$.pseudos[a.toLowerCase()];return e||Z.error("unsupported pseudo: "+a),e.sizzleFilter?e(b,c,d):e}},pseudos:{not:Q(function(a,b,c){var d=bl(a.replace(A,"$1"),b,c);return function(a){return!d(a)}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!$.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.no
deType)===3||b===4)return!1;a=a.nextSibling}return!0},contains:Q(function(a){return function(b){return(b.textContent||b.innerText||bc(b)).indexOf(a)>-1}}),has:Q(function(a){return function(b){return Z(a,b).length>0}}),header:function(a){return I.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:R("radio"),checkbox:R("checkbox"),file:R("file"),password:R("password"),image:R("image"),submit:S("submit"),reset:S("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return J.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b,c){return c?a.slice(1):[a[0]]},last:function(a,b,c){var d=a.pop();return c?a:[d]},even:function(
a,b,c){var d=[],e=c?1:0,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},odd:function(a,b,c){var d=[],e=c?0:1,f=a.length;for(;e<f;e=e+2)d.push(a[e]);return d},lt:function(a,b,c){return c?a.slice(+b):a.slice(0,+b)},gt:function(a,b,c){return c?a.slice(0,+b+1):a.slice(+b+1)},eq:function(a,b,c){var d=a.splice(+b,1);return c?a:d}}};$.setFilters.nth=$.setFilters.eq,$.filters=$.pseudos,X||($.attrHandle={href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}}),V&&($.order.push("NAME"),$.find.NAME=function(a,b){if(typeof b.getElementsByName!==j)return b.getElementsByName(a)}),Y&&($.order.splice(1,0,"CLASS"),$.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!==j&&!c)return b.getElementsByClassName(a)});try{n.call(i.childNodes,0)[0].nodeType}catch(_){n=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}var ba=Z.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},bb=Z.contains=i.compa
reDocumentPosition?function(a,b){return!!(a.compareDocumentPosition(b)&16)}:i.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc=Z.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=bc(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=bc(b);return c};Z.attr=function(a,b){var c,d=ba(a);return d||(b=b.toLowerCase()),$.attrHandle[b]?$.attrHandle[b](a):U||d?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},Z.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},[0,0].sort(function(){return l=0}),i.compareDocumentPosition?e=function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPos
ition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:(e=function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],g=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return f(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)g.unshift(j),j=j.parentNode;c=e.length,d=g.length;for(var l=0;l<c&&l<d;l++)if(e[l]!==g[l])return f(e[l],g[l]);return l===c?f(a,g[l],-1):f(e[l],b,1)},f=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),Z.uniqueSort=function(a){var b,c=1;if(e){k=l,a.sort(e);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1)}return a};var bl=Z.compile=function(a,b,c){var d,e,f,g=O[a];if(g&&g.context===b)return g;e=bg(a,b,c);for(f=0;d=e[f];f++)e[f]=bj(d,b,c);return g=O[a]=bk(e),g.context=b,g.runs=g.dirruns=0,P.push(a),P.length>$.cacheLength&&delete O[P.shift()],g};Z.matches=function(a,b){return Z(a,null,null,b)},Z.matchesSel
ector=function(a,b){return Z(b,null,null,[a]).length>0};var bm=function(a,b,e,f,g){a=a.replace(A,"$1");var h,i,j,k,l,m,p,q,r,s=a.match(C),t=a.match(E),u=b.nodeType;if(L.POS.test(a))return bf(a,b,e,f,s);if(f)h=n.call(f,0);else if(s&&s.length===1){if(t.length>1&&u===9&&!g&&(s=L.ID.exec(t[0]))){b=$.find.ID(s[1],b,g)[0];if(!b)return e;a=a.slice(t.shift().length)}q=(s=G.exec(t[0]))&&!s.index&&b.parentNode||b,r=t.pop(),m=r.split(":not")[0];for(j=0,k=$.order.length;j<k;j++){p=$.order[j];if(s=L[p].exec(m)){h=$.find[p]((s[1]||"").replace(K,""),q,g);if(h==null)continue;m===r&&(a=a.slice(0,a.length-r.length)+m.replace(L[p],""),a||o.apply(e,n.call(h,0)));break}}}if(a){i=bl(a,b,g),d=i.dirruns++,h==null&&(h=$.find.TAG("*",G.test(a)&&b.parentNode||b));for(j=0;l=h[j];j++)c=i.runs++,i(l,b)&&e.push(l)}return e};h.querySelectorAll&&function(){var a,b=bm,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[],f=[":active"],g=i.matchesSelector||i.mozMatchesSelector||i.webkitMatchesSelector||i.o
MatchesSelector||i.msMatchesSelector;T(function(a){a.innerHTML="<select><option selected></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+r+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),T(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+r+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=e.length&&new RegExp(e.join("|")),bm=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a)))if(d.nodeType===9)try{return o.apply(f,n.call(d.querySelectorAll(a),0)),f}catch(i){}else if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){var j=d.getAttribute("id"),k=j||q,l=G.test(a)&&d.parentNode||d;j?k=k.replace(c,"\\$&"):d.setAttribute("id",k);try{return o.apply(f,n.call(l.querySelectorAll(a.replace(C,"[id='"+k+"'] $&")),0)),f}catch(i){}finally{j||d.removeAttribute("id")}}return b
(a,d,f,g,h)},g&&(T(function(b){a=g.call(b,"div");try{g.call(b,"[test!='']:sizzle"),f.push($.match.PSEUDO)}catch(c){}}),f=new RegExp(f.join("|")),Z.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!ba(b)&&!f.test(c)&&(!e||!e.test(c)))try{var h=g.call(b,c);if(h||a||b.document&&b.document.nodeType!==11)return h}catch(i){}return Z(c,null,null,[b]).length>0})}(),Z.attr=p.attr,p.find=Z,p.expr=Z.selectors,p.expr[":"]=p.expr.pseudos,p.unique=Z.uniqueSort,p.text=Z.getText,p.isXMLDoc=Z.isXML,p.contains=Z.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice
(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.
merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.
map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new Reg
Exp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[
0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(
a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nod
eType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function()
{p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=(c[0]||c).ownerDocument||c[0]||c,typeof c.createDocumentFragment=="undefined"&&(c=e),a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p
.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return
d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=0,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(g=b===e&&bA;(h=a[s])!=null;s++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{g=g||bk(b),l=l||g.appendChild(b.createElement("div")),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(f=n.length-1;f>=0;--f)p.nodeName(n[f],"tbody")&&!n[f].childNodes.length&&n[f].parentNode.removeChild(n[f])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l=g.lastChild}h.nodeType?t.push(h):t=p.merge(t,h)}l&&(g.removeChild(l),h=l=g=null);if(!p.support.appendChecked)for(s=0;(h=t[s])!=null;s++)p.nodeName(h,"input")?bG(h):type
of h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(s=0;(h=t[s])!=null;s++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[s+1,0].concat(r)),s+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(ms
ie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^margin/,bO=new RegExp("^("+q+")(.*)$","i"),bP=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bQ=new RegExp("^([-+])=("+q+")","i"),bR={},bS={position:"absolute",visibility:"hidden",display:"block"},bT={letterSpacing:0,fontWeight:400,lineHeight:1},bU=["Top","Right","Bottom","Left"],bV=["Webkit","O","Moz","ms"],bW=p.fn.toggle;p.fn.extend({css:funct
ion(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return bZ(this,!0)},hide:function(){return bZ(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bW.apply(this,arguments):this.each(function(){(c?a:bY(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bX(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bQ.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&is
NaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bX(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bT&&(f=bT[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(a,b){var c,d,e,f,g=getComputedStyle(a,null),h=a.style;return g&&(c=g[b],c===""&&!p.contains(a.ownerDocument.documentElement,a)&&(c=p.style(a,b)),bP.test(c)&&bN.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=c,c=g.width,h.width=d,h.minWidth=e,h.maxWidth=f)),c}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bP.test(e)&&!bM.te
st(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0||bH(a,"display")!=="none"?ca(a,b,d):p.swap(a,bS,function(){return ca(a,b,d)})},set:function(a,c,d){return b$(a,c,d?b_(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarg
inRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bP.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bU[d]+b]=e[d]||e[d-2]||e[0];return f}},bN.test(a)||(p.cssHooks[a+b].set=b$)});var cc=/%20/g,cd=/\[\]$/,ce=/\r?\n/g,cf=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,cg=/^(?:select|t
extarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||cg.test(this.nodeName)||cf.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(ce,"\r\n")}}):{name:b.name,value:c.replace(ce,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ch(d,a[d],c,f);return e.join("&").replace(cc,"+")};var ci,cj,ck=/#.*$/,cl=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cm=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,cn=/^(?:GET|HEAD)$/
,co=/^\/\//,cp=/\?/,cq=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cr=/([?&])_=[^&]*/,cs=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,ct=p.fn.load,cu={},cv={},cw=["*/"]+["*"];try{ci=f.href}catch(cx){ci=e.createElement("a"),ci.href="",ci=ci.href}cj=cs.exec(ci.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&ct)return ct.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cq,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({ty
pe:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cA(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cA(a,b),a},ajaxSettings:{url:ci,isLocal:cm.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cw},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cy(cu),ajaxTransport:cy(cv),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cB(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHea
der("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cC(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=""+(c||y),k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cl.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return
c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(ck,"").replace(co,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=cs.exec(l.url.toLowerCase()),l.crossDomain=!(!i||i[1]==cj[1]&&i[2]==cj[2]&&(i[3]||(i[1]==="http:"?80:443))==(cj[3]||(cj[1]==="http:"?80:443)))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cz(cu,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!cn.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cp.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cr,"$1_="+z);l.url=A+(A===
l.url?(cp.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cw+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cz(cv,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cD=[],cE=/\?/,cF=/(=)\?(?=&|$)|\?\?/,cG=p.now();p.ajaxSetup({j
sonp:"callback",jsonpCallback:function(){var a=cD.pop()||p.expando+"_"+cG++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cF.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cF.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cF,"$1"+f):m?c.data=i.replace(cF,"$1"+f):k&&(c.url+=(cE.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cD.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":fu
nction(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cH,cI=a.ActiveXObject?function(){for(var a in cH)cH[a](0,1)}:!1,cJ=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cK()||cL()}:cK,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){v
ar d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cI&&delete cH[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cJ,cI&&(cH||(cH={},p(a).unload(cI)),cH[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});
var cM,cN,cO=/^(?:toggle|show|hide)$/,cP=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cQ=/queueHooks$/,cR=[cX],cS={"*":[function(a,b){var c,d,e,f=this.createTween(a,b),g=cP.exec(b),h=f.cur(),i=+h||0,j=1;if(g){c=+g[2],d=g[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&i){i=p.css(f.elem,a,!0)||c||1;do e=j=j||".5",i=i/j,p.style(f.elem,a,i+d),j=f.cur()/h;while(j!==1&&j!==e)}f.unit=d,f.start=i,f.end=g[1]?i+(g[1]+1)*c:c}return f}]};p.Animation=p.extend(cV,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cS[c]=cS[c]||[],cS[c].unshift(b)},prefilter:function(a,b){b?cR.unshift(a):cR.push(a)}}),p.Tween=cY,cY.prototype={constructor:cY,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cY.propHooks[this.prop];return a&&a.get?a.get(this):cY.propHooks._default.get(this)},run:function(a){var b,c=cY.prop
Hooks[this.prop];return this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration),this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cY.propHooks._default.set(this),this}},cY.prototype.init.prototype=cY.prototype,cY.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cY.propHooks.scrollTop=cY.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,argum
ents):this.animate(cZ(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bY).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cV(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cQ.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:cZ("show"),slideUp:cZ("hide"),slideToggle:cZ("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.a
nimate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d
<TRUNCATED>
[74/98] [abbrv] incubator-geode git commit: GEODE-2026: fix flaky test
Posted by ds...@apache.org.
GEODE-2026: fix flaky test
The test was initializing a value to a String,
then starting an async thread that would keep
changing it to an int,
it slept for 100ms and then assummed that the async
thread had changed the value to an Integer.
In rare cases the thread never was able to to its first
put so the value was still a String.
The test now waits for the async thread to change the value
to an Integer instead of doing a 100ms sleep.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/cd06c8c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/cd06c8c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/cd06c8c1
Branch: refs/heads/feature/GEM-983
Commit: cd06c8c19edc554a712859aa41243d39d5f0da09
Parents: af6a18c
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon Oct 24 16:15:04 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Tue Oct 25 10:42:29 2016 -0700
----------------------------------------------------------------------
.../PersistentPartitionedRegionDUnitTest.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cd06c8c1/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index 5ca3d01..9479883 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -1628,7 +1628,20 @@ public class PersistentPartitionedRegionDUnitTest extends PersistentPartitionedR
AsyncInvocation asyncCreate = vm0.invokeAsync(createData);
- Thread.sleep(100);
+ SerializableCallable waitForIntValue = new SerializableCallable() {
+ public Object call() {
+ Cache cache = getCache();
+ Region region = cache.getRegion(PR_REGION_NAME);
+ // The value is initialized as a String so wait
+ // for it to be changed to an Integer.
+ await().atMost(60, SECONDS).until(() -> {
+ return region.get(0) instanceof Integer;
+ });
+ return region.get(0);
+ }
+ };
+ vm0.invoke(waitForIntValue);
+ vm1.invoke(waitForIntValue);
AsyncInvocation close0 = closeCacheAsync(vm0);
AsyncInvocation close1 = closeCacheAsync(vm1);
[82/98] [abbrv] incubator-geode git commit: GEODE-2036 Fix
documentation typo
Posted by ds...@apache.org.
GEODE-2036 Fix documentation typo
Removed an old documentation reference to GemFire.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f6b534d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f6b534d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f6b534d0
Branch: refs/heads/feature/GEM-983
Commit: f6b534d024fa692eb6b68d215db9d7d33af86ac3
Parents: ee0666a
Author: Karen Miller <km...@pivotal.io>
Authored: Wed Oct 26 09:36:58 2016 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Wed Oct 26 09:43:54 2016 -0700
----------------------------------------------------------------------
geode-docs/getting_started/querying_quick_reference.html.md.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6b534d0/geode-docs/getting_started/querying_quick_reference.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/getting_started/querying_quick_reference.html.md.erb b/geode-docs/getting_started/querying_quick_reference.html.md.erb
index 7c684d9..5a117d2 100644
--- a/geode-docs/getting_started/querying_quick_reference.html.md.erb
+++ b/geode-docs/getting_started/querying_quick_reference.html.md.erb
@@ -583,7 +583,7 @@ QueryService qs = cache.getQueryService();
qs.createKeyIndex("myKeyIndex", "id", "exampleRegion");
```
-For more information on using this API, see the [GemFire JavaDocs](/releases/latest/javadoc/index.html).
+For more information on using this API, see the [JavaDocs](/releases/latest/javadoc/index.html).
**Sample XML**
[43/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
index 5e70c2f..edc2b7d 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.geode.cache.CacheFactory;
@@ -61,7 +59,8 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-abstract public class DeltaSessionManager extends ManagerBase implements Lifecycle, PropertyChangeListener, SessionManager {
+abstract public class DeltaSessionManager extends ManagerBase
+ implements Lifecycle, PropertyChangeListener, SessionManager {
/**
* The number of rejected sessions.
@@ -104,14 +103,15 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
protected static final boolean DEFAULT_PREFER_DESERIALIZED_FORM = true;
/*
- * This *MUST* only be assigned during start/startInternal otherwise it will be associated
- * with the incorrect context class loader.
+ * This *MUST* only be assigned during start/startInternal otherwise it will be associated with
+ * the incorrect context class loader.
*/
protected Log LOGGER;
protected String regionName = DEFAULT_REGION_NAME;
- protected String regionAttributesId; // the default is different for client-server and peer-to-peer
+ protected String regionAttributesId; // the default is different for client-server and
+ // peer-to-peer
protected Boolean enableLocalCache; // the default is different for client-server and peer-to-peer
@@ -131,9 +131,11 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
private final Set<String> sessionsToTouch;
- private static final long TIMER_TASK_PERIOD = Long.getLong("gemfiremodules.sessionTimerTaskPeriod", 10000);
+ private static final long TIMER_TASK_PERIOD =
+ Long.getLong("gemfiremodules.sessionTimerTaskPeriod", 10000);
- private static final long TIMER_TASK_DELAY = Long.getLong("gemfiremodules.sessionTimerTaskDelay", 10000);
+ private static final long TIMER_TASK_DELAY =
+ Long.getLong("gemfiremodules.sessionTimerTaskDelay", 10000);
public DeltaSessionManager() {
// Create the set to store sessions to be touched after get attribute requests
@@ -197,7 +199,7 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
@Override
public boolean getEnableGatewayDeltaReplication() {
- //return this.enableGatewayDeltaReplication;
+ // return this.enableGatewayDeltaReplication;
return false; // disabled
}
@@ -285,11 +287,11 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
}
/**
- * This method was taken from StandardManager to set the default maxInactiveInterval based on the container (to 30
- * minutes).
+ * This method was taken from StandardManager to set the default maxInactiveInterval based on the
+ * container (to 30 minutes).
* <p>
- * Set the Container with which this Manager has been associated. If it is a Context (the usual case), listen for
- * changes to the session timeout property.
+ * Set the Container with which this Manager has been associated. If it is a Context (the usual
+ * case), listen for changes to the session timeout property.
*
* @param container The associated Container
*/
@@ -317,32 +319,32 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
return null;
}
if (getLogger().isDebugEnabled()) {
- getLogger().debug(this + ": Finding session " + id + " in " + getSessionCache().getOperatingRegionName());
+ getLogger().debug(
+ this + ": Finding session " + id + " in " + getSessionCache().getOperatingRegionName());
}
DeltaSessionInterface session = (DeltaSessionInterface) getSessionCache().getSession(id);
/*
- * Check that the context name for this session is the same as this manager's.
- * This comes into play when multiple versions of a webapp are deployed and
- * active at the same time; the context name will contain an embedded
- * version number; something like /test###2.
+ * Check that the context name for this session is the same as this manager's. This comes into
+ * play when multiple versions of a webapp are deployed and active at the same time; the context
+ * name will contain an embedded version number; something like /test###2.
*/
- if (session != null &&
- !session.getContextName().isEmpty() &&
- !getContextName().equals(session.getContextName())) {
- getLogger().info(this + ": Session " + id +
- " rejected as container name and context do not match: " +
- getContextName() + " != " + session.getContextName());
+ if (session != null && !session.getContextName().isEmpty()
+ && !getContextName().equals(session.getContextName())) {
+ getLogger()
+ .info(this + ": Session " + id + " rejected as container name and context do not match: "
+ + getContextName() + " != " + session.getContextName());
session = null;
}
if (session == null) {
if (getLogger().isDebugEnabled()) {
- getLogger().debug(this + ": Did not find session " + id + " in " + getSessionCache().getOperatingRegionName());
+ getLogger().debug(this + ": Did not find session " + id + " in "
+ + getSessionCache().getOperatingRegionName());
}
} else {
if (getLogger().isDebugEnabled()) {
- getLogger().debug(
- this + ": Found session " + id + " in " + getSessionCache().getOperatingRegionName() + ": " + session);
+ getLogger().debug(this + ": Found session " + id + " in "
+ + getSessionCache().getOperatingRegionName() + ": " + session);
}
// The session was previously stored. Set new to false.
session.setNew(false);
@@ -368,8 +370,8 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
}
// Create the appropriate session cache
- this.sessionCache = cache.isClient() ? new ClientServerSessionCache(this, cache) : new PeerToPeerSessionCache(this,
- cache);
+ this.sessionCache = cache.isClient() ? new ClientServerSessionCache(this, cache)
+ : new PeerToPeerSessionCache(this, cache);
// Initialize the session cache
this.sessionCache.initialize();
@@ -386,39 +388,39 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
}
public void remove(Session session, boolean update) {
- //super.remove(session);
+ // super.remove(session);
// Remove the session from the region if necessary.
// It will have already been removed if it expired implicitly.
DeltaSessionInterface ds = (DeltaSessionInterface) session;
if (ds.getExpired()) {
if (getLogger().isDebugEnabled()) {
- getLogger().debug(
- this + ": Expired session " + session.getId() + " from " + getSessionCache().getOperatingRegionName());
+ getLogger().debug(this + ": Expired session " + session.getId() + " from "
+ + getSessionCache().getOperatingRegionName());
}
} else {
if (getLogger().isDebugEnabled()) {
- getLogger().debug(
- this + ": Destroying session " + session.getId() + " from " + getSessionCache().getOperatingRegionName());
+ getLogger().debug(this + ": Destroying session " + session.getId() + " from "
+ + getSessionCache().getOperatingRegionName());
}
getSessionCache().destroySession(session.getId());
if (getLogger().isDebugEnabled()) {
- getLogger().debug(
- this + ": Destroyed session " + session.getId() + " from " + getSessionCache().getOperatingRegionName());
+ getLogger().debug(this + ": Destroyed session " + session.getId() + " from "
+ + getSessionCache().getOperatingRegionName());
}
}
}
@Override
public void add(Session session) {
- //super.add(session);
+ // super.add(session);
if (getLogger().isDebugEnabled()) {
- getLogger().debug(
- this + ": Storing session " + session.getId() + " into " + getSessionCache().getOperatingRegionName());
+ getLogger().debug(this + ": Storing session " + session.getId() + " into "
+ + getSessionCache().getOperatingRegionName());
}
getSessionCache().putSession(session);
if (getLogger().isDebugEnabled()) {
- getLogger().debug(
- this + ": Stored session " + session.getId() + " into " + getSessionCache().getOperatingRegionName());
+ getLogger().debug(this + ": Stored session " + session.getId() + " into "
+ + getSessionCache().getOperatingRegionName());
}
getSessionCache().getStatistics().incSessionsCreated();
}
@@ -463,17 +465,16 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
}
/*
- * If local caching is enabled, add the session to the set of sessions to be
- * touched. A timer task will be periodically invoked to get the session in
- * the session region to update its last accessed time. This prevents the
- * session from expiring in the case where the application is only getting
- * attributes from the session and never putting attributes into the
- * session. If local caching is disabled. the session's last accessed time
- * would already have been updated properly in the sessions region.
+ * If local caching is enabled, add the session to the set of sessions to be touched. A timer task
+ * will be periodically invoked to get the session in the session region to update its last
+ * accessed time. This prevents the session from expiring in the case where the application is
+ * only getting attributes from the session and never putting attributes into the session. If
+ * local caching is disabled. the session's last accessed time would already have been updated
+ * properly in the sessions region.
*
- * Note: Due to issues in GemFire expiry, sessions are always asynchronously
- * touched using a function regardless whether or not local caching is
- * enabled. This prevents premature expiration.
+ * Note: Due to issues in GemFire expiry, sessions are always asynchronously touched using a
+ * function regardless whether or not local caching is enabled. This prevents premature
+ * expiration.
*/
protected void addSessionToTouch(String sessionId) {
this.sessionsToTouch.add(sessionId);
@@ -533,7 +534,8 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
if (currentActiveSessions > getMaxActive()) {
setMaxActive(currentActiveSessions);
if (getLogger().isDebugEnabled()) {
- getLogger().debug(DeltaSessionManager.this + ": Set max active sessions: " + currentActiveSessions);
+ getLogger().debug(
+ DeltaSessionManager.this + ": Set max active sessions: " + currentActiveSessions);
}
}
}
@@ -596,15 +598,20 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
/**
* Process property change events from our associated Context.
* <p>
- * Part of this method implementation was taken from StandardManager. The sessionTimeout can be changed in the web.xml
- * which is processed after the context.xml. The context (and the default session timeout) would already have been set
- * in this Manager. This is the way to get the new session timeout value specified in the web.xml.
+ * Part of this method implementation was taken from StandardManager. The sessionTimeout can be
+ * changed in the web.xml which is processed after the context.xml. The context (and the default
+ * session timeout) would already have been set in this Manager. This is the way to get the new
+ * session timeout value specified in the web.xml.
* <p>
* The precedence order for setting the session timeout value is:
* <p>
- * <ol> <li>the max inactive interval is set based on the Manager defined in the context.xml <li>the max inactive
- * interval is then overwritten by the value of the Context's session timeout when setContainer is called <li>the max
- * inactive interval is then overwritten by the value of the session-timeout specified in the web.xml (if any) </ol>
+ * <ol>
+ * <li>the max inactive interval is set based on the Manager defined in the context.xml
+ * <li>the max inactive interval is then overwritten by the value of the Context's session timeout
+ * when setContainer is called
+ * <li>the max inactive interval is then overwritten by the value of the session-timeout specified
+ * in the web.xml (if any)
+ * </ol>
*
* @param event The property change event that has occurred
*/
@@ -622,27 +629,27 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
try {
int interval = ((Integer) event.getNewValue()).intValue();
if (interval < RegionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL) {
- getLogger().warn(
- "The configured session timeout of " + interval + " minutes is invalid. Using the original value of " + event
- .getOldValue() + " minutes.");
- interval = ((Integer) event.getOldValue()).intValue();
- ;
+ getLogger().warn("The configured session timeout of " + interval
+ + " minutes is invalid. Using the original value of " + event.getOldValue()
+ + " minutes.");
+ interval = ((Integer) event.getOldValue()).intValue();;
}
// StandardContext.setSessionTimeout passes -1 if the configured timeout
// is 0; otherwise it passes the value set in web.xml. If the interval
// parameter equals the default, set the max inactive interval to the
// default (no expiration); otherwise set it in seconds.
- setMaxInactiveInterval(
- interval == RegionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL ? RegionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL : interval * 60);
+ setMaxInactiveInterval(interval == RegionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL
+ ? RegionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL : interval * 60);
} catch (NumberFormatException e) {
- getLogger().error(sm.getString("standardManager.sessionTimeout", event.getNewValue().toString()));
+ getLogger()
+ .error(sm.getString("standardManager.sessionTimeout", event.getNewValue().toString()));
}
}
}
/**
- * Save any currently active sessions in the appropriate persistence mechanism, if any. If persistence is not
- * supported, this method returns without doing anything.
+ * Save any currently active sessions in the appropriate persistence mechanism, if any. If
+ * persistence is not supported, this method returns without doing anything.
*
* @throws IOException if an input/output error occurs
*/
@@ -658,8 +665,8 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
} else {
regionName = "/" + getRegionName();
}
- Query query = querySvc.newQuery("select s.id from " + regionName +
- " as s where s.contextName = '" + context.getPath() + "'");
+ Query query = querySvc.newQuery("select s.id from " + regionName
+ + " as s where s.contextName = '" + context.getPath() + "'");
getLogger().debug("Query: " + query.getQueryString());
SelectResults results;
@@ -732,7 +739,8 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
}
// Write the number of active sessions, followed by the details
- if (getLogger().isDebugEnabled()) getLogger().debug("Unloading " + list.size() + " sessions");
+ if (getLogger().isDebugEnabled())
+ getLogger().debug("Unloading " + list.size() + " sessions");
try {
oos.writeObject(new Integer(list.size()));
for (DeltaSessionInterface session : list) {
@@ -740,9 +748,8 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
StandardSession standardSession = (StandardSession) session;
standardSession.passivate();
standardSession.writeObjectData(oos);
- }
- else {
- //All DeltaSessionInterfaces as of Geode 1.0 should be based on StandardSession
+ } else {
+ // All DeltaSessionInterfaces as of Geode 1.0 should be based on StandardSession
throw new IOException("Session should be of type StandardSession");
}
}
@@ -777,21 +784,21 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
}
}
-// // Expire all the sessions we just wrote
-// if (getLogger().isDebugEnabled()) {
-// getLogger().debug("Expiring " + list.size() + " persisted sessions");
-// }
-// Iterator<StandardSession> expires = list.iterator();
-// while (expires.hasNext()) {
-// StandardSession session = expires.next();
-// try {
-// session.expire(false);
-// } catch (Throwable t) {
-//// ExceptionUtils.handleThrowable(t);
-// } finally {
-// session.recycle();
-// }
-// }
+ // // Expire all the sessions we just wrote
+ // if (getLogger().isDebugEnabled()) {
+ // getLogger().debug("Expiring " + list.size() + " persisted sessions");
+ // }
+ // Iterator<StandardSession> expires = list.iterator();
+ // while (expires.hasNext()) {
+ // StandardSession session = expires.next();
+ // try {
+ // session.expire(false);
+ // } catch (Throwable t) {
+ //// ExceptionUtils.handleThrowable(t);
+ // } finally {
+ // session.recycle();
+ // }
+ // }
if (getLogger().isDebugEnabled()) {
getLogger().debug("Unloading complete");
@@ -799,11 +806,11 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
}
/**
- * Load any currently active sessions that were previously unloaded to the appropriate persistence mechanism, if any.
- * If persistence is not supported, this method returns without doing anything.
+ * Load any currently active sessions that were previously unloaded to the appropriate persistence
+ * mechanism, if any. If persistence is not supported, this method returns without doing anything.
*
* @throws ClassNotFoundException if a serialized class cannot be found during the reload
- * @throws IOException if an input/output error occurs
+ * @throws IOException if an input/output error occurs
*/
protected void doLoad() throws ClassNotFoundException, IOException {
Context context = getTheContext();
@@ -884,7 +891,8 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
Region region = getSessionCache().getOperatingRegion();
DeltaSessionInterface existingSession = (DeltaSessionInterface) region.get(session.getId());
// Check whether the existing session is newer
- if (existingSession != null && existingSession.getLastAccessedTime() > session.getLastAccessedTime()) {
+ if (existingSession != null
+ && existingSession.getLastAccessedTime() > session.getLastAccessedTime()) {
if (getLogger().isDebugEnabled()) {
getLogger().debug("Loaded session " + session.getId() + " is older than cached copy");
}
@@ -951,16 +959,9 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
@Override
public String toString() {
- return new StringBuilder().append(getClass().getSimpleName())
- .append("[")
- .append("container=")
- .append(getTheContext())
- .append("; regionName=")
- .append(this.regionName)
- .append("; regionAttributesId=")
- .append(this.regionAttributesId)
- .append("]")
- .toString();
+ return new StringBuilder().append(getClass().getSimpleName()).append("[").append("container=")
+ .append(getTheContext()).append("; regionName=").append(this.regionName)
+ .append("; regionAttributesId=").append(this.regionAttributesId).append("]").toString();
}
protected String getContextName() {
@@ -969,10 +970,10 @@ abstract public class DeltaSessionManager extends ManagerBase implements Lifecyc
public Context getTheContext() {
if (getContainer() instanceof Context) {
- return (Context) getContainer();
+ return (Context) getContainer();
} else {
- getLogger().error("Unable to unload sessions - container is of type " +
- getContainer().getClass().getName() + " instead of StandardContext");
+ getLogger().error("Unable to unload sessions - container is of type "
+ + getContainer().getClass().getName() + " instead of StandardContext");
return null;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java
index 0254fb4..b2b28fc 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/JvmRouteBinderValve.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.catalina.Manager;
@@ -48,7 +46,8 @@ public class JvmRouteBinderValve extends ValveBase {
getNext().invoke(request, response);
}
- private void handlePossibleFailover(Request request, DeltaSessionManager manager, String localJvmRoute) {
+ private void handlePossibleFailover(Request request, DeltaSessionManager manager,
+ String localJvmRoute) {
String sessionId = request.getRequestedSessionId();
if (sessionId != null) {
// Get request JVM route
@@ -62,13 +61,8 @@ public class JvmRouteBinderValve extends ValveBase {
if (requestJvmRoute != null && !requestJvmRoute.equals(localJvmRoute)) {
if (manager.getLogger().isDebugEnabled()) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Handling failover of session ")
- .append(sessionId)
- .append(" from ")
- .append(requestJvmRoute)
- .append(" to ")
- .append(localJvmRoute);
+ builder.append(this).append(": Handling failover of session ").append(sessionId)
+ .append(" from ").append(requestJvmRoute).append(" to ").append(localJvmRoute);
manager.getLogger().debug(builder.toString());
}
// Get the original session
@@ -77,21 +71,15 @@ public class JvmRouteBinderValve extends ValveBase {
session = manager.findSession(sessionId);
} catch (IOException e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Caught exception attempting to find session ")
- .append(sessionId)
- .append(" in ")
- .append(manager);
+ builder.append(this).append(": Caught exception attempting to find session ")
+ .append(sessionId).append(" in ").append(manager);
manager.getLogger().warn(builder.toString(), e);
}
if (session == null) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Did not find session ")
- .append(sessionId)
- .append(" to failover in ")
- .append(manager);
+ builder.append(this).append(": Did not find session ").append(sessionId)
+ .append(" to failover in ").append(manager);
manager.getLogger().warn(builder.toString());
} else {
// Change its session id. This removes the previous session and creates the new one.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.java
index 254e4d3..ac797fc 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerCacheLifecycleListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.geode.modules.session.bootstrap.PeerToPeerCache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
index 82bcc6f..0e1097b 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/PeerToPeerSessionCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.geode.cache.Cache;
@@ -60,7 +58,8 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
// If local cache is enabled, create the local region fronting the session region
// and set it as the operating region; otherwise, use the session region directly
// as the operating region.
- this.operatingRegion = getSessionManager().getEnableLocalCache() ? createOrRetrieveLocalRegion() : this.sessionRegion;
+ this.operatingRegion = getSessionManager().getEnableLocalCache() ? createOrRetrieveLocalRegion()
+ : this.sessionRegion;
// Create or retrieve the statistics
createStatistics();
@@ -92,7 +91,7 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
} else {
// Execute the member touch function on all the server(s)
Execution execution = FunctionService.onMembers(getCache().getDistributedSystem())
- .withArgs(new Object[]{this.sessionRegion.getFullPath(), sessionIds});
+ .withArgs(new Object[] {this.sessionRegion.getFullPath(), sessionIds});
collector = execution.execute(TouchReplicatedRegionEntriesFunction.ID, true, false, false);
}
@@ -186,7 +185,8 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
Region<String, HttpSession> frontingRegion = this.cache.getRegion(frontingRegionName);
if (frontingRegion == null) {
// Create the region factory
- RegionFactory<String, HttpSession> factory = this.cache.createRegionFactory(RegionShortcut.LOCAL_HEAP_LRU);
+ RegionFactory<String, HttpSession> factory =
+ this.cache.createRegionFactory(RegionShortcut.LOCAL_HEAP_LRU);
// Add the cache loader and writer
factory.setCacheLoader(new LocalSessionCacheLoader(this.sessionRegion));
@@ -203,13 +203,15 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
// Create the region
frontingRegion = factory.create(frontingRegionName);
if (getSessionManager().getLogger().isDebugEnabled()) {
- getSessionManager().getLogger().debug("Created new local session region: " + frontingRegion);
+ getSessionManager().getLogger()
+ .debug("Created new local session region: " + frontingRegion);
}
} else {
if (getSessionManager().getLogger().isDebugEnabled()) {
- getSessionManager().getLogger().debug("Retrieved existing local session region: " + frontingRegion);
+ getSessionManager().getLogger()
+ .debug("Retrieved existing local session region: " + frontingRegion);
}
}
return frontingRegion;
}
-}
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
index fc6c3cd..5c0fecd 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.geode.cache.GemFireCache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java
index 6afd1ca..e739fa4 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/SessionManager.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.juli.logging.Log;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java
index f35c088..45b777b 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/Tomcat6DeltaSessionManager.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.catalina.LifecycleException;
@@ -28,10 +26,12 @@ public class Tomcat6DeltaSessionManager extends DeltaSessionManager {
protected LifecycleSupport lifecycle = new LifecycleSupport(this);
/**
- * Prepare for the beginning of active use of the public methods of this component. This method should be called
- * after <code>configure()</code>, and before any of the public methods of the component are utilized.
+ * Prepare for the beginning of active use of the public methods of this component. This method
+ * should be called after <code>configure()</code>, and before any of the public methods of the
+ * component are utilized.
*
- * @throws LifecycleException if this component detects a fatal error that prevents this component from being used
+ * @throws LifecycleException if this component detects a fatal error that prevents this component
+ * from being used
*/
@Override
public void start() throws LifecycleException {
@@ -65,8 +65,8 @@ public class Tomcat6DeltaSessionManager extends DeltaSessionManager {
}
/**
- * Gracefully terminate the active use of the public methods of this component. This method should be the last one
- * called on a given instance of this component.
+ * Gracefully terminate the active use of the public methods of this component. This method should
+ * be the last one called on a given instance of this component.
*
* @throws LifecycleException if this component detects a fatal error that needs to be reported
*/
@@ -114,8 +114,8 @@ public class Tomcat6DeltaSessionManager extends DeltaSessionManager {
}
/**
- * Get the lifecycle listeners associated with this lifecycle. If this Lifecycle has no listeners registered, a
- * zero-length array is returned.
+ * Get the lifecycle listeners associated with this lifecycle. If this Lifecycle has no listeners
+ * registered, a zero-length array is returned.
*/
@Override
public LifecycleListener[] findLifecycleListeners() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java
index ca86051..2686b44 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheLoader.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina.callback;
import org.apache.geode.cache.CacheLoader;
@@ -37,9 +35,7 @@ public class LocalSessionCacheLoader implements CacheLoader<String, HttpSession>
return this.backingRegion.get(helper.getKey());
}
- public void close() {
- }
+ public void close() {}
- public void init(Properties p) {
- }
+ public void init(Properties p) {}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java
index a138f86..238f55e 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/LocalSessionCacheWriter.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina.callback;
import org.apache.geode.cache.CacheWriterException;
@@ -26,7 +24,8 @@ import org.apache.geode.cache.util.CacheWriterAdapter;
import javax.servlet.http.HttpSession;
import java.util.Properties;
-public class LocalSessionCacheWriter extends CacheWriterAdapter<String, HttpSession> implements Declarable {
+public class LocalSessionCacheWriter extends CacheWriterAdapter<String, HttpSession>
+ implements Declarable {
private final Region<String, HttpSession> backingRegion;
@@ -51,9 +50,7 @@ public class LocalSessionCacheWriter extends CacheWriterAdapter<String, HttpSess
}
}
- public void close() {
- }
+ public void close() {}
- public void init(Properties p) {
- }
+ public void init(Properties p) {}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java
index fd2b472..caaaa37 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/callback/SessionExpirationCacheListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina.callback;
import org.apache.geode.cache.Declarable;
@@ -28,7 +26,8 @@ import java.util.Properties;
import org.apache.catalina.session.ManagerBase;
-public class SessionExpirationCacheListener extends CacheListenerAdapter<String, HttpSession> implements Declarable {
+public class SessionExpirationCacheListener extends CacheListenerAdapter<String, HttpSession>
+ implements Declarable {
public void afterDestroy(EntryEvent<String, HttpSession> event) {
// A Session expired. If it was destroyed by GemFire expiration, process it.
@@ -39,11 +38,10 @@ public class SessionExpirationCacheListener extends CacheListenerAdapter<String,
session = (DeltaSessionInterface) event.getOldValue();
} else {
/*
- * This comes into play when we're dealing with an empty client proxy. We
- * need the actual destroyed object to come back from the server so that
- * any associated listeners can fire correctly. Having the destroyed
- * object come back as the callback arg depends on setting the property
- * gemfire.EXPIRE_SENDS_ENTRY_AS_CALLBACK.
+ * This comes into play when we're dealing with an empty client proxy. We need the actual
+ * destroyed object to come back from the server so that any associated listeners can fire
+ * correctly. Having the destroyed object come back as the callback arg depends on setting the
+ * property gemfire.EXPIRE_SENDS_ENTRY_AS_CALLBACK.
*/
Object callback = event.getCallbackArgument();
if (callback != null && callback instanceof DeltaSessionInterface) {
@@ -59,8 +57,7 @@ public class SessionExpirationCacheListener extends CacheListenerAdapter<String,
}
}
- public void init(Properties p) {
- }
+ public void init(Properties p) {}
public boolean equals(Object obj) {
// This method is only implemented so that RegionAttributesCreation.sameAs
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java
index 9bc9f7e..896eb86 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEvent.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina.internal;
import org.apache.geode.DataSerializable;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java
index 3ccd2d0..4558047 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionAttributeEventBatch.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina.internal;
import org.apache.geode.DataSerializer;
@@ -34,8 +32,7 @@ public class DeltaSessionAttributeEventBatch extends AbstractGatewayDeltaEvent {
private List<DeltaSessionAttributeEvent> eventQueue;
- public DeltaSessionAttributeEventBatch() {
- }
+ public DeltaSessionAttributeEventBatch() {}
public DeltaSessionAttributeEventBatch(String regionName, String sessionId,
List<DeltaSessionAttributeEvent> eventQueue) {
@@ -52,7 +49,8 @@ public class DeltaSessionAttributeEventBatch extends AbstractGatewayDeltaEvent {
DeltaSessionInterface session = region.get(this.key);
if (session == null) {
StringBuilder builder = new StringBuilder();
- builder.append("Session ").append(this.key).append(" was not found while attempting to apply ").append(this);
+ builder.append("Session ").append(this.key)
+ .append(" was not found while attempting to apply ").append(this);
cache.getLogger().warning(builder.toString());
} else {
session.applyAttributeEvents(region, this.eventQueue);
@@ -75,15 +73,9 @@ public class DeltaSessionAttributeEventBatch extends AbstractGatewayDeltaEvent {
}
public String toString() {
- return new StringBuilder().append("DeltaSessionAttributeEventBatch[")
- .append("regionName=")
- .append(this.regionName)
- .append("; sessionId=")
- .append(this.key)
- .append("; numberOfEvents=")
- .append(this.eventQueue.size())
- .append("]")
- .toString();
+ return new StringBuilder().append("DeltaSessionAttributeEventBatch[").append("regionName=")
+ .append(this.regionName).append("; sessionId=").append(this.key).append("; numberOfEvents=")
+ .append(this.eventQueue.size()).append("]").toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java
index 021f2ef..7ab59a5 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionDestroyAttributeEvent.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina.internal;
import org.apache.geode.DataSerializable;
@@ -32,8 +30,7 @@ public class DeltaSessionDestroyAttributeEvent implements DeltaSessionAttributeE
private String attributeName;
- public DeltaSessionDestroyAttributeEvent() {
- }
+ public DeltaSessionDestroyAttributeEvent() {}
public DeltaSessionDestroyAttributeEvent(String attributeName) {
this.attributeName = attributeName;
@@ -64,11 +61,8 @@ public class DeltaSessionDestroyAttributeEvent implements DeltaSessionAttributeE
}
public String toString() {
- return new StringBuilder().append("DeltaSessionDestroyAttributeEvent[")
- .append("attributeName=")
- .append(this.attributeName)
- .append("]")
- .toString();
+ return new StringBuilder().append("DeltaSessionDestroyAttributeEvent[").append("attributeName=")
+ .append(this.attributeName).append("]").toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java
index ed0196f..57c14b4 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionStatistics.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina.internal;
import org.apache.geode.StatisticDescriptor;
@@ -41,10 +39,12 @@ public class DeltaSessionStatistics {
// Initialize type
StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
type = f.createType(typeName, typeName,
- new StatisticDescriptor[]{f.createIntCounter(SESSIONS_CREATED, "The number of sessions created",
- "operations"), f.createIntCounter(SESSIONS_INVALIDATED,
- "The number of sessions invalidated by invoking invalidate", "operations"), f.createIntCounter(
- SESSIONS_EXPIRED, "The number of sessions invalidated by timeout", "operations"),});
+ new StatisticDescriptor[] {
+ f.createIntCounter(SESSIONS_CREATED, "The number of sessions created", "operations"),
+ f.createIntCounter(SESSIONS_INVALIDATED,
+ "The number of sessions invalidated by invoking invalidate", "operations"),
+ f.createIntCounter(SESSIONS_EXPIRED, "The number of sessions invalidated by timeout",
+ "operations"),});
// Initialize id fields
sessionsCreatedId = type.nameToId(SESSIONS_CREATED);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java
index 0ea8635..090a1a3 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/internal/DeltaSessionUpdateAttributeEvent.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina.internal;
import org.apache.geode.DataSerializable;
@@ -33,8 +31,7 @@ public class DeltaSessionUpdateAttributeEvent implements DeltaSessionAttributeEv
private Object attributeValue;
- public DeltaSessionUpdateAttributeEvent() {
- }
+ public DeltaSessionUpdateAttributeEvent() {}
public DeltaSessionUpdateAttributeEvent(String attributeName, Object attributeValue) {
this.attributeName = attributeName;
@@ -72,13 +69,9 @@ public class DeltaSessionUpdateAttributeEvent implements DeltaSessionAttributeEv
}
public String toString() {
- return new StringBuilder().append("DeltaSessionUpdateAttributeEvent[")
- .append("attributeName=")
- .append(this.attributeName)
- .append("; attributeValue=")
- .append(this.attributeValue)
- .append("]")
- .toString();
+ return new StringBuilder().append("DeltaSessionUpdateAttributeEvent[").append("attributeName=")
+ .append(this.attributeName).append("; attributeValue=").append(this.attributeValue)
+ .append("]").toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java
index 7aeb9ff..e3dff53 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/Banner.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.internal.GemFireVersion;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
index 943a803..64ecef3 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/BootstrappingFunction.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.cache.Cache;
@@ -37,7 +35,8 @@ public class BootstrappingFunction implements Function, MembershipListener {
public static final String ID = "bootstrapping-function";
- private static final int TIME_TO_WAIT_FOR_CACHE = Integer.getInteger("gemfiremodules.timeToWaitForCache", 30000);
+ private static final int TIME_TO_WAIT_FOR_CACHE =
+ Integer.getInteger("gemfiremodules.timeToWaitForCache", 30000);
@Override
public void execute(FunctionContext context) {
@@ -64,7 +63,7 @@ public class BootstrappingFunction implements Function, MembershipListener {
cache = CacheFactory.getAnyInstance();
break;
} catch (Exception ignore) {
- //keep trying and hope for the best
+ // keep trying and hope for the best
}
try {
Thread.sleep(250);
@@ -169,8 +168,7 @@ public class BootstrappingFunction implements Function, MembershipListener {
}
@Override
- public void memberDeparted(InternalDistributedMember id, boolean crashed) {
- }
+ public void memberDeparted(InternalDistributedMember id, boolean crashed) {}
@Override
public void memberJoined(InternalDistributedMember id) {
@@ -178,11 +176,10 @@ public class BootstrappingFunction implements Function, MembershipListener {
}
@Override
- public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected, String reason) {
- }
+ public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected,
+ String reason) {}
@Override
public void quorumLost(Set<InternalDistributedMember> internalDistributedMembers,
- List<InternalDistributedMember> internalDistributedMembers2) {
- }
+ List<InternalDistributedMember> internalDistributedMembers2) {}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java
index e0297bb..d5ebbab 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ClassLoaderObjectInputStream.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java
index 505b797..703c785 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/ContextMapper.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.util;
import org.apache.geode.modules.session.catalina.DeltaSessionManager;
@@ -26,11 +24,13 @@ import org.apache.catalina.session.ManagerBase;
/**
* This basic singleton class maps context paths to manager instances.
* <p>
- * This class exists for a particular corner case described here. Consider a client-server environment with empty client
- * regions *and* the need to fire HttpSessionListener destroy events. When a session expires, in this scenario, the
- * Gemfire destroy events originate on the server and, with some Gemfire hackery, the destroyed object ends up as the
- * event's callback argument. At the point that the CacheListener then gets the event, the re-constituted session object
- * has no manager associated and so we need to re-attach a manager to it so that events can be fired correctly.
+ * This class exists for a particular corner case described here. Consider a client-server
+ * environment with empty client regions *and* the need to fire HttpSessionListener destroy events.
+ * When a session expires, in this scenario, the Gemfire destroy events originate on the server and,
+ * with some Gemfire hackery, the destroyed object ends up as the event's callback argument. At the
+ * point that the CacheListener then gets the event, the re-constituted session object has no
+ * manager associated and so we need to re-attach a manager to it so that events can be fired
+ * correctly.
*/
public class ContextMapper {
[34/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/DataSerializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
index 09b6ced..29b20a2 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
@@ -1,18 +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
+ * 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;
@@ -69,63 +67,54 @@ import org.apache.geode.internal.offheap.StoredObject;
import org.apache.geode.pdx.PdxInstance;
/**
- * Provides static helper methods for reading and writing
- * non-primitive data when working with a {@link DataSerializable}.
- * For instance, classes that implement <code>DataSerializable</code>
- * can use the <code>DataSerializer</code> in their
- * <code>toData</code> and <code>fromData</code> methods:
+ * Provides static helper methods for reading and writing non-primitive data when working with a
+ * {@link DataSerializable}. For instance, classes that implement <code>DataSerializable</code> can
+ * use the <code>DataSerializer</code> in their <code>toData</code> and <code>fromData</code>
+ * methods:
*
- * <!--
- * The source code for the Employee class resides in
- * tests/com/examples/ds/Employee.java
- * Please keep the below code snippet in sync with that file.
- * -->
+ * <!-- The source code for the Employee class resides in tests/com/examples/ds/Employee.java Please
+ * keep the below code snippet in sync with that file. -->
*
* <PRE>
-public class Employee implements DataSerializable {
- private int id;
- private String name;
- private Date birthday;
- private Company employer;
-
- public void toData(DataOutput out) throws IOException {
- out.writeInt(this.id);
- out.writeUTF(this.name);
- DataSerializer.writeDate(this.birthday, out);
- DataSerializer.writeObject(this.employer, out);
- }
-
- public void fromData(DataInput in)
- throws IOException, ClassNotFoundException {
-
- this.id = in.readInt();
- this.name = in.readUTF();
- this.birthday = DataSerializer.readDate(in);
- this.employer = (Company) DataSerializer.readObject(in);
- }
-}
-
+ * public class Employee implements DataSerializable {
+ * private int id;
+ * private String name;
+ * private Date birthday;
+ * private Company employer;
+ *
+ * public void toData(DataOutput out) throws IOException {
+ * out.writeInt(this.id);
+ * out.writeUTF(this.name);
+ * DataSerializer.writeDate(this.birthday, out);
+ * DataSerializer.writeObject(this.employer, out);
+ * }
+ *
+ * public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+ *
+ * this.id = in.readInt();
+ * this.name = in.readUTF();
+ * this.birthday = DataSerializer.readDate(in);
+ * this.employer = (Company) DataSerializer.readObject(in);
+ * }
+ * }
+ *
* </PRE>
*
* <P>
*
- * Instances of <code>DataSerializer</code> are used to data serialize
- * objects (such as instances of standard Java classes or third-party
- * classes for which the source code is not available) that do not
- * implement the <code>DataSerializable</code> interface.
+ * Instances of <code>DataSerializer</code> are used to data serialize objects (such as instances of
+ * standard Java classes or third-party classes for which the source code is not available) that do
+ * not implement the <code>DataSerializable</code> interface.
*
* <P>
*
- * The following <code>DataSerializer</code> data serializes instances
- * of <code>Company</code>. In order for the data serialization
- * framework to consult this custom serializer, it must be {@linkplain
- * #register(Class) registered} with the framework.
+ * The following <code>DataSerializer</code> data serializes instances of <code>Company</code>. In
+ * order for the data serialization framework to consult this custom serializer, it must be
+ * {@linkplain #register(Class) registered} with the framework.
*
- * <!--
- * The source code for the CompanySerializer class resides in
- * tests/com/examples/ds/CompanySerializer.java
- * Please keep the below code snippet in sync with that file.
- * -->
+ * <!-- The source code for the CompanySerializer class resides in
+ * tests/com/examples/ds/CompanySerializer.java Please keep the below code snippet in sync with that
+ * file. -->
*
* <PRE>
public class CompanySerializer extends DataSerializer {
@@ -175,21 +164,21 @@ public class CompanySerializer extends DataSerializer {
}
* </PRE>
*
- * Just like {@link Instantiator}s, a <code>DataSerializer</code> may
- * be sent to other members of the distributed system when it is
- * {@linkplain #register(Class) registered}. The data serialization
- * framework does not require that a <code>DataSerializer</code> be
- * {@link Serializable}, but it does require that it provide a
- * {@linkplain #DataSerializer() zero-argument constructor}.
+ * Just like {@link Instantiator}s, a <code>DataSerializer</code> may be sent to other members of
+ * the distributed system when it is {@linkplain #register(Class) registered}. The data
+ * serialization framework does not require that a <code>DataSerializer</code> be
+ * {@link Serializable}, but it does require that it provide a {@linkplain #DataSerializer()
+ * zero-argument constructor}.
*
* @see #writeObject(Object, DataOutput)
* @see #readObject
*
- * @since GemFire 3.5 */
+ * @since GemFire 3.5
+ */
public abstract class DataSerializer {
-
+
private static final Logger logger = LogService.getLogger();
-
+
/** The eventId of this <code>DataSerializer</code> */
private EventID eventId;
@@ -197,29 +186,25 @@ public abstract class DataSerializer {
private ClientProxyMembershipID context;
protected static final boolean TRACE_SERIALIZABLE =
- Boolean.getBoolean("DataSerializer.TRACE_SERIALIZABLE");
+ Boolean.getBoolean("DataSerializer.TRACE_SERIALIZABLE");
/* Used to prevent standard Java serialization when sending data to a non-Java client */
- protected static final ThreadLocal<Boolean> DISALLOW_JAVA_SERIALIZATION = new ThreadLocal<Boolean>();
+ protected static final ThreadLocal<Boolean> DISALLOW_JAVA_SERIALIZATION =
+ new ThreadLocal<Boolean>();
- ////////////////////// Instance Fields /////////////////////
+ ////////////////////// Instance Fields /////////////////////
- ////////////////////// Static Methods //////////////////////
+ ////////////////////// Static Methods //////////////////////
/**
- * Writes an instance of <code>Class</code> to a
- * <code>DataOutput</code>.
- * This method will handle a
- * <code>null</code> value and not throw a
- * <code>NullPointerException</code>.
+ * Writes an instance of <code>Class</code> to a <code>DataOutput</code>. This method will handle
+ * a <code>null</code> value and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readClass
*/
- public static void writeClass(Class<?> c, DataOutput out)
- throws IOException {
+ public static void writeClass(Class<?> c, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -229,8 +214,7 @@ public abstract class DataSerializer {
if (c == null || c.isPrimitive()) {
InternalDataSerializer.writePrimitiveClass(c, out);
- }
- else {
+ } else {
// non-primitive classes have a second CLASS byte
// if readObject/writeObject is called:
// the first CLASS byte indicates it's a Class, the second
@@ -243,16 +227,15 @@ public abstract class DataSerializer {
}
/**
- * Writes class name to a <code>DataOutput</code>. This method will handle a
- * <code>null</code> value and not throw a <code>NullPointerException</code>.
+ * Writes class name to a <code>DataOutput</code>. This method will handle a <code>null</code>
+ * value and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readNonPrimitiveClassName(DataInput)
*/
public static void writeNonPrimitiveClassName(String className, DataOutput out)
- throws IOException {
+ throws IOException {
InternalDataSerializer.checkOut(out);
@@ -264,19 +247,14 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>Class</code> from a
- * <code>DataInput</code>. The class will be loaded using the
- * {@linkplain Thread#getContextClassLoader current content class
- * loader}.
- * The return value may be <code>null</code>.
+ * Reads an instance of <code>Class</code> from a <code>DataInput</code>. The class will be loaded
+ * using the {@linkplain Thread#getContextClassLoader current content class loader}. The return
+ * value may be <code>null</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
- * @throws ClassNotFoundException
- * The class cannot be loaded
+ * @throws IOException A problem occurs while reading from <code>in</code>
+ * @throws ClassNotFoundException The class cannot be loaded
*/
- public static Class<?> readClass(DataInput in)
- throws IOException, ClassNotFoundException {
+ public static Class<?> readClass(DataInput in) throws IOException, ClassNotFoundException {
InternalDataSerializer.checkIn(in);
@@ -286,23 +264,22 @@ public abstract class DataSerializer {
className = swizzleClassNameForRead(className, in);
Class<?> c = InternalDataSerializer.getCachedClass(className); // fix for bug 41206
return c;
- }
- else {
+ } else {
return InternalDataSerializer.decodePrimitiveClass(typeCode);
}
}
-
+
/**
- * For backward compatibility we must swizzle the package of
- * some classes that had to be moved when GemFire was open-
- * sourced. This preserves backward-compatibility.
+ * For backward compatibility we must swizzle the package of some classes that had to be moved
+ * when GemFire was open- sourced. This preserves backward-compatibility.
*
* @param name the fully qualified class name
* @param in the source of the class name
* @return the name of the class in this implementation
*/
private static String swizzleClassNameForRead(String name, DataInput in) {
- // TCPServer classes are used before a cache exists and support for old clients has been initialized
+ // TCPServer classes are used before a cache exists and support for old clients has been
+ // initialized
String oldPackage = "com.gemstone.org.jgroups.stack.tcpserver";
String newPackage = "org.apache.geode.distributed.internal.tcpserver";
if (name.startsWith(oldPackage)) {
@@ -314,18 +291,18 @@ public abstract class DataSerializer {
}
return name;
}
-
+
/**
- * For backward compatibility we must swizzle the package of
- * some classes that had to be moved when GemFire was open-
- * sourced. This preserves backward-compatibility.
+ * For backward compatibility we must swizzle the package of some classes that had to be moved
+ * when GemFire was open- sourced. This preserves backward-compatibility.
*
* @param name the fully qualified class name
* @param out the consumer of the serialized object
* @return the name of the class in this implementation
*/
private static String swizzleClassNameForWrite(String name, DataOutput out) {
- // TCPServer classes are used before a cache exists and support for old clients has been initialized
+ // TCPServer classes are used before a cache exists and support for old clients has been
+ // initialized
String oldPackage = "com.gemstone.org.jgroups.stack.tcpserver";
String newPackage = "org.apache.geode.distributed.internal.tcpserver";
if (name.startsWith(newPackage)) {
@@ -337,19 +314,16 @@ public abstract class DataSerializer {
}
return name;
}
-
+
/**
- * Reads name of an instance of <code>Class</code> from a
- * <code>DataInput</code>.
+ * Reads name of an instance of <code>Class</code> from a <code>DataInput</code>.
*
* The return value may be <code>null</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @see #writeNonPrimitiveClassName(String, DataOutput)
*/
- public static String readNonPrimitiveClassName(DataInput in)
- throws IOException {
+ public static String readNonPrimitiveClassName(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -357,42 +331,38 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of Region. A Region is serialized as just a reference
- * to a full path only. It will be recreated on the other end by calling
- * {@link CacheFactory#getAnyInstance} and then calling
- * <code>getRegion</code> on it.
- * This method will handle a
- * <code>null</code> value and not throw a
- * <code>NullPointerException</code>.
+ * Writes an instance of Region. A Region is serialized as just a reference to a full path only.
+ * It will be recreated on the other end by calling {@link CacheFactory#getAnyInstance} and then
+ * calling <code>getRegion</code> on it. This method will handle a <code>null</code> value and not
+ * throw a <code>NullPointerException</code>.
*/
- public static void writeRegion(Region<?,?> rgn, DataOutput out)
- throws IOException {
+ public static void writeRegion(Region<?, ?> rgn, DataOutput out) throws IOException {
writeString((rgn != null) ? rgn.getFullPath() : null, out);
}
/**
- * Reads an instance of Region. A Region is serialized as a reference to a
- * full path only. It is recreated on the other end by calling
- * {@link CacheFactory#getAnyInstance} and then calling
- * <code>getRegion</code> on it.
- * The return value may be <code>null</code>.
+ * Reads an instance of Region. A Region is serialized as a reference to a full path only. It is
+ * recreated on the other end by calling {@link CacheFactory#getAnyInstance} and then calling
+ * <code>getRegion</code> on it. The return value may be <code>null</code>.
*
* @param in the input stream
* @return the Region instance
* @throws org.apache.geode.cache.CacheClosedException if a cache has not been created or the only
- * created one is closed.
- * @throws RegionNotFoundException if there is no region by this name
- * in the Cache
+ * created one is closed.
+ * @throws RegionNotFoundException if there is no region by this name in the Cache
*/
- public static <K,V> Region<K,V> readRegion(DataInput in)
- throws IOException, ClassNotFoundException {
+ public static <K, V> Region<K, V> readRegion(DataInput in)
+ throws IOException, ClassNotFoundException {
String fullPath = readString(in);
- Region<K,V> rgn = null;
+ Region<K, V> rgn = null;
if (fullPath != null) {
// use getExisting to fix bug 43151
- rgn = ((Cache)GemFireCacheImpl.getExisting("Needed cache to find region.")).getRegion(fullPath);
+ rgn = ((Cache) GemFireCacheImpl.getExisting("Needed cache to find region."))
+ .getRegion(fullPath);
if (rgn == null) {
- throw new RegionNotFoundException(LocalizedStrings.DataSerializer_REGION_0_COULD_NOT_BE_FOUND_WHILE_READING_A_DATASERIALIZER_STREAM.toLocalizedString(fullPath));
+ throw new RegionNotFoundException(
+ LocalizedStrings.DataSerializer_REGION_0_COULD_NOT_BE_FOUND_WHILE_READING_A_DATASERIALIZER_STREAM
+ .toLocalizedString(fullPath));
}
}
return rgn;
@@ -400,24 +370,18 @@ public abstract class DataSerializer {
/**
- * Writes an instance of <code>Date</code> to a
- * <code>DataOutput</code>. Note that even though <code>date</code>
- * may be an instance of a subclass of <code>Date</code>,
- * <code>readDate</code> will always return an instance of
- * <code>Date</code>, <B>not</B> an instance of the subclass. To
- * preserve the class type of <code>date</code>,\
- * {@link #writeObject(Object, DataOutput)} should be used for data serialization.
- * This method will handle a
- * <code>null</code> value and not throw a
- * <code>NullPointerException</code>.
+ * Writes an instance of <code>Date</code> to a <code>DataOutput</code>. Note that even though
+ * <code>date</code> may be an instance of a subclass of <code>Date</code>, <code>readDate</code>
+ * will always return an instance of <code>Date</code>, <B>not</B> an instance of the subclass. To
+ * preserve the class type of <code>date</code>,\ {@link #writeObject(Object, DataOutput)} should
+ * be used for data serialization. This method will handle a <code>null</code> value and not throw
+ * a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readDate
*/
- public static void writeDate(Date date, DataOutput out)
- throws IOException {
+ public static void writeDate(Date date, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -431,19 +395,18 @@ public abstract class DataSerializer {
} else {
v = date.getTime();
if (v == -1L) {
- throw new IllegalArgumentException("Dates whose getTime returns -1 can not be DataSerialized.");
+ throw new IllegalArgumentException(
+ "Dates whose getTime returns -1 can not be DataSerialized.");
}
}
out.writeLong(v);
}
/**
- * Reads an instance of <code>Date</code> from a
- * <code>DataInput</code>.
- * The return value may be <code>null</code>.
+ * Reads an instance of <code>Date</code> from a <code>DataInput</code>. The return value may be
+ * <code>null</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static Date readDate(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -462,25 +425,19 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>File</code> to a
- * <code>DataOutput</code>. Note that even though <code>file</code>
- * may be an instance of a subclass of <code>File</code>,
- * <code>readFile</code> will always return an instance of
- * <code>File</code>, <B>not</B> an instance of the subclass. To
- * preserve the class type of <code>file</code>,
- * {@link #writeObject(Object, DataOutput)} should be used for data serialization.
- * This method will handle a
- * <code>null</code> value and not throw a
- * <code>NullPointerException</code>.
+ * Writes an instance of <code>File</code> to a <code>DataOutput</code>. Note that even though
+ * <code>file</code> may be an instance of a subclass of <code>File</code>, <code>readFile</code>
+ * will always return an instance of <code>File</code>, <B>not</B> an instance of the subclass. To
+ * preserve the class type of <code>file</code>, {@link #writeObject(Object, DataOutput)} should
+ * be used for data serialization. This method will handle a <code>null</code> value and not throw
+ * a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readFile
* @see File#getCanonicalPath
*/
- public static void writeFile(File file, DataOutput out)
- throws IOException {
+ public static void writeFile(File file, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -492,12 +449,10 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>File</code> from a
- * <code>DataInput</code>.
- * The return value may be <code>null</code>.
+ * Reads an instance of <code>File</code> from a <code>DataInput</code>. The return value may be
+ * <code>null</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static File readFile(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -515,30 +470,22 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>InetAddress</code> to a
- * <code>DataOutput</code>. The <code>InetAddress</code> is data
- * serialized by writing its {@link InetAddress#getAddress byte}
- * representation to the <code>DataOutput</code>. {@link
- * #readInetAddress} converts the <code>byte</code> representation
- * to an instance of <code>InetAddress</code> using {@link
- * InetAddress#getAddress}. As a result, if <code>address</code>
- * is an instance of a user-defined subclass of
- * <code>InetAddress</code> (that is, not an instance of one of the
- * subclasses from the <code>java.net</code> package), its class
- * will not be preserved. In order to be able to read an instance
- * of the user-defined class, {@link #writeObject(Object, DataOutput)} should be used.
- * This method will handle a
- * <code>null</code> value and not throw a
- * <code>NullPointerException</code>.
+ * Writes an instance of <code>InetAddress</code> to a <code>DataOutput</code>. The
+ * <code>InetAddress</code> is data serialized by writing its {@link InetAddress#getAddress byte}
+ * representation to the <code>DataOutput</code>. {@link #readInetAddress} converts the
+ * <code>byte</code> representation to an instance of <code>InetAddress</code> using
+ * {@link InetAddress#getAddress}. As a result, if <code>address</code> is an instance of a
+ * user-defined subclass of <code>InetAddress</code> (that is, not an instance of one of the
+ * subclasses from the <code>java.net</code> package), its class will not be preserved. In order
+ * to be able to read an instance of the user-defined class,
+ * {@link #writeObject(Object, DataOutput)} should be used. This method will handle a
+ * <code>null</code> value and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readInetAddress
*/
- public static void writeInetAddress(InetAddress address,
- DataOutput out)
- throws IOException {
+ public static void writeInetAddress(InetAddress address, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -550,18 +497,15 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>InetAddress</code> from a
- * <code>DataInput</code>.
- * The return value may be <code>null</code>.
+ * Reads an instance of <code>InetAddress</code> from a <code>DataInput</code>. The return value
+ * may be <code>null</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
- * or the address read from <code>in</code> is unknown
+ * @throws IOException A problem occurs while reading from <code>in</code> or the address read
+ * from <code>in</code> is unknown
*
* @see InetAddress#getAddress
*/
- public static InetAddress readInetAddress(DataInput in)
- throws IOException {
+ public static InetAddress readInetAddress(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -577,7 +521,8 @@ public abstract class DataSerializer {
}
return addr;
} catch (UnknownHostException ex) {
- IOException ex2 = new IOException(LocalizedStrings.DataSerializer_WHILE_READING_AN_INETADDRESS.toLocalizedString());
+ IOException ex2 = new IOException(
+ LocalizedStrings.DataSerializer_WHILE_READING_AN_INETADDRESS.toLocalizedString());
ex2.initCause(ex);
throw ex2;
}
@@ -585,20 +530,16 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>String</code> to a
- * <code>DataOutput</code>.
- * This method will handle a
- * <code>null</code> value and not throw a
- * <code>NullPointerException</code>.
- * <p>As of 5.7 strings longer than 0xFFFF can be serialized.
+ * Writes an instance of <code>String</code> to a <code>DataOutput</code>. This method will handle
+ * a <code>null</code> value and not throw a <code>NullPointerException</code>.
+ * <p>
+ * As of 5.7 strings longer than 0xFFFF can be serialized.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readString
*/
- public static void writeString(String value, DataOutput out)
- throws IOException {
+ public static void writeString(String value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -618,13 +559,13 @@ public abstract class DataSerializer {
// the string's contents, iterates over the array to compute the
// encoded length, creates a byte[] to hold the encoded bytes,
// iterates over the char[] again to create the encode bytes,
- // then writes the bytes. Since we usually deal with ISO-8859-1
+ // then writes the bytes. Since we usually deal with ISO-8859-1
// strings, we can accelerate this by accessing chars directly
- // with charAt and fill a single-byte buffer. If we run into
+ // with charAt and fill a single-byte buffer. If we run into
// a multibyte char, we revert to using writeUTF()
int len = value.length();
int utfLen = len; // added for bug 40932
- for (int i=0; i<len; i++) {
+ for (int i = 0; i < len; i++) {
char c = value.charAt(i);
if ((c <= 0x007F) && (c >= 0x0001)) {
// nothing needed
@@ -654,8 +595,7 @@ public abstract class DataSerializer {
out.writeByte(DSCODE.STRING);
out.writeUTF(value);
}
- }
- else {
+ } else {
if (len > 0xFFFF) {
if (isDebugEnabled) {
logger.trace(LogMarker.SERIALIZER, "Writing HUGE_STRING_BYTES of len={}", len);
@@ -676,12 +616,10 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>String</code> from a
- * <code>DataInput</code>. The return value may be
+ * Reads an instance of <code>String</code> from a <code>DataInput</code>. The return value may be
* <code>null</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeString
*/
@@ -690,17 +628,14 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>Boolean</code> to a
- * <code>DataOutput</code>.
+ * Writes an instance of <code>Boolean</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
* @throws NullPointerException if value is null.
*
* @see #readBoolean
*/
- public static void writeBoolean(Boolean value, DataOutput out)
- throws IOException {
+ public static void writeBoolean(Boolean value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -712,11 +647,9 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>Boolean</code> from a
- * <code>DataInput</code>.
+ * Reads an instance of <code>Boolean</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static Boolean readBoolean(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -729,17 +662,14 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>Character</code> to a
- * <code>DataOutput</code>.
+ * Writes an instance of <code>Character</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
* @throws NullPointerException if value is null.
*
* @see #readCharacter
*/
- public static void writeCharacter(Character value, DataOutput out)
- throws IOException {
+ public static void writeCharacter(Character value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -751,14 +681,11 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>Character</code> from a
- * <code>DataInput</code>.
+ * Reads an instance of <code>Character</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
- public static Character readCharacter(DataInput in)
- throws IOException {
+ public static Character readCharacter(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -770,17 +697,14 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>Byte</code> to a
- * <code>DataOutput</code>.
+ * Writes an instance of <code>Byte</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
* @throws NullPointerException if value is null.
*
* @see #readByte
*/
- public static void writeByte(Byte value, DataOutput out)
- throws IOException {
+ public static void writeByte(Byte value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -792,11 +716,9 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>Byte</code> from a
- * <code>DataInput</code>.
+ * Reads an instance of <code>Byte</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static Byte readByte(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -809,17 +731,14 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>Short</code> to a
- * <code>DataOutput</code>.
+ * Writes an instance of <code>Short</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
* @throws NullPointerException if value is null.
*
* @see #readShort
*/
- public static void writeShort(Short value, DataOutput out)
- throws IOException {
+ public static void writeShort(Short value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -831,11 +750,9 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>Short</code> from a
- * <code>DataInput</code>.
+ * Reads an instance of <code>Short</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static Short readShort(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -848,17 +765,14 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>Integer</code> to a
- * <code>DataOutput</code>.
+ * Writes an instance of <code>Integer</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
* @throws NullPointerException if value is null.
*
* @see #readInteger
*/
- public static void writeInteger(Integer value, DataOutput out)
- throws IOException {
+ public static void writeInteger(Integer value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -870,11 +784,9 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>Integer</code> from a
- * <code>DataInput</code>.
+ * Reads an instance of <code>Integer</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static Integer readInteger(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -887,17 +799,14 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>Long</code> to a
- * <code>DataOutput</code>.
+ * Writes an instance of <code>Long</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
* @throws NullPointerException if value is null.
*
* @see #readLong
*/
- public static void writeLong(Long value, DataOutput out)
- throws IOException {
+ public static void writeLong(Long value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -909,11 +818,9 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>Long</code> from a
- * <code>DataInput</code>.
+ * Reads an instance of <code>Long</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static Long readLong(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -926,17 +833,14 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>Float</code> to a
- * <code>DataOutput</code>.
+ * Writes an instance of <code>Float</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
* @throws NullPointerException if value is null.
*
* @see #readFloat
*/
- public static void writeFloat(Float value, DataOutput out)
- throws IOException {
+ public static void writeFloat(Float value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -948,11 +852,9 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>Float</code> from a
- * <code>DataInput</code>.
+ * Reads an instance of <code>Float</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static Float readFloat(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -965,17 +867,14 @@ public abstract class DataSerializer {
}
/**
- * Writes an instance of <code>Double</code> to a
- * <code>DataOutput</code>.
+ * Writes an instance of <code>Double</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
* @throws NullPointerException if value is null.
*
* @see #readDouble
*/
- public static void writeDouble(Double value, DataOutput out)
- throws IOException {
+ public static void writeDouble(Double value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -987,11 +886,9 @@ public abstract class DataSerializer {
}
/**
- * Reads an instance of <code>Double</code> from a
- * <code>DataInput</code>.
+ * Reads an instance of <code>Double</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static Double readDouble(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -1004,17 +901,14 @@ public abstract class DataSerializer {
}
/**
- * Writes a primitive <code>boolean</code> to a
- * <code>DataOutput</code>.
+ * Writes a primitive <code>boolean</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeBoolean
* @since GemFire 5.1
*/
- public static void writePrimitiveBoolean(boolean value, DataOutput out)
- throws IOException {
+ public static void writePrimitiveBoolean(boolean value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1026,11 +920,9 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>boolean</code> from a
- * <code>DataInput</code>.
+ * Reads a primitive <code>boolean</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @see DataInput#readBoolean
* @since GemFire 5.1
*/
@@ -1045,17 +937,14 @@ public abstract class DataSerializer {
}
/**
- * Writes a primitive <code>byte</code> to a
- * <code>DataOutput</code>.
+ * Writes a primitive <code>byte</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeByte
* @since GemFire 5.1
*/
- public static void writePrimitiveByte(byte value, DataOutput out)
- throws IOException {
+ public static void writePrimitiveByte(byte value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1067,11 +956,9 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>byte</code> from a
- * <code>DataInput</code>.
+ * Reads a primitive <code>byte</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @see DataInput#readByte
* @since GemFire 5.1
*/
@@ -1086,17 +973,14 @@ public abstract class DataSerializer {
}
/**
- * Writes a primitive <code>char</code> to a
- * <code>DataOutput</code>.
+ * Writes a primitive <code>char</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeChar
* @since GemFire 5.1
*/
- public static void writePrimitiveChar(char value, DataOutput out)
- throws IOException {
+ public static void writePrimitiveChar(char value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1108,11 +992,9 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>char</code> from a
- * <code>DataInput</code>.
+ * Reads a primitive <code>char</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @see DataInput#readChar
* @since GemFire 5.1
*/
@@ -1127,17 +1009,14 @@ public abstract class DataSerializer {
}
/**
- * Writes a primitive <code>short</code> to a
- * <code>DataOutput</code>.
+ * Writes a primitive <code>short</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeShort
* @since GemFire 5.1
*/
- public static void writePrimitiveShort(short value, DataOutput out)
- throws IOException {
+ public static void writePrimitiveShort(short value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1149,11 +1028,9 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>short</code> from a
- * <code>DataInput</code>.
+ * Reads a primitive <code>short</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @see DataInput#readShort
* @since GemFire 5.1
*/
@@ -1168,18 +1045,15 @@ public abstract class DataSerializer {
}
/**
- * Writes a primitive <code>int</code> as an unsigned byte to a
- * <code>DataOutput</code>.
+ * Writes a primitive <code>int</code> as an unsigned byte to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeByte
* @see DataInput#readUnsignedByte
* @since GemFire 5.1
*/
- public static void writeUnsignedByte(int value, DataOutput out)
- throws IOException {
+ public static void writeUnsignedByte(int value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1191,11 +1065,10 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>int</code> as an unsigned byte from a
- * <code>DataInput</code> using {@link DataInput#readUnsignedByte}.
+ * Reads a primitive <code>int</code> as an unsigned byte from a <code>DataInput</code> using
+ * {@link DataInput#readUnsignedByte}.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @since GemFire 5.1
*/
public static int readUnsignedByte(DataInput in) throws IOException {
@@ -1209,18 +1082,15 @@ public abstract class DataSerializer {
}
/**
- * Writes a primitive <code>int</code> as an unsigned short to a
- * <code>DataOutput</code>.
+ * Writes a primitive <code>int</code> as an unsigned short to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeShort
* @see DataInput#readUnsignedShort
* @since GemFire 5.1
*/
- public static void writeUnsignedShort(int value, DataOutput out)
- throws IOException {
+ public static void writeUnsignedShort(int value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1232,11 +1102,10 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>int</code> as an unsigned short from a
- * <code>DataInput</code> using {@link DataInput#readUnsignedShort}.
+ * Reads a primitive <code>int</code> as an unsigned short from a <code>DataInput</code> using
+ * {@link DataInput#readUnsignedShort}.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @since GemFire 5.1
*/
public static int readUnsignedShort(DataInput in) throws IOException {
@@ -1250,16 +1119,13 @@ public abstract class DataSerializer {
}
/**
- * Writes a primitive <code>int</code> to a
- * <code>DataOutput</code>.
+ * Writes a primitive <code>int</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeInt
*/
- public static void writePrimitiveInt(int value, DataOutput out)
- throws IOException {
+ public static void writePrimitiveInt(int value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1271,11 +1137,9 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>int</code> from a
- * <code>DataInput</code>.
+ * Reads a primitive <code>int</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @see DataInput#readInt
* @since GemFire 5.1
*/
@@ -1290,17 +1154,14 @@ public abstract class DataSerializer {
}
/**
- * Writes a primitive <code>long</code> to a
- * <code>DataOutput</code>.
+ * Writes a primitive <code>long</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeLong
* @since GemFire 5.1
*/
- public static void writePrimitiveLong(long value, DataOutput out)
- throws IOException {
+ public static void writePrimitiveLong(long value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1312,11 +1173,9 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>long</code> from a
- * <code>DataInput</code>.
+ * Reads a primitive <code>long</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @see DataInput#readLong
* @since GemFire 5.1
*/
@@ -1331,17 +1190,14 @@ public abstract class DataSerializer {
}
/**
- * Writes a primitive <code>float</code> to a
- * <code>DataOutput</code>.
+ * Writes a primitive <code>float</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeFloat
* @since GemFire 5.1
*/
- public static void writePrimitiveFloat(float value, DataOutput out)
- throws IOException {
+ public static void writePrimitiveFloat(float value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1353,11 +1209,9 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>float</code> from a
- * <code>DataInput</code>.
+ * Reads a primitive <code>float</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @see DataInput#readFloat
* @since GemFire 5.1
*/
@@ -1372,17 +1226,14 @@ public abstract class DataSerializer {
}
/**
- * Writes a primtive <code>double</code> to a
- * <code>DataOutput</code>.
+ * Writes a primtive <code>double</code> to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see DataOutput#writeDouble
* @since GemFire 5.1
*/
- public static void writePrimitiveDouble(double value, DataOutput out)
- throws IOException {
+ public static void writePrimitiveDouble(double value, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1394,11 +1245,9 @@ public abstract class DataSerializer {
}
/**
- * Reads a primitive <code>double</code> from a
- * <code>DataInput</code>.
+ * Reads a primitive <code>double</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
* @see DataInput#readDouble
* @since GemFire 5.1
*/
@@ -1413,19 +1262,14 @@ public abstract class DataSerializer {
}
/**
- * Writes an array of <code>byte</code>s to a
- * <code>DataOutput</code>.
- * This method will serialize a
- * <code>null</code> array and not throw a
- * <code>NullPointerException</code>.
+ * Writes an array of <code>byte</code>s to a <code>DataOutput</code>. This method will serialize
+ * a <code>null</code> array and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readByteArray
*/
- public static void writeByteArray(byte[] array, DataOutput out)
- throws IOException {
+ public static void writeByteArray(byte[] array, DataOutput out) throws IOException {
int len = 0;
if (array != null) {
len = array.length;
@@ -1434,27 +1278,22 @@ public abstract class DataSerializer {
}
/**
- * Writes the first <code>len</code> elements
- * of an array of <code>byte</code>s to a
- * <code>DataOutput</code>.
- * This method will serialize a
- * <code>null</code> array and not throw a
+ * Writes the first <code>len</code> elements of an array of <code>byte</code>s to a
+ * <code>DataOutput</code>. This method will serialize a <code>null</code> array and not throw a
* <code>NullPointerException</code>.
*
- * @param len the actual number of entries to write. If len is greater
- * than then length of the array then the entire array is written.
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @param len the actual number of entries to write. If len is greater than then length of the
+ * array then the entire array is written.
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readByteArray
*/
- public static void writeByteArray(byte[] array, int len, DataOutput out)
- throws IOException {
+ public static void writeByteArray(byte[] array, int len, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
int length = len; // to avoid warnings about parameter assignment
-
+
if (array == null) {
length = -1;
} else {
@@ -1470,31 +1309,27 @@ public abstract class DataSerializer {
out.write(array, 0, length);
}
}
+
/**
- * Serialize the given object <code>obj</code> into a byte array
- * using {@link #writeObject(Object, DataOutput)} and then writes the byte array
- * to the given data output <code>out</code> in the same format
- * {@link #writeByteArray(byte[], DataOutput)} does.
- * This method will serialize a
- * <code>null</code> obj and not throw a
+ * Serialize the given object <code>obj</code> into a byte array using
+ * {@link #writeObject(Object, DataOutput)} and then writes the byte array to the given data
+ * output <code>out</code> in the same format {@link #writeByteArray(byte[], DataOutput)} does.
+ * This method will serialize a <code>null</code> obj and not throw a
* <code>NullPointerException</code>.
*
* @param obj the object to serialize and write
* @param out the data output to write the byte array to
- * @throws IllegalArgumentException
- * if a problem occurs while serialize <code>obj</code>
- * @throws IOException
- * if a problem occurs while writing to <code>out</code>
+ * @throws IllegalArgumentException if a problem occurs while serialize <code>obj</code>
+ * @throws IOException if a problem occurs while writing to <code>out</code>
*
* @see #readByteArray
* @since GemFire 5.0.2
*/
- public static void writeObjectAsByteArray(Object obj, DataOutput out)
- throws IOException {
+ public static void writeObjectAsByteArray(Object obj, DataOutput out) throws IOException {
Object object = obj;
if (obj instanceof CachedDeserializable) {
if (obj instanceof StoredObject) {
- StoredObject so = (StoredObject)obj;
+ StoredObject so = (StoredObject) obj;
if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
logger.trace(LogMarker.SERIALIZER, "writeObjectAsByteArray StoredObject");
}
@@ -1508,20 +1343,21 @@ public abstract class DataSerializer {
if (object == null) {
logger.trace(LogMarker.SERIALIZER, "writeObjectAsByteArray null");
} else {
- logger.trace(LogMarker.SERIALIZER, "writeObjectAsByteArray obj.getClass={}", object.getClass());
+ logger.trace(LogMarker.SERIALIZER, "writeObjectAsByteArray obj.getClass={}",
+ object.getClass());
}
}
if (object instanceof byte[] || object == null) {
- writeByteArray((byte[])object, out);
+ writeByteArray((byte[]) object, out);
} else if (out instanceof ObjToByteArraySerializer) {
- ((ObjToByteArraySerializer)out).writeAsSerializedByteArray(object);
- }/*else if (obj instanceof Sendable) {
- ((Sendable)obj).sendTo(out);
- } */
+ ((ObjToByteArraySerializer) out).writeAsSerializedByteArray(object);
+ } /*
+ * else if (obj instanceof Sendable) { ((Sendable)obj).sendTo(out); }
+ */
else {
HeapDataOutputStream hdos;
if (object instanceof HeapDataOutputStream) {
- hdos = (HeapDataOutputStream)object;
+ hdos = (HeapDataOutputStream) object;
} else {
Version v = InternalDataSerializer.getVersionForDataStreamOrNull(out);
if (v == null) {
@@ -1531,7 +1367,8 @@ public abstract class DataSerializer {
try {
DataSerializer.writeObject(object, hdos);
} catch (IOException e) {
- RuntimeException e2 = new IllegalArgumentException(LocalizedStrings.DataSerializer_PROBELM_WHILE_SERIALIZING.toLocalizedString());
+ RuntimeException e2 = new IllegalArgumentException(
+ LocalizedStrings.DataSerializer_PROBELM_WHILE_SERIALIZING.toLocalizedString());
e2.initCause(e);
throw e2;
}
@@ -1542,49 +1379,41 @@ public abstract class DataSerializer {
}
/**
- * Reads an array of <code>byte</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>byte</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeByteArray(byte[], DataOutput)
*/
- public static byte[] readByteArray(DataInput in)
- throws IOException {
-
- InternalDataSerializer.checkIn(in);
+ public static byte[] readByteArray(DataInput in) throws IOException {
- int length = InternalDataSerializer.readArrayLength(in);
- if (length == -1) {
- return null;
- } else {
- byte[] array = new byte[length];
- in.readFully(array, 0, length);
+ InternalDataSerializer.checkIn(in);
- if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
- logger.trace(LogMarker.SERIALIZER, "Read byte array of length {}", length);
- }
+ int length = InternalDataSerializer.readArrayLength(in);
+ if (length == -1) {
+ return null;
+ } else {
+ byte[] array = new byte[length];
+ in.readFully(array, 0, length);
- return array;
+ if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
+ logger.trace(LogMarker.SERIALIZER, "Read byte array of length {}", length);
}
+
+ return array;
}
+ }
/**
- * Writes an array of <code>String</code>s to a
- * <code>DataOutput</code>.
- * This method will serialize a
- * <code>null</code> array and not throw a
- * <code>NullPointerException</code>.
+ * Writes an array of <code>String</code>s to a <code>DataOutput</code>. This method will
+ * serialize a <code>null</code> array and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readStringArray
* @see #writeString
*/
- public static void writeStringArray(String[] array, DataOutput out)
- throws IOException {
+ public static void writeStringArray(String[] array, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1606,50 +1435,42 @@ public abstract class DataSerializer {
}
/**
- * Reads an array of <code>String</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>String</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeStringArray
*/
- public static String[] readStringArray(DataInput in)
- throws IOException {
-
- InternalDataSerializer.checkIn(in);
+ public static String[] readStringArray(DataInput in) throws IOException {
- int length = InternalDataSerializer.readArrayLength(in);
- if (length == -1) {
- return null;
- } else {
- String[] array = new String[length];
- for (int i = 0; i < length; i++) {
- array[i] = readString(in);
- }
+ InternalDataSerializer.checkIn(in);
- if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
- logger.trace(LogMarker.SERIALIZER, "Read String array of length {}", length);
- }
+ int length = InternalDataSerializer.readArrayLength(in);
+ if (length == -1) {
+ return null;
+ } else {
+ String[] array = new String[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = readString(in);
+ }
- return array;
+ if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
+ logger.trace(LogMarker.SERIALIZER, "Read String array of length {}", length);
}
+
+ return array;
}
+ }
/**
- * Writes an array of <code>short</code>s to a
- * <code>DataOutput</code>.
- * This method will serialize a
- * <code>null</code> array and not throw a
- * <code>NullPointerException</code>.
+ * Writes an array of <code>short</code>s to a <code>DataOutput</code>. This method will serialize
+ * a <code>null</code> array and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readShortArray
*/
- public static void writeShortArray(short[] array, DataOutput out)
- throws IOException {
+ public static void writeShortArray(short[] array, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1671,65 +1492,55 @@ public abstract class DataSerializer {
}
/**
- * Reads an array of <code>short</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>short</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeShortArray
*/
- public static short[] readShortArray(DataInput in)
- throws IOException {
-
- InternalDataSerializer.checkIn(in);
+ public static short[] readShortArray(DataInput in) throws IOException {
- int length = InternalDataSerializer.readArrayLength(in);
- if (length == -1) {
- return null;
- } else {
- short[] array = new short[length];
- for (int i = 0; i < length; i++) {
- array[i] = in.readShort();
- }
+ InternalDataSerializer.checkIn(in);
- if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
- logger.trace(LogMarker.SERIALIZER, "Read short array of length {}", length);
- }
+ int length = InternalDataSerializer.readArrayLength(in);
+ if (length == -1) {
+ return null;
+ } else {
+ short[] array = new short[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = in.readShort();
+ }
- return array;
+ if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
+ logger.trace(LogMarker.SERIALIZER, "Read short array of length {}", length);
}
+
+ return array;
}
+ }
/**
- * Writes an array of <code>char</code>s to a
- * <code>DataOutput</code>.
+ * Writes an array of <code>char</code>s to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readCharArray
* @since GemFire 5.7
*/
- public static void writeCharArray(char[] array, DataOutput out)
- throws IOException {
+ public static void writeCharArray(char[] array, DataOutput out) throws IOException {
- InternalDataSerializer.writeCharArray(array, array != null ? array.length
- : -1, out);
+ InternalDataSerializer.writeCharArray(array, array != null ? array.length : -1, out);
}
/**
- * Reads an array of <code>char</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>char</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeCharArray
* @since GemFire 5.7
*/
- public static char[] readCharArray(DataInput in)
- throws IOException {
+ public static char[] readCharArray(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -1749,18 +1560,16 @@ public abstract class DataSerializer {
return array;
}
}
+
/**
- * Writes an array of <code>boolean</code>s to a
- * <code>DataOutput</code>.
+ * Writes an array of <code>boolean</code>s to a <code>DataOutput</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readBooleanArray
* @since GemFire 5.7
*/
- public static void writeBooleanArray(boolean[] array, DataOutput out)
- throws IOException {
+ public static void writeBooleanArray(boolean[] array, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1782,17 +1591,14 @@ public abstract class DataSerializer {
}
/**
- * Reads an array of <code>boolean</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>boolean</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeBooleanArray
* @since GemFire 5.7
*/
- public static boolean[] readBooleanArray(DataInput in)
- throws IOException {
+ public static boolean[] readBooleanArray(DataInput in) throws IOException {
InternalDataSerializer.checkIn(in);
@@ -1812,19 +1618,16 @@ public abstract class DataSerializer {
return array;
}
}
+
/**
- * Writes an <code>int</code> array to a <code>DataOutput</code>.
- * This method will serialize a
- * <code>null</code> array and not throw a
- * <code>NullPointerException</code>.
+ * Writes an <code>int</code> array to a <code>DataOutput</code>. This method will serialize a
+ * <code>null</code> array and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readIntArray
*/
- public static void writeIntArray(int[] array, DataOutput out)
- throws IOException {
+ public static void writeIntArray(int[] array, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1849,47 +1652,40 @@ public abstract class DataSerializer {
/**
* Reads an <code>int</code> array from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeIntArray
*/
- public static int[] readIntArray(DataInput in)
- throws IOException {
-
- InternalDataSerializer.checkIn(in);
+ public static int[] readIntArray(DataInput in) throws IOException {
- int length = InternalDataSerializer.readArrayLength(in);
- if (length == -1) {
- return null;
- } else {
- int[] array = new int[length];
- for (int i = 0; i < length; i++) {
- array[i] = in.readInt();
- }
+ InternalDataSerializer.checkIn(in);
- if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
- logger.trace(LogMarker.SERIALIZER, "Read int array of length {}", length);
- }
+ int length = InternalDataSerializer.readArrayLength(in);
+ if (length == -1) {
+ return null;
+ } else {
+ int[] array = new int[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = in.readInt();
+ }
- return array;
+ if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
+ logger.trace(LogMarker.SERIALIZER, "Read int array of length {}", length);
}
+
+ return array;
}
+ }
/**
- * Writes an array of <code>long</code>s to a
- * <code>DataOutput</code>.
- * This method will serialize a
- * <code>null</code> array and not throw a
- * <code>NullPointerException</code>.
+ * Writes an array of <code>long</code>s to a <code>DataOutput</code>. This method will serialize
+ * a <code>null</code> array and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readLongArray
*/
- public static void writeLongArray(long[] array, DataOutput out)
- throws IOException {
+ public static void writeLongArray(long[] array, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1911,50 +1707,42 @@ public abstract class DataSerializer {
}
/**
- * Reads an array of <code>long</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>long</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeLongArray
*/
- public static long[] readLongArray(DataInput in)
- throws IOException {
-
- InternalDataSerializer.checkIn(in);
+ public static long[] readLongArray(DataInput in) throws IOException {
- int length = InternalDataSerializer.readArrayLength(in);
- if (length == -1) {
- return null;
- } else {
- long[] array = new long[length];
- for (int i = 0; i < length; i++) {
- array[i] = in.readLong();
- }
+ InternalDataSerializer.checkIn(in);
- if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
- logger.trace(LogMarker.SERIALIZER, "Read long array of length {}", length);
- }
+ int length = InternalDataSerializer.readArrayLength(in);
+ if (length == -1) {
+ return null;
+ } else {
+ long[] array = new long[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = in.readLong();
+ }
- return array;
+ if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
+ logger.trace(LogMarker.SERIALIZER, "Read long array of length {}", length);
}
+
+ return array;
}
+ }
/**
- * Writes an array of <code>float</code>s to a
- * <code>DataOutput</code>.
- * This method will serialize a
- * <code>null</code> array and not throw a
- * <code>NullPointerException</code>.
+ * Writes an array of <code>float</code>s to a <code>DataOutput</code>. This method will serialize
+ * a <code>null</code> array and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readFloatArray
*/
- public static void writeFloatArray(float[] array, DataOutput out)
- throws IOException {
+ public static void writeFloatArray(float[] array, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -1976,50 +1764,42 @@ public abstract class DataSerializer {
}
/**
- * Reads an array of <code>float</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>float</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeFloatArray
*/
- public static float[] readFloatArray(DataInput in)
- throws IOException {
+ public static float[] readFloatArray(DataInput in) throws IOException {
- InternalDataSerializer.checkIn(in);
-
- int length = InternalDataSerializer.readArrayLength(in);
- if (length == -1) {
- return null;
- } else {
- float[] array = new float[length];
- for (int i = 0; i < length; i++) {
- array[i] = in.readFloat();
- }
+ InternalDataSerializer.checkIn(in);
- if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
- logger.trace(LogMarker.SERIALIZER, "Read float array of length {}", length);
- }
+ int length = InternalDataSerializer.readArrayLength(in);
+ if (length == -1) {
+ return null;
+ } else {
+ float[] array = new float[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = in.readFloat();
+ }
- return array;
+ if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
+ logger.trace(LogMarker.SERIALIZER, "Read float array of length {}", length);
}
+
+ return array;
}
+ }
/**
- * Writes an array of <code>double</code>s to a
- * <code>DataOutput</code>.
- * This method will serialize a
- * <code>null</code> array and not throw a
- * <code>NullPointerException</code>.
+ * Writes an array of <code>double</code>s to a <code>DataOutput</code>. This method will
+ * serialize a <code>null</code> array and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readDoubleArray
*/
- public static void writeDoubleArray(double[] array, DataOutput out)
- throws IOException {
+ public static void writeDoubleArray(double[] array, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -2041,157 +1821,143 @@ public abstract class DataSerializer {
}
/**
- * Reads an array of <code>double</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>double</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeDoubleArray
*/
- public static double[] readDoubleArray(DataInput in)
- throws IOException {
+ public static double[] readDoubleArray(DataInput in) throws IOException {
- InternalDataSerializer.checkIn(in);
-
- int length = InternalDataSerializer.readArrayLength(in);
- if (length == -1) {
- return null;
- } else {
- double[] array = new double[length];
- for (int i = 0; i < length; i++) {
- array[i] = in.readDouble();
- }
+ InternalDataSerializer.checkIn(in);
- if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
- logger.trace(LogMarker.SERIALIZER, "Read double array of length {}", length);
- }
+ int length = InternalDataSerializer.readArrayLength(in);
+ if (length == -1) {
+ return null;
+ } else {
+ double[] array = new double[length];
+ for (int i = 0; i < length; i++) {
+ array[i] = in.readDouble();
+ }
- return array;
+ if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
+ logger.trace(LogMarker.SERIALIZER, "Read double array of length {}", length);
}
+
+ return array;
}
+ }
/**
- * Writes an array of <code>Object</code>s to a
- * <code>DataOutput</code>.
- * This method will serialize a
- * <code>null</code> array and not throw a
- * <code>NullPointerException</code>.
+ * Writes an array of <code>Object</code>s to a <code>DataOutput</code>. This method will
+ * serialize a <code>null</code> array and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readObjectArray
* @see #writeObject(Object, DataOutput)
*/
- public static void writeObjectArray(Object[] array, DataOutput out)
- throws IOException {
+ public static void writeObjectArray(Object[] array, DataOutput out) throws IOException {
InternalDataSerializer.writeObjectArray(array, out, false);
}
-
+
/**
- * Reads an array of <code>Object</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>Object</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*
* @see #writeObjectArray
* @see #readObject
*/
- public static Object[] readObjectArray(DataInput in)
- throws IOException, ClassNotFoundException {
+ public static Object[] readObjectArray(DataInput in) throws IOException, ClassNotFoundException {
- InternalDataSerializer.checkIn(in);
+ InternalDataSerializer.checkIn(in);
- int length = InternalDataSerializer.readArrayLength(in);
- if (length == -1) {
- return null;
+ int length = InternalDataSerializer.readArrayLength(in);
+ if (length == -1) {
+ return null;
+ } else {
+ Class<?> c = null;
+ byte typeCode = in.readByte();
+ String typeString = null;
+ if (typeCode == DSCODE.CLASS) {
+ typeString = readString(in);
+ }
+
+ GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+ boolean lookForPdxInstance = false;
+ ClassNotFoundException cnfEx = null;
+ if (typeCode == DSCODE.CLASS && cache != null
+ && cache.getPdxReadSerializedByAnyGemFireServices()) {
+ try {
+ c = InternalDataSerializer.getCachedClass(typeString);
+ lookForPdxInstance = true;
+ } catch (ClassNotFoundException ignore) {
+ c = Object.class;
+ cnfEx = ignore;
+ }
} else {
- Class<?> c = null;
- byte typeCode = in.readByte();
- String typeString = null;
if (typeCode == DSCODE.CLASS) {
- typeString = readString(in);
- }
-
- GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
- boolean lookForPdxInstance = false;
- ClassNotFoundException cnfEx = null;
- if (typeCode == DSCODE.CLASS
- && cache != null && cache.getPdxReadSerializedByAnyGemFireServices()) {
- try {
- c = InternalDataSerializer.getCachedClass(typeString);
- lookForPdxInstance = true;
- } catch (ClassNotFoundException ignore) {
- c = Object.class;
- cnfEx = ignore;
- }
+ c = InternalDataSerializer.getCachedClass(typeString);
} else {
- if (typeCode == DSCODE.CLASS) {
- c = InternalDataSerializer.getCachedClass(typeString);
- } else {
- c = InternalDataSerializer.decodePrimitiveClass(typeCode);
- }
- }
- Object o = null;
- if (length > 0) {
- o = readObject(in);
- if (lookForPdxInstance && o instanceof PdxInstance) {
- lookForPdxInstance = false;
- c = Object.class;
- }
- }
- Object[] array = (Object[]) Array.newInstance(c, length);
- if (length > 0) {
- array[0] = o;
- }
- for (int i = 1; i < length; i++) {
- o = readObject(in);
- if (lookForPdxInstance && o instanceof PdxInstance) {
- // create an Object[] and copy all the entries we already did into it
- lookForPdxInstance = false;
- c = Object.class;
- Object[] newArray = (Object[])Array.newInstance(c, length);
- System.arraycopy(array, 0, newArray, 0, i);
- array = newArray;
- }
- array[i] = o;
+ c = InternalDataSerializer.decodePrimitiveClass(typeCode);
}
- if (lookForPdxInstance && cnfEx != null && length > 0) {
- // We have a non-empty array and didn't find any
- // PdxInstances in it. So we should have been able
- // to load the element type.
- // Note that empty arrays in this case will deserialize
- // as an Object[] since we can't tell if the element
- // type is a pdx one.
- throw cnfEx;
+ }
+ Object o = null;
+ if (length > 0) {
+ o = readObject(in);
+ if (lookForPdxInstance && o instanceof PdxInstance) {
+ lookForPdxInstance = false;
+ c = Object.class;
}
-
- if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
- logger.trace(LogMarker.SERIALIZER, "Read Object array of length {}", length);
+ }
+ Object[] array = (Object[]) Array.newInstance(c, length);
+ if (length > 0) {
+ array[0] = o;
+ }
+ for (int i = 1; i < length; i++) {
+ o = readObject(in);
+ if (lookForPdxInstance && o instanceof PdxInstance) {
+ // create an Object[] and copy all the entries we already did into it
+ lookForPdxInstance = false;
+ c = Object.class;
+ Object[] newArray = (Object[]) Array.newInstance(c, length);
+ System.arraycopy(array, 0, newArray, 0, i);
+ array = newArray;
}
+ array[i] = o;
+ }
+ if (lookForPdxInstance && cnfEx != null && length > 0) {
+ // We have a non-empty array and didn't find any
+ // PdxInstances in it. So we should have been able
+ // to load the element type.
+ // Note that empty arrays in this case will deserialize
+ // as an Object[] since we can't tell if the element
+ // type is a pdx one.
+ throw cnfEx;
+ }
- return array;
+ if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
+ logger.trace(LogMarker.SERIALIZER, "Read Object array of length {}", length);
}
+
+ return array;
}
-
+ }
+
/**
* Writes an array of <tt>byte[]</tt> to a <tt>DataOutput</tt>.
*
- * @throws IOException
- * A problem occurs while writing to <tt>out</tt>.
+ * @throws IOException A problem occurs while writing to <tt>out</tt>.
*
*/
- public static void writeArrayOfByteArrays(byte[][] array, DataOutput out)
- throws IOException {
-
+ public static void writeArrayOfByteArrays(byte[][] array, DataOutput out) throws IOException {
+
InternalDataSerializer.checkOut(out);
int length;
if (array == null) {
length = -1;
- }
- else {
+ } else {
length = array.length;
}
InternalDataSerializer.writeArrayLength(length, out);
@@ -2204,19 +1970,17 @@ public abstract class DataSerializer {
}
}
}
-
+
/**
- * Reads an array of <code>byte[]</code>s from a
- * <code>DataInput</code>.
+ * Reads an array of <code>byte[]</code>s from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
*/
public static byte[][] readArrayOfByteArrays(DataInput in)
- throws IOException, ClassNotFoundException {
-
+ throws IOException, ClassNotFoundException {
+
InternalDataSerializer.checkIn(in);
-
+
int length = InternalDataSerializer.readArrayLength(in);
if (length == -1) {
return null;
@@ -2225,35 +1989,29 @@ public abstract class DataSerializer {
for (int i = 0; i < length; i++) {
array[i] = readByteArray(in);
}
-
+
if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
logger.trace(LogMarker.SERIALIZER, "Read byte[][] of length {}", length);
}
-
+
return array;
}
}
-
-
+
+
/**
- * Writes an <code>ArrayList</code> to a <code>DataOutput</code>.
- * Note that even though <code>list</code> may be an instance of a
- * subclass of <code>ArrayList</code>, <code>readArrayList</code>
- * will always return an instance of <code>ArrayList</code>,
- * <B>not</B> an instance of the subclass. To preserve the class
- * type of <code>list</code>, {@link #writeObject(Object, DataOutput)} should be used
- * for data serialization.
- * This method will serialize a
- * <code>null</code> list and not throw a
- * <code>NullPointerException</code>.
+ * Writes an <code>ArrayList</code> to a <code>DataOutput</code>. Note that even though
+ * <code>list</code> may be an instance of a subclass of <code>ArrayList</code>,
+ * <code>readArrayList</code> will always return an instance of <code>ArrayList</code>, <B>not</B>
+ * an instance of the subclass. To preserve the class type of <code>list</code>,
+ * {@link #writeObject(Object, DataOutput)} should be used for data serialization. This method
+ * will serialize a <code>null</code> list and not throw a <code>NullPointerException</code>.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readArrayList
*/
- public static void writeArrayList(ArrayList<?> list, DataOutput out)
- throws IOException {
+ public static void writeArrayList(ArrayList<?> list, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -2268,27 +2026,25 @@ public abstract class DataSerializer {
logger.trace(LogMarker.SERIALIZER, "Writing ArrayList with {} elements: {}", size, list);
}
if (size > 0) {
- for (int i=0; i < size; i++) {
+ for (int i = 0; i < size; i++) {
writeObject(list.get(i), out);
}
}
}
-
-
+
+
/**
* Reads an <code>ArrayList</code> from a <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
- * @throws ClassNotFoundException
- * The class of one of the <Code>ArrayList</code>'s
- * elements cannot be found.
+ * @throws IOException A problem occurs while reading from <code>in</code>
+ * @throws ClassNotFoundException The class of one of the <Code>ArrayList</code>'s elements cannot
+ * be found.
*
* @see #writeArrayList
*/
public static <E> ArrayList<E> readArrayList(DataInput in)
- throws IOException, ClassNotFoundException {
+ throws IOException, ClassNotFoundException {
InternalDataSerializer.checkIn(in);
@@ -2311,22 +2067,18 @@ public abstract class DataSerializer {
}
/**
- * Writes an <code>Vector</code> to a <code>DataOutput</code>.
- * Note that even though <code>list</code> may be an instance of a
- * subclass of <code>Vector</code>, <code>readVector</code>
- * will always return an instance of <code>Vector</code>,
- * <B>not</B> an instance of the subclass. To preserve the class
- * type of <code>list</code>, {@link #writeObject(Object, DataOutput)} should be used
- * for data serialization.
+ * Writes an <code>Vector</code> to a <code>DataOutput</code>. Note that even though
+ * <code>list</code> may be an instance of a subclass of <code>Vector</code>,
+ * <code>readVector</code> will always return an instance of <code>Vector</code>, <B>not</B> an
+ * instance of the subclass. To preserve the class type of <code>list</code>,
+ * {@link #writeObject(Object, DataOutput)} should be used for data serialization.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*
* @see #readVector
* @since GemFire 5.7
*/
- public static void writeVector(Vector<?> list, DataOutput out)
- throws IOException {
+ public static void writeVector(Vector<?> list, DataOutput out) throws IOException {
InternalDataSerializer.checkOut(out);
@@ -2341,7 +2093,7 @@ public abstract class DataSerializer {
logger.trace(LogMarker.SERIALIZER, "Writing Vector with {} elements: {}", size, list);
}
if (size > 0) {
- for (int i=0; i < size; i++) {
+ for (int i = 0; i < size; i++) {
writeObject(list.get(i), out);
}
}
@@ -2350,17 +2102,14 @@ public abstract class DataSerializer {
/**
* Reads an <code>Vector</code> from a <
<TRUNCATED>
[18/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
index c59e049..74115bb 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -21,34 +19,30 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.cache.Operation;
/**
- * An event that describes an operation on a region.
- * Instances of this are delivered to a {@link SystemMemberCacheListener} when a
- * a region comes or goes.
+ * An event that describes an operation on a region. Instances of this are delivered to a
+ * {@link SystemMemberCacheListener} when a a region comes or goes.
*
* @since GemFire 5.0
*/
-public class SystemMemberRegionEventImpl
- extends SystemMemberCacheEventImpl
- implements SystemMemberRegionEvent
-{
+public class SystemMemberRegionEventImpl extends SystemMemberCacheEventImpl
+ implements SystemMemberRegionEvent {
- /**
- * The path of region created/destroyed
+ /**
+ * The path of region created/destroyed
*/
private final String regionPath;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>SystemMemberRegionEvent</code> for the member
- * with the given id.
+ * Creates a new <code>SystemMemberRegionEvent</code> for the member with the given id.
*/
protected SystemMemberRegionEventImpl(DistributedMember id, Operation op, String regionPath) {
super(id, op);
this.regionPath = regionPath;
}
- ///////////////////// Instance Methods /////////////////////
+ ///////////////////// Instance Methods /////////////////////
public String getRegionPath() {
return this.regionPath;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
index 9e8f392..fbf0839 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
@@ -1,25 +1,23 @@
/*
- * 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
+ * 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.admin.internal;
import org.apache.geode.admin.*;
import org.apache.geode.cache.*;
-//import org.apache.geode.internal.Assert;
-//import org.apache.geode.internal.admin.*;
+// import org.apache.geode.internal.Assert;
+// import org.apache.geode.internal.admin.*;
import org.apache.geode.internal.admin.remote.*;
import java.io.File;
@@ -28,7 +26,7 @@ import java.util.*;
/**
* View of a region in a GemFire system member's cache.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
public class SystemMemberRegionImpl implements SystemMemberRegion {
@@ -44,10 +42,9 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
private final SystemMemberCacheImpl cache;
// constructors
- public SystemMemberRegionImpl(SystemMemberCacheImpl cache, Region r)
- {
+ public SystemMemberRegionImpl(SystemMemberCacheImpl cache, Region r) {
this.cache = cache;
- this.r = (AdminRegion)r;
+ this.r = (AdminRegion) r;
}
private void refreshFields() {
@@ -63,7 +60,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
Set paths = new TreeSet();
Iterator it = s.iterator();
while (it.hasNext()) {
- Region r = (Region)it.next();
+ Region r = (Region) it.next();
String name = r.getName();
names.add(name);
paths.add(this.getFullPath() + Region.SEPARATOR_CHAR + name);
@@ -80,12 +77,12 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
this.subregionCount = 0;
}
}
-
+
// attributes
public String getName() {
return this.r.getName();
}
-
+
public String getFullPath() {
return this.r.getFullPath();
}
@@ -99,7 +96,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
}
public String getUserAttribute() {
- return (String)r.getUserAttribute();
+ return (String) r.getUserAttribute();
}
public String getCacheLoader() {
@@ -110,6 +107,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
return o.toString();
}
}
+
public String getCacheWriter() {
Object o = this.ra.getCacheWriter();
if (o == null) {
@@ -165,7 +163,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
return o.toString();
}
}
-
+
public int getRegionIdleTimeoutTimeLimit() {
return this.ra.getRegionIdleTimeout().getTimeout();
}
@@ -190,15 +188,15 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
return o.toString();
}
}
-
+
public MirrorType getMirrorType() {
return this.ra.getMirrorType();
}
-
+
public DataPolicy getDataPolicy() {
return this.ra.getDataPolicy();
}
-
+
public Scope getScope() {
return this.ra.getScope();
}
@@ -208,10 +206,9 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
}
/**
- * This method will return an empty string if there are no CacheListeners
- * defined on the region. If there are more than 1 CacheListeners defined,
- * this method will return the description of the 1st CacheListener in the
- * list returned by the getCacheListeners method. If there is only one
+ * This method will return an empty string if there are no CacheListeners defined on the region.
+ * If there are more than 1 CacheListeners defined, this method will return the description of the
+ * 1st CacheListener in the list returned by the getCacheListeners method. If there is only one
* CacheListener defined this method will return it's description
*
* @return String the region's <code>CacheListener</code> description
@@ -222,20 +219,17 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
String[] o = this.getCacheListeners();
if (o.length == 0) {
return "";
- }
- else {
+ } else {
return o[0].toString();
}
}
/**
- * This method will return an empty array if there are no CacheListeners
- * defined on the region. If there are one or more than 1 CacheListeners
- * defined, this method will return an array which has the description of all
- * the CacheListeners
+ * This method will return an empty array if there are no CacheListeners defined on the region. If
+ * there are one or more than 1 CacheListeners defined, this method will return an array which has
+ * the description of all the CacheListeners
*
- * @return String[] the region's <code>CacheListeners</code> descriptions as a
- * String array
+ * @return String[] the region's <code>CacheListeners</code> descriptions as a String array
* @since GemFire 6.0
*/
public String[] getCacheListeners() {
@@ -243,8 +237,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
String[] ret = null;
if (o == null || o.length == 0) {
ret = new String[0];
- }
- else {
+ } else {
ret = new String[o.length];
for (int i = 0; i < o.length; i++) {
ret[i] = o[i].toString();
@@ -288,7 +281,7 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
public int getEntryCount() {
return this.entryCount;
}
-
+
public int getSubregionCount() {
return this.subregionCount;
}
@@ -332,29 +325,27 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
return this.rs.getHitRatio();
}
}
-
+
// operations
public void refresh() {
refreshFields();
}
- /**
- * Returns a string representation of the object.
- *
- * @return a string representation of the object
- */
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return a string representation of the object
+ */
@Override
- public String toString() {
- return getName();
- }
+ public String toString() {
+ return getName();
+ }
- public SystemMemberRegion createSubregion(String name,
- RegionAttributes attrs)
- throws AdminException {
+ public SystemMemberRegion createSubregion(String name, RegionAttributes attrs)
+ throws AdminException {
- Region r =
- this.cache.getVM().createSubregion(this.cache.getCacheInfo(),
- this.getFullPath(), name, attrs);
+ Region r = this.cache.getVM().createSubregion(this.cache.getCacheInfo(), this.getFullPath(),
+ name, attrs);
if (r == null) {
return null;
@@ -367,11 +358,11 @@ public class SystemMemberRegionImpl implements SystemMemberRegion {
public MembershipAttributes getMembershipAttributes() {
return this.ra.getMembershipAttributes();
}
-
+
public SubscriptionAttributes getSubscriptionAttributes() {
return this.ra.getSubscriptionAttributes();
}
-
+
public PartitionAttributes getPartitionAttributes() {
return this.ra.getPartitionAttributes();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMembershipEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMembershipEventImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMembershipEventImpl.java
index 6ec9e94..ad5fd5a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMembershipEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMembershipEventImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -20,8 +18,8 @@ import org.apache.geode.admin.*;
import org.apache.geode.distributed.DistributedMember;
/**
- * An event delivered to a {@link SystemMembershipListener} when a
- * member has joined or left the distributed system.
+ * An event delivered to a {@link SystemMembershipListener} when a member has joined or left the
+ * distributed system.
*
* @since GemFire 5.0
*/
@@ -30,37 +28,36 @@ public class SystemMembershipEventImpl implements SystemMembershipEvent {
/** The id of the member that generated this event */
private DistributedMember id;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>SystemMembershipEvent</code> for the member
- * with the given id.
+ * Creates a new <code>SystemMembershipEvent</code> for the member with the given id.
*/
protected SystemMembershipEventImpl(DistributedMember id) {
this.id = id;
}
- ///////////////////// Instance Methods /////////////////////
+ ///////////////////// Instance Methods /////////////////////
public String getMemberId() {
return this.id.toString();
}
-
+
public DistributedMember getDistributedMember() {
return this.id;
}
-// /**
-// * Returns the user specified callback object associated with this
-// * membership event. Note that the callback argument is always
-// * <code>null</code> for the event delivered to the {@link
-// * SystemMembershipListener#memberCrashed} method.
-// *
-// * @since GemFire 4.0
-// */
-// public Object getCallbackArgument() {
-// throw new UnsupportedOperationException("Not implemented yet");
-// }
+ // /**
+ // * Returns the user specified callback object associated with this
+ // * membership event. Note that the callback argument is always
+ // * <code>null</code> for the event delivered to the {@link
+ // * SystemMembershipListener#memberCrashed} method.
+ // *
+ // * @since GemFire 4.0
+ // */
+ // public Object getCallbackArgument() {
+ // throw new UnsupportedOperationException("Not implemented yet");
+ // }
@Override
public String toString() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
index 9daa866..8e16dca 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/Agent.java
@@ -1,18 +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
+ * 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.admin.jmx;
@@ -20,61 +18,56 @@ import org.apache.geode.LogWriter;
import org.apache.geode.admin.AdminException;
import org.apache.geode.admin.AdminDistributedSystem;
-//import javax.management.MBeanException;
+// import javax.management.MBeanException;
import javax.management.MalformedObjectNameException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
/**
- * A server component that provides administration-related information
- * about a GemFire distributed system via the Java Management
- * Extension JMX API. When a JMX <code>Agent</code> is created, it
- * registers an MBean that represents {@link #getObjectName itself}.
- * Click <A href="doc-files/mbeans-descriptions.html">here</A> for a
- * description of the attributes, operations, and notifications of
- * this and other GemFire JMX MBeans.
+ * A server component that provides administration-related information about a GemFire distributed
+ * system via the Java Management Extension JMX API. When a JMX <code>Agent</code> is created, it
+ * registers an MBean that represents {@link #getObjectName itself}. Click
+ * <A href="doc-files/mbeans-descriptions.html">here</A> for a description of the attributes,
+ * operations, and notifications of this and other GemFire JMX MBeans.
*
* <P>
*
- * The GemFire JMX Agent currently supports three JMX "adapters"
- * through which clients can access the GemFire management beans: an
- * "HTTP adapter" that allows a web browser client to view and modify
- * management beans via HTTP or HTTPS, an "RMI adapter" that allows
- * Java programs to access management beans using Remote Method
- * Invocation, and an "SNMP adapter" that allows SNMP to access
- * management beans. Information about configuring these adapters can
- * be found in {@link AgentConfig}.
+ * The GemFire JMX Agent currently supports three JMX "adapters" through which clients can access
+ * the GemFire management beans: an "HTTP adapter" that allows a web browser client to view and
+ * modify management beans via HTTP or HTTPS, an "RMI adapter" that allows Java programs to access
+ * management beans using Remote Method Invocation, and an "SNMP adapter" that allows SNMP to access
+ * management beans. Information about configuring these adapters can be found in
+ * {@link AgentConfig}.
*
* <P>
*
- * In most distributed caching architectures, JMX administration
- * agents are run in their own processes. A stand-alone JMX agent is
- * managed using the <code>agent</code> command line utility:
+ * In most distributed caching architectures, JMX administration agents are run in their own
+ * processes. A stand-alone JMX agent is managed using the <code>agent</code> command line utility:
*
* <PRE>
* $ agent start
* </PRE>
*
- * This class allows a GemFire application VM to host a JMX management
- * agent. Architectures with "co-located" JMX agents reduce the
- * number of overall proceses required. However, hosting a JMX
- * management agent in the same VM as a GemFire application is not
- * generally recommended because it adds extra burden to an
- * application VM and in the event that the application VM exits the
+ * This class allows a GemFire application VM to host a JMX management agent. Architectures with
+ * "co-located" JMX agents reduce the number of overall proceses required. However, hosting a JMX
+ * management agent in the same VM as a GemFire application is not generally recommended because it
+ * adds extra burden to an application VM and in the event that the application VM exits the
* administration information will no longer be available.
*
* @see AgentConfig
* @see AgentFactory
*
* @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface Agent {
/** Lookup name for RMIConnector when rmi-registry-enabled is true */
public static final String JNDI_NAME = "/jmxconnector";
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
* Returns the configuration object for this JMX Agent.
@@ -82,77 +75,65 @@ public interface Agent {
public AgentConfig getConfig();
/**
- * Starts this JMX Agent and its associated adapters. This method
- * does not {@linkplain #connectToSystem connect} to the distributed
- * system.
+ * Starts this JMX Agent and its associated adapters. This method does not
+ * {@linkplain #connectToSystem connect} to the distributed system.
*/
public void start();
/**
- * Returns the JMX <code>MBeanServer</code> with which GemFire
- * MBeans are registered or <code>null</code> if this
- * <code>Agent</code> is not started.
+ * Returns the JMX <code>MBeanServer</code> with which GemFire MBeans are registered or
+ * <code>null</code> if this <code>Agent</code> is not started.
*/
public MBeanServer getMBeanServer();
/**
- * {@linkplain #disconnectFromSystem Disconnects} from the
- * distributed system and stops this JMX Agent and all of its
- * associated adapters.
+ * {@linkplain #disconnectFromSystem Disconnects} from the distributed system and stops this JMX
+ * Agent and all of its associated adapters.
*/
public void stop();
/**
- * Returns the <code>ObjectName</code> of the JMX management bean
- * that represents this agent or <code>null</code> if this
- * <code>Agent</code> has not been started.
+ * Returns the <code>ObjectName</code> of the JMX management bean that represents this agent or
+ * <code>null</code> if this <code>Agent</code> has not been started.
*/
public ObjectName getObjectName();
/**
- * Returns whether or not this JMX <code>Agent</code> is currently
- * providing information about a distributed system.
+ * Returns whether or not this JMX <code>Agent</code> is currently providing information about a
+ * distributed system.
*/
public boolean isConnected();
/**
- * Connects to the distributed system described by this <code>Agent</code>'s
- * configuration.
+ * Connects to the distributed system described by this <code>Agent</code>'s configuration.
*
- * @return The object name of the system that the <code>Agent</code>
- * is now connected to.
+ * @return The object name of the system that the <code>Agent</code> is now connected to.
*/
- public ObjectName connectToSystem()
- throws AdminException, MalformedObjectNameException;
+ public ObjectName connectToSystem() throws AdminException, MalformedObjectNameException;
/**
- * Returns the <code>AdminDistributedSystem</code> that underlies
- * this JMX <code>Agent</code> or <code>null</code> is this agent is
- * not {@linkplain #isConnected connected}.
+ * Returns the <code>AdminDistributedSystem</code> that underlies this JMX <code>Agent</code> or
+ * <code>null</code> is this agent is not {@linkplain #isConnected connected}.
*/
public AdminDistributedSystem getDistributedSystem();
/**
- * Returns the object name of the JMX MBean that represents the
- * distributed system administered by this <code>Agent</code> or
- * <code>null</code> if this <code>Agent</code> has not {@linkplain
- * #connectToSystem connected} to the distributed system.
+ * Returns the object name of the JMX MBean that represents the distributed system administered by
+ * this <code>Agent</code> or <code>null</code> if this <code>Agent</code> has not
+ * {@linkplain #connectToSystem connected} to the distributed system.
*/
- public ObjectName manageDistributedSystem()
- throws MalformedObjectNameException;
+ public ObjectName manageDistributedSystem() throws MalformedObjectNameException;
/**
- * Disconnects this agent from the distributed system and
- * unregisters the management beans that provided information about
- * it. However, this agent's adapters are not stopped and it is
- * possible to reconfigure this <code>Agent</code> to connect to
- * another distributed system.
+ * Disconnects this agent from the distributed system and unregisters the management beans that
+ * provided information about it. However, this agent's adapters are not stopped and it is
+ * possible to reconfigure this <code>Agent</code> to connect to another distributed system.
*/
public void disconnectFromSystem();
/**
- * Saves the configuration for this <code>Agent</code> to the file
- * specified by @link AgentConfig#getPropertyFile.
+ * Saves the configuration for this <code>Agent</code> to the file specified by @link
+ * AgentConfig#getPropertyFile.
*/
public void saveProperties();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
index b2f04c8..29f0751 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentConfig.java
@@ -1,280 +1,259 @@
/*
- * 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
+ * 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.admin.jmx;
import org.apache.geode.admin.DistributedSystemConfig;
import org.apache.geode.distributed.internal.DistributionConfig;
-//import org.apache.geode.admin.internal.InetAddressUtil;
+// import org.apache.geode.admin.internal.InetAddressUtil;
/**
- * A configuration object for a JMX administration {@linkplain Agent
- * agent} that is hosted by a GemFire application VM. A file named
- * {@link #DEFAULT_PROPERTY_FILE "agent.properties"} can be used to
- * override the default values of <code>AgentConfig</code> attributes.
- * The "gfAgentPropertyFile" {@linkplain System#getProperty(java.lang.String) system
- * property} can be used to specify an agent properties file other
- * than "agent.properties". System properties prefixed with
- * {@linkplain #SYSTEM_PROPERTY_PREFIX "gemfire.agent."} can be used to
- * override the values in the properties file. For instance
- * "-Dgemfire.agent.http-port=8081" can be used to override the
- * default port for the HTTP adapter. Configuration related to the
- * distributed system that the JMX agent administers is inherited from
- * and described in <code>AgentConfig</code>'s superinterface, {@link
- * DistributedSystemConfig}.
+ * A configuration object for a JMX administration {@linkplain Agent agent} that is hosted by a
+ * GemFire application VM. A file named {@link #DEFAULT_PROPERTY_FILE "agent.properties"} can be
+ * used to override the default values of <code>AgentConfig</code> attributes. The
+ * "gfAgentPropertyFile" {@linkplain System#getProperty(java.lang.String) system property} can be
+ * used to specify an agent properties file other than "agent.properties". System properties
+ * prefixed with {@linkplain #SYSTEM_PROPERTY_PREFIX "gemfire.agent."} can be used to override the
+ * values in the properties file. For instance "-Dgemfire.agent.http-port=8081" can be used to
+ * override the default port for the HTTP adapter. Configuration related to the distributed system
+ * that the JMX agent administers is inherited from and described in <code>AgentConfig</code>'s
+ * superinterface, {@link DistributedSystemConfig}.
*
* <P>
*
- * An <code>AgentConfig</code> can be modified using a number of
- * mutator methods until it is used to create an <code>Agent</code>.
- * After that, attempts to modify most attributes in the
- * <code>AgentConfig</code> will result in an {@link
- * IllegalStateException} being thrown. If you wish to use the same
- * <code>AgentConfig</code> to configure multiple <code>Agent</code>s,
- * a copy of the <code>AgentConfig</code> object can be made by
- * invoking its {@link #clone} method.
+ * An <code>AgentConfig</code> can be modified using a number of mutator methods until it is used to
+ * create an <code>Agent</code>. After that, attempts to modify most attributes in the
+ * <code>AgentConfig</code> will result in an {@link IllegalStateException} being thrown. If you
+ * wish to use the same <code>AgentConfig</code> to configure multiple <code>Agent</code>s, a copy
+ * of the <code>AgentConfig</code> object can be made by invoking its {@link #clone} method.
*
* <P>
*
* <B>JMX Administation Agent Configuration Properties</B>
*
* <dl>
- * <a name="auto-connect"><dt>{@linkplain #AUTO_CONNECT_NAME auto-connect}</dt></a>
- * <dd><U>Description</U>: whether or not a JMX agent will
- * automatically connect to the distributed system it is configured to
- * administer.</dd>
- * <dd><U>{@linkplain #DEFAULT_AUTO_CONNECT Default}</U>: false</dd>
+ * <a name="auto-connect">
+ * <dt>{@linkplain #AUTO_CONNECT_NAME auto-connect}</dt></a>
+ * <dd><U>Description</U>: whether or not a JMX agent will automatically connect to the distributed
+ * system it is configured to administer.</dd>
+ * <dd><U>{@linkplain #DEFAULT_AUTO_CONNECT Default}</U>: false</dd>
* </dl>
*
* <B>JMX Agent SSL Configuration Properties</B>
*
* <P>
*
- * These parameters configure sockets that are created by the GemFire
- * JMX Agent regardless of which adapters are enabled. These setting
- * apply to all adapters. For example, if clients connect to the RMI
- * adapter using SSL, then clients must also connect to the HTTP
- * adapter using SSL (HTTPS). Note that these configuration
- * attributes do <b>not</b> effect how the agent connects to the
- * distributed system it administers, only how JMX clients connect to
- * the agent.
+ * These parameters configure sockets that are created by the GemFire JMX Agent regardless of which
+ * adapters are enabled. These setting apply to all adapters. For example, if clients connect to the
+ * RMI adapter using SSL, then clients must also connect to the HTTP adapter using SSL (HTTPS). Note
+ * that these configuration attributes do <b>not</b> effect how the agent connects to the
+ * distributed system it administers, only how JMX clients connect to the agent.
*
* <dl>
- * <a name="agent-ssl-enabled"><dt>{@linkplain #AGENT_SSL_ENABLED_NAME agent-ssl-enabled}</dt></a>
- * <dd><U>Description</U>: whether or not connections to the JMX agent
- * require SSL
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_AGENT_SSL_ENABLED Default}</U>: false</dd>
+ * <a name="agent-ssl-enabled">
+ * <dt>{@linkplain #AGENT_SSL_ENABLED_NAME agent-ssl-enabled}</dt></a>
+ * <dd><U>Description</U>: whether or not connections to the JMX agent require SSL</dd>
+ * <dd><U>{@linkplain #DEFAULT_AGENT_SSL_ENABLED Default}</U>: false</dd>
* </dl>
*
* <dl>
- * <a name="agent-ssl-protocols"><dt>{@linkplain #AGENT_SSL_PROTOCOLS_NAME agent-ssl-protocols}</dt></a>
- * <dd><U>Description</U>: the SSL protocols to be used when connecting
- * to the JMX agent
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_AGENT_SSL_PROTOCOLS Default}</U>: any</dd>
+ * <a name="agent-ssl-protocols">
+ * <dt>{@linkplain #AGENT_SSL_PROTOCOLS_NAME agent-ssl-protocols}</dt></a>
+ * <dd><U>Description</U>: the SSL protocols to be used when connecting to the JMX agent</dd>
+ * <dd><U>{@linkplain #DEFAULT_AGENT_SSL_PROTOCOLS Default}</U>: any</dd>
* </dl>
*
* <dl>
- * <a name="agent-ssl-ciphers"><dt>{@linkplain #AGENT_SSL_CIPHERS_NAME agent-ssl-ciphers}</dt></a>
- * <dd><U>Description</U>: the SSL ciphers to be used when connecting
- * to the JMX agent
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_AGENT_SSL_CIPHERS Default}</U>: any</dd>
+ * <a name="agent-ssl-ciphers">
+ * <dt>{@linkplain #AGENT_SSL_CIPHERS_NAME agent-ssl-ciphers}</dt></a>
+ * <dd><U>Description</U>: the SSL ciphers to be used when connecting to the JMX agent</dd>
+ * <dd><U>{@linkplain #DEFAULT_AGENT_SSL_CIPHERS Default}</U>: any</dd>
* </dl>
*
* <dl>
- * <a name="agent-ssl-require-authentication"><dt>{@linkplain #AGENT_SSL_REQUIRE_AUTHENTICATION_NAME agent-ssl-require-authentication}</dt></a>
- * <dd><U>Description</U>: whether or not SSL connections to the RMI
- * adapter require authentication
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION Default}</U>: true</dd>
+ * <a name="agent-ssl-require-authentication">
+ * <dt>{@linkplain #AGENT_SSL_REQUIRE_AUTHENTICATION_NAME agent-ssl-require-authentication}</dt></a>
+ * <dd><U>Description</U>: whether or not SSL connections to the RMI adapter require authentication
+ * </dd>
+ * <dd><U>{@linkplain #DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION Default}</U>: true</dd>
* </dl>
*
* <dl>
- * <a name="http-ssl-require-authentication"><dt>{@linkplain #HTTP_SSL_REQUIRE_AUTHENTICATION_NAME http-ssl-require-authentication}</dt></a>
- * <dd><U>Description</U>: whether or not SSL connections to the HTTP
- * adapter require authentication
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION Default}</U>: false</dd>
+ * <a name="http-ssl-require-authentication">
+ * <dt>{@linkplain #HTTP_SSL_REQUIRE_AUTHENTICATION_NAME http-ssl-require-authentication}</dt></a>
+ * <dd><U>Description</U>: whether or not SSL connections to the HTTP adapter require authentication
+ * </dd>
+ * <dd><U>{@linkplain #DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION Default}</U>: false</dd>
* </dl>
*
* <B>HTTP Adapter Configuration</B>
*
* <dl>
- * <a name="http-enabled"><dt>{@linkplain #HTTP_ENABLED_NAME http-enabled}</dt></a>
- * <dd><U>Description</U>: whether or not the HTTP adapter is
- * enabled in the JMX agent.</dd>
- * <dd><U>{@linkplain #DEFAULT_HTTP_ENABLED Default}</U>: true</dd>
+ * <a name="http-enabled">
+ * <dt>{@linkplain #HTTP_ENABLED_NAME http-enabled}</dt></a>
+ * <dd><U>Description</U>: whether or not the HTTP adapter is enabled in the JMX agent.</dd>
+ * <dd><U>{@linkplain #DEFAULT_HTTP_ENABLED Default}</U>: true</dd>
* </dl>
*
* <dl>
- * <a name="http-port"><dt>{@linkplain #HTTP_PORT_NAME http-port}</dt></a>
- * <dd><U>Description</U>: the port on which the HTTP adapter should
- * listen for client connections.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_HTTP_PORT Default}</U>: 8080</dd>
+ * <a name="http-port">
+ * <dt>{@linkplain #HTTP_PORT_NAME http-port}</dt></a>
+ * <dd><U>Description</U>: the port on which the HTTP adapter should listen for client connections.
+ * </dd>
+ * <dd><U>{@linkplain #DEFAULT_HTTP_PORT Default}</U>: 8080</dd>
* </dl>
*
* <dl>
- * <a name="http-bind-address"><dt>{@linkplain #HTTP_BIND_ADDRESS_NAME http-bind-address}</dt></a>
- * <dd><U>Description</U>: the machine name or IP address to which
- * the HTTP listening socket should be bound. If this value is
- * "localhost", then the socket will be bound to the loopback
- * address (127.0.0.1) and the adapter will only be accessible via
- * the URL <code>http://localhost:8080</code>.</dd>
- * <dd><U>{@linkplain #DEFAULT_HTTP_BIND_ADDRESS Default}</U>: ""
- * (all network addresses)</dd>
+ * <a name="http-bind-address">
+ * <dt>{@linkplain #HTTP_BIND_ADDRESS_NAME http-bind-address}</dt></a>
+ * <dd><U>Description</U>: the machine name or IP address to which the HTTP listening socket should
+ * be bound. If this value is "localhost", then the socket will be bound to the loopback address
+ * (127.0.0.1) and the adapter will only be accessible via the URL
+ * <code>http://localhost:8080</code>.</dd>
+ * <dd><U>{@linkplain #DEFAULT_HTTP_BIND_ADDRESS Default}</U>: "" (all network addresses)</dd>
* </dl>
*
* <dl>
- * <a name="http-authentication-enabled"><dt>{@linkplain #HTTP_AUTHENTICATION_ENABLED_NAME http-authentication-enabled}</dt></a>
- * <dd><U>Description</U>: Whether or not connections to the HTTP
- * adapter should be authenticated with a user name and password.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_HTTP_AUTHENTICATION_ENABLED Default}</U>: false</dd>
+ * <a name="http-authentication-enabled">
+ * <dt>{@linkplain #HTTP_AUTHENTICATION_ENABLED_NAME http-authentication-enabled}</dt></a>
+ * <dd><U>Description</U>: Whether or not connections to the HTTP adapter should be authenticated
+ * with a user name and password.</dd>
+ * <dd><U>{@linkplain #DEFAULT_HTTP_AUTHENTICATION_ENABLED Default}</U>: false</dd>
* </dl>
*
* <dl>
- * <a name="http-authentication-user"><dt>{@linkplain #HTTP_AUTHENTICATION_USER_NAME http-authentication-user}</dt></a>
- * <dd><U>Description</U>: the user name for authenticating secure
- * communication.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_HTTP_AUTHENTICATION_USER Default}</U>: admin</dd>
+ * <a name="http-authentication-user">
+ * <dt>{@linkplain #HTTP_AUTHENTICATION_USER_NAME http-authentication-user}</dt></a>
+ * <dd><U>Description</U>: the user name for authenticating secure communication.</dd>
+ * <dd><U>{@linkplain #DEFAULT_HTTP_AUTHENTICATION_USER Default}</U>: admin</dd>
* </dl>
*
* <dl>
- * <a name="http-authentication-password"><dt>{@linkplain #HTTP_AUTHENTICATION_PASSWORD_NAME http-authentication-password}</dt></a>
- * <dd><U>Description</U>: the password for authenticating secure
- * communication.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_HTTP_AUTHENTICATION_PASSWORD Default}</U>: password</dd>
+ * <a name="http-authentication-password">
+ * <dt>{@linkplain #HTTP_AUTHENTICATION_PASSWORD_NAME http-authentication-password}</dt></a>
+ * <dd><U>Description</U>: the password for authenticating secure communication.</dd>
+ * <dd><U>{@linkplain #DEFAULT_HTTP_AUTHENTICATION_PASSWORD Default}</U>: password</dd>
* </dl>
*
* <B>RMI Adapter Configuration Properties</B>
*
* <dl>
- * <a name="rmi-enabled"><dt>{@linkplain #RMI_ENABLED_NAME rmi-enabled}</dt></a>
- * <dd><U>Description</U>: whether or not the RMI JMX adapter is enabled
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_RMI_ENABLED Default}</U>: true</dd>
+ * <a name="rmi-enabled">
+ * <dt>{@linkplain #RMI_ENABLED_NAME rmi-enabled}</dt></a>
+ * <dd><U>Description</U>: whether or not the RMI JMX adapter is enabled</dd>
+ * <dd><U>{@linkplain #DEFAULT_RMI_ENABLED Default}</U>: true</dd>
* </dl>
*
* <dl>
- * <a name="rmi-registry-enabled"><dt>{@linkplain #RMI_REGISTRY_ENABLED_NAME rmi-registry-enabled}</dt></a>
- * <dd><U>Description</U>: whether or not the JMX agent should start
- * an RMI registry. Alternatively, a registry outside of the JMX
- * agent VM can be used.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_RMI_REGISTRY_ENABLED Default}</U>: true</dd>
+ * <a name="rmi-registry-enabled">
+ * <dt>{@linkplain #RMI_REGISTRY_ENABLED_NAME rmi-registry-enabled}</dt></a>
+ * <dd><U>Description</U>: whether or not the JMX agent should start an RMI registry. Alternatively,
+ * a registry outside of the JMX agent VM can be used.</dd>
+ * <dd><U>{@linkplain #DEFAULT_RMI_REGISTRY_ENABLED Default}</U>: true</dd>
* </dl>
*
* <dl>
- * <a name="rmi-port"><dt>{@linkplain #RMI_PORT_NAME rmi-port}</dt></a>
- * <dd><U>Description</U>: the port of the RMI registry in which the
- * JMX Agent should bind remote objects.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_RMI_PORT Default}</U>: 1099</dd>
+ * <a name="rmi-port">
+ * <dt>{@linkplain #RMI_PORT_NAME rmi-port}</dt></a>
+ * <dd><U>Description</U>: the port of the RMI registry in which the JMX Agent should bind remote
+ * objects.</dd>
+ * <dd><U>{@linkplain #DEFAULT_RMI_PORT Default}</U>: 1099</dd>
* </dl>
*
* <dl>
- * <a name="rmi-server-port"><dt>{@linkplain #RMI_PORT_NAME rmi-server-port}</dt></a>
- * <dd><U>Description</U>: the port to be used by the RMI Server started by
- * JMX Agent.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_RMI_SERVER_PORT Default}</U>: 0</dd>
- * </dl>
+ * <a name="rmi-server-port">
+ * <dt>{@linkplain #RMI_PORT_NAME rmi-server-port}</dt></a>
+ * <dd><U>Description</U>: the port to be used by the RMI Server started by JMX Agent.</dd>
+ * <dd><U>{@linkplain #DEFAULT_RMI_SERVER_PORT Default}</U>: 0</dd>
+ * </dl>
*
* <dl>
- * <a name="rmi-bind-address"><dt>{@linkplain #RMI_BIND_ADDRESS_NAME rmi-bind-address}</dt></a>
- * <dd><U>Description</U>: the bind address on which the RMI
- * registry binds its sockets.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_RMI_BIND_ADDRESS Default}</U>: ""
- * (all network addresses)</dd>
+ * <a name="rmi-bind-address">
+ * <dt>{@linkplain #RMI_BIND_ADDRESS_NAME rmi-bind-address}</dt></a>
+ * <dd><U>Description</U>: the bind address on which the RMI registry binds its sockets.</dd>
+ * <dd><U>{@linkplain #DEFAULT_RMI_BIND_ADDRESS Default}</U>: "" (all network addresses)</dd>
* </dl>
*
* <B>AdventNet SNMP Adapter Configuration Properties</B>
*
* <dl>
- * <a name="snmp-enabled"><dt>{@linkplain #SNMP_ENABLED_NAME snmp-enabled}</dt></a>
- * <dd><U>Description</U>: whether or not the SNMP JMX adapter is
- * enabled
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_SNMP_ENABLED Default}</U>: false</dd>
+ * <a name="snmp-enabled">
+ * <dt>{@linkplain #SNMP_ENABLED_NAME snmp-enabled}</dt></a>
+ * <dd><U>Description</U>: whether or not the SNMP JMX adapter is enabled</dd>
+ * <dd><U>{@linkplain #DEFAULT_SNMP_ENABLED Default}</U>: false</dd>
* </dl>
*
* <dl>
- * <a name="snmp-bind-address"><dt>{@linkplain #SNMP_BIND_ADDRESS_NAME snmp-bind-address}</dt></a>
- * <dd><U>Description</U>: the host name to which sockets used by the
- * SNMP adapter should be bound.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_SNMP_BIND_ADDRESS Default}</U>: the name of
- * the local machine (not <code>localhost</code>)</dd>
+ * <a name="snmp-bind-address">
+ * <dt>{@linkplain #SNMP_BIND_ADDRESS_NAME snmp-bind-address}</dt></a>
+ * <dd><U>Description</U>: the host name to which sockets used by the SNMP adapter should be bound.
+ * </dd>
+ * <dd><U>{@linkplain #DEFAULT_SNMP_BIND_ADDRESS Default}</U>: the name of the local machine (not
+ * <code>localhost</code>)</dd>
* </dl>
*
* <dl>
- * <a name="snmp-directory"><dt>{@linkplain #SNMP_DIRECTORY_NAME snmp-directory}</dt></a>
- * <dd><U>Description</U>: the deployment directory for AdventNet
- * SNMP Adaptor
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_SNMP_DIRECTORY Default}</U>: ""</dd>
+ * <a name="snmp-directory">
+ * <dt>{@linkplain #SNMP_DIRECTORY_NAME snmp-directory}</dt></a>
+ * <dd><U>Description</U>: the deployment directory for AdventNet SNMP Adaptor</dd>
+ * <dd><U>{@linkplain #DEFAULT_SNMP_DIRECTORY Default}</U>: ""</dd>
* </dl>
*
* <B>JMX Agent Email Notification Properties (for statistics alerts)</B>
*
* <dl>
- * <a name="email-notification-enabled"><dt>{@linkplain #EMAIL_NOTIFICATIONS_ENABLED_NAME email-notification-enabled}</dt></a>
- * <dd><U>Description</U>: Whether or not email notifications are enabled for statistics alerts.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_EMAIL_NOTIFICATIONS_ENABLED Default}</U>: false</dd>
+ * <a name="email-notification-enabled">
+ * <dt>{@linkplain #EMAIL_NOTIFICATIONS_ENABLED_NAME email-notification-enabled}</dt></a>
+ * <dd><U>Description</U>: Whether or not email notifications are enabled for statistics alerts.
+ * </dd>
+ * <dd><U>{@linkplain #DEFAULT_EMAIL_NOTIFICATIONS_ENABLED Default}</U>: false</dd>
* </dl>
*
* <dl>
- * <a name="email-notification-from"><dt>{@linkplain #EMAIL_NOTIFICATIONS_FROM_NAME email-notification-from}</dt></a>
- * <dd><U>Description</U>: Email address to be used to send email notifications.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_EMAIL_FROM Default}</U>: ""</dd>
+ * <a name="email-notification-from">
+ * <dt>{@linkplain #EMAIL_NOTIFICATIONS_FROM_NAME email-notification-from}</dt></a>
+ * <dd><U>Description</U>: Email address to be used to send email notifications.</dd>
+ * <dd><U>{@linkplain #DEFAULT_EMAIL_FROM Default}</U>: ""</dd>
* </dl>
*
* <dl>
- * <a name="email-notification-host"><dt>{@linkplain #EMAIL_NOTIFICATIONS_HOST_NAME email-notification-host}</dt></a>
- * <dd><U>Description</U>: The host name of the mail server to be used for email communication.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_EMAIL_HOST Default}</U>: ""</dd>
+ * <a name="email-notification-host">
+ * <dt>{@linkplain #EMAIL_NOTIFICATIONS_HOST_NAME email-notification-host}</dt></a>
+ * <dd><U>Description</U>: The host name of the mail server to be used for email communication.</dd>
+ * <dd><U>{@linkplain #DEFAULT_EMAIL_HOST Default}</U>: ""</dd>
* </dl>
*
* <dl>
- * <a name="email-notification-to"><dt>{@linkplain #EMAIL_NOTIFICATIONS_TO_LIST_NAME email-notification-to}</dt></a>
- * <dd><U>Description</U>: Email address where the email notifications should be sent.
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_EMAIL_TO_LIST Default}</U>: ""</dd>
+ * <a name="email-notification-to">
+ * <dt>{@linkplain #EMAIL_NOTIFICATIONS_TO_LIST_NAME email-notification-to}</dt></a>
+ * <dd><U>Description</U>: Email address where the email notifications should be sent.</dd>
+ * <dd><U>{@linkplain #DEFAULT_EMAIL_TO_LIST Default}</U>: ""</dd>
* </dl>
*
* <dl>
- * <a name="state-save-file"><dt>{@linkplain #STATE_SAVE_FILE_NAME state-save-file}</dt></a>
- * <dd><U>Description</U>: The name of the file to be used for saving agent state. The file
- is stored in the same directory in which the agent.properties file is located
- * </dd>
- * <dd><U>{@linkplain #DEFAULT_STATE_SAVE_FILE Default}</U>: ""</dd>
+ * <a name="state-save-file">
+ * <dt>{@linkplain #STATE_SAVE_FILE_NAME state-save-file}</dt></a>
+ * <dd><U>Description</U>: The name of the file to be used for saving agent state. The file is
+ * stored in the same directory in which the agent.properties file is located</dd>
+ * <dd><U>{@linkplain #DEFAULT_STATE_SAVE_FILE Default}</U>: ""</dd>
* </dl>
*
*
* @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface AgentConfig extends DistributedSystemConfig {
@@ -286,29 +265,29 @@ public interface AgentConfig extends DistributedSystemConfig {
/** The default name for file that has "agent state saved serialized" */
public static final String DEFAULT_STATE_SAVE_FILE = "agent.ser";
-
+
/** The name of the "auto-connect" property */
public static final String AUTO_CONNECT_NAME = "auto-connect";
- /** The default value of the "auto-connect" property */
+ /** The default value of the "auto-connect" property */
public static final boolean DEFAULT_AUTO_CONNECT = true;
// -------------------------------------------------------------------------
- // HttpAdaptor properties...
+ // HttpAdaptor properties...
// -------------------------------------------------------------------------
-
+
/** The name of the "httpEnabled" property */
public static final String HTTP_ENABLED_NAME = "http-enabled";
- /** The default value of the "httpEnabled" property */
+ /** The default value of the "httpEnabled" property */
public static final boolean DEFAULT_HTTP_ENABLED = true;
-
+
/** The name of the "httpBindAddress" property */
public static final String HTTP_BIND_ADDRESS_NAME = "http-bind-address";
/** The default value of the "httpBindAddress" property */
public static final String DEFAULT_HTTP_BIND_ADDRESS = "";
-
+
/** The name of the "httpPort" property */
public static final String HTTP_PORT_NAME = "http-port";
@@ -322,86 +301,84 @@ public interface AgentConfig extends DistributedSystemConfig {
public static final int MAX_HTTP_PORT = 65535;
/** The name of the "state-save-file-name" property */
- public static final String STATE_SAVE_FILE_NAME =
- "state-save-file";
+ public static final String STATE_SAVE_FILE_NAME = "state-save-file";
/** The name of the "http-authentication-enabled" property */
- public static final String HTTP_AUTHENTICATION_ENABLED_NAME =
- "http-authentication-enabled";
+ public static final String HTTP_AUTHENTICATION_ENABLED_NAME = "http-authentication-enabled";
- /** The default value of the "http-authentication-enabled" property
- * */
+ /**
+ * The default value of the "http-authentication-enabled" property
+ */
public static final boolean DEFAULT_HTTP_AUTHENTICATION_ENABLED = false;
/** The name of the "http-authentication-user" property */
- public static final String HTTP_AUTHENTICATION_USER_NAME =
- "http-authentication-user";
+ public static final String HTTP_AUTHENTICATION_USER_NAME = "http-authentication-user";
- /** The default value of the "http-authentication-user" property */
+ /** The default value of the "http-authentication-user" property */
public static final String DEFAULT_HTTP_AUTHENTICATION_USER = "admin";
/** The name of the "http-authentication-password" property */
- public static final String HTTP_AUTHENTICATION_PASSWORD_NAME =
- "http-authentication-password";
+ public static final String HTTP_AUTHENTICATION_PASSWORD_NAME = "http-authentication-password";
- /** The default value of the "http-authentication-password" property
- * */
- public static final String DEFAULT_HTTP_AUTHENTICATION_PASSWORD =
- "password";
+ /**
+ * The default value of the "http-authentication-password" property
+ */
+ public static final String DEFAULT_HTTP_AUTHENTICATION_PASSWORD = "password";
/** The name of the "email-notification-enabled" property */
- public static final String EMAIL_NOTIFICATIONS_ENABLED_NAME =
- "email-notification-enabled";
+ public static final String EMAIL_NOTIFICATIONS_ENABLED_NAME = "email-notification-enabled";
- /** The default value of the "email-notification-enabled" property
- * */
+ /**
+ * The default value of the "email-notification-enabled" property
+ */
public static final boolean DEFAULT_EMAIL_NOTIFICATIONS_ENABLED = false;
/** The name of the "email-notification-from" property */
- public static final String EMAIL_NOTIFICATIONS_FROM_NAME =
- "email-notification-from";
+ public static final String EMAIL_NOTIFICATIONS_FROM_NAME = "email-notification-from";
- /** The default value of the "email-notification-from" property
- * */
+ /**
+ * The default value of the "email-notification-from" property
+ */
public static final String DEFAULT_EMAIL_FROM = "";
/** The name of the "email-notification-host" property */
- public static final String EMAIL_NOTIFICATIONS_HOST_NAME =
- "email-notification-host";
+ public static final String EMAIL_NOTIFICATIONS_HOST_NAME = "email-notification-host";
- /** The default value of the "email-notification-host" property
- * */
+ /**
+ * The default value of the "email-notification-host" property
+ */
public static final String DEFAULT_EMAIL_HOST = "";
/** The name of the "email-notification-to" property */
- public static final String EMAIL_NOTIFICATIONS_TO_LIST_NAME =
- "email-notification-to";
+ public static final String EMAIL_NOTIFICATIONS_TO_LIST_NAME = "email-notification-to";
- /** The default value of the "email-notification-to" property
- * */
+ /**
+ * The default value of the "email-notification-to" property
+ */
public static final String DEFAULT_EMAIL_TO_LIST = "";
// -------------------------------------------------------------------------
- // RMIConnectorServer properties...
+ // RMIConnectorServer properties...
// -------------------------------------------------------------------------
-
+
/** The name of the "rmiEnabled" property */
public static final String RMI_ENABLED_NAME = "rmi-enabled";
- /** The default value of the {@linkplain #RMI_ENABLED_NAME rmi-enabled} property */
+ /** The default value of the {@linkplain #RMI_ENABLED_NAME rmi-enabled} property */
public static final boolean DEFAULT_RMI_ENABLED = true;
-
+
/** The name of the "rmi-registry-enabled" property */
- public static final String RMI_REGISTRY_ENABLED_NAME =
- "rmi-registry-enabled";
+ public static final String RMI_REGISTRY_ENABLED_NAME = "rmi-registry-enabled";
- /** The default value of the {@linkplain #RMI_REGISTRY_ENABLED_NAME rmi-registry-enabled} property*/
+ /**
+ * The default value of the {@linkplain #RMI_REGISTRY_ENABLED_NAME rmi-registry-enabled} property
+ */
public static final boolean DEFAULT_RMI_REGISTRY_ENABLED = true;
-
+
/** The name of the "rmiBindAddress" property */
public static final String RMI_BIND_ADDRESS_NAME = "rmi-bind-address";
- /** The default value of the {@linkplain #RMI_BIND_ADDRESS_NAME rmi-bind-address} property */
+ /** The default value of the {@linkplain #RMI_BIND_ADDRESS_NAME rmi-bind-address} property */
public static final String DEFAULT_RMI_BIND_ADDRESS = "";
/** The name of the "rmiPort" property */
@@ -409,44 +386,43 @@ public interface AgentConfig extends DistributedSystemConfig {
/** The default value of the {@linkplain #RMI_PORT_NAME rmi-port} property (1099) */
public static final int DEFAULT_RMI_PORT = 1099;
-
- /**
+
+ /**
* The name of the "rmi-server-port" property
*
* @since GemFire 6.5
*/
public static final String RMI_SERVER_PORT_NAME = "rmi-server-port";
- /**
- * The default value of the {@linkplain #RMI_SERVER_PORT_NAME rmi-server-port}
- * property (0)
+ /**
+ * The default value of the {@linkplain #RMI_SERVER_PORT_NAME rmi-server-port} property (0)
*
* @since GemFire 6.5
*/
public static final int DEFAULT_RMI_SERVER_PORT = 0;
/**
- * The minimum value for {@linkplain #RMI_PORT_NAME rmi-port} or
- * {@linkplain #RMI_SERVER_PORT_NAME rmi-server-port} (0)
+ * The minimum value for {@linkplain #RMI_PORT_NAME rmi-port} or {@linkplain #RMI_SERVER_PORT_NAME
+ * rmi-server-port} (0)
*/
public static final int MIN_RMI_PORT = 0;
/**
- * The maximum value for {@linkplain #RMI_PORT_NAME rmi-port} or
- * {@linkplain #RMI_SERVER_PORT_NAME rmi-server-port} (65535)
+ * The maximum value for {@linkplain #RMI_PORT_NAME rmi-port} or {@linkplain #RMI_SERVER_PORT_NAME
+ * rmi-server-port} (65535)
*/
public static final int MAX_RMI_PORT = 65535;
-
+
// -------------------------------------------------------------------------
- // AdventNetSNMPAdaptor properties...
+ // AdventNetSNMPAdaptor properties...
// -------------------------------------------------------------------------
-
+
/** The name of the "snmpEnabled" property */
public static final String SNMP_ENABLED_NAME = "snmp-enabled";
- /** The default value of the "snmpEnabled" property */
+ /** The default value of the "snmpEnabled" property */
public static final boolean DEFAULT_SNMP_ENABLED = false;
-
+
/** The name of the "snmpBindAddress" property */
public static final String SNMP_BIND_ADDRESS_NAME = "snmp-bind-address";
@@ -456,60 +432,62 @@ public interface AgentConfig extends DistributedSystemConfig {
/** The name of the "snmpDirectory" property */
public static final String SNMP_DIRECTORY_NAME = "snmp-directory";
- /** The default value of the "snmpDirectory" property */
+ /** The default value of the "snmpDirectory" property */
public static final String DEFAULT_SNMP_DIRECTORY = "";
// -------------------------------------------------------------------------
- // JMX SSL properties...
+ // JMX SSL properties...
// -------------------------------------------------------------------------
/** The name of the "agent-ssl-enabled" property */
public static final String AGENT_SSL_ENABLED_NAME = "agent-ssl-enabled";
- /** The default value of the "agent-ssl-enabled" property */
+ /** The default value of the "agent-ssl-enabled" property */
public static final boolean DEFAULT_AGENT_SSL_ENABLED = false;
/** The name of the "agent-ssl-protocols" property */
public static final String AGENT_SSL_PROTOCOLS_NAME = "agent-ssl-protocols";
- /** The default value of the "agent-ssl-protocols" property */
+ /** The default value of the "agent-ssl-protocols" property */
public static final String DEFAULT_AGENT_SSL_PROTOCOLS = "any";
/** The name of the "agent-ssl-ciphers" property */
public static final String AGENT_SSL_CIPHERS_NAME = "agent-ssl-ciphers";
- /** The default value of the "agent-ssl-ciphers" property */
+ /** The default value of the "agent-ssl-ciphers" property */
public static final String DEFAULT_AGENT_SSL_CIPHERS = "any";
/** The name of the "agent-ssl-require-authentication" property */
public static final String AGENT_SSL_REQUIRE_AUTHENTICATION_NAME =
- "agent-ssl-require-authentication";
+ "agent-ssl-require-authentication";
- /** The default value of the "agent-ssl-require-authentication"
- * property */
+ /**
+ * The default value of the "agent-ssl-require-authentication" property
+ */
public static final boolean DEFAULT_AGENT_SSL_REQUIRE_AUTHENTICATION = true;
-
+
/** The name of the "http-ssl-require-authentication" property */
public static final String HTTP_SSL_REQUIRE_AUTHENTICATION_NAME =
- "http-ssl-require-authentication";
+ "http-ssl-require-authentication";
- /** The default value of the "http-ssl-require-authentication"
- * property */
+ /**
+ * The default value of the "http-ssl-require-authentication" property
+ */
public static final boolean DEFAULT_HTTP_SSL_REQUIRE_AUTHENTICATION = false;
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Returns whether or not the JMX agent will automatically connect
- * to the distributed system it administers.
+ * Returns whether or not the JMX agent will automatically connect to the distributed system it
+ * administers.
*
* See <a href="#auto-connect">description</a> above.
*/
public boolean getAutoConnect();
/**
- * Sets whether or not the JMX agent will automatically connect
- * to the distributed system it administers.
+ * Sets whether or not the JMX agent will automatically connect to the distributed system it
+ * administers.
*
* See <a href="#auto-connect">description</a> above.
*/
@@ -544,67 +522,58 @@ public interface AgentConfig extends DistributedSystemConfig {
public void setHttpPort(int port);
/**
- * Returns the bind address to which the HTTP adapter's listening
- * socket is bound.
+ * Returns the bind address to which the HTTP adapter's listening socket is bound.
*
* See <a href="#http-bind-address">description</a> above.
*/
public String getHttpBindAddress();
/**
- * Sets the bind address to which the HTTP adapter's listening
- * socket is bound.
+ * Sets the bind address to which the HTTP adapter's listening socket is bound.
*
* See <a href="#http-bind-address">description</a> above.
*/
public void setHttpBindAddress(String address);
/**
- * Returns whether or not the HTTP adapter authenticates
- * connections.
+ * Returns whether or not the HTTP adapter authenticates connections.
*
- * See <a href="#http-authentication-enabled">description</a>
- * above.
- */
+ * See <a href="#http-authentication-enabled">description</a> above.
+ */
public boolean isHttpAuthEnabled();
/**
* Sets whether or not the HTTP adapter authenticates connections.
*
- * See <a href="#http-authentication-enabled">description</a>
- * above.
+ * See <a href="#http-authentication-enabled">description</a> above.
*/
public void setHttpAuthEnabled(boolean enabled);
/**
* Returns the user name for HTTP adapter authentication.
*
- * See <a href="#http-authentication-user">description</a>
- * above.
+ * See <a href="#http-authentication-user">description</a> above.
*/
public String getHttpAuthUser();
-
+
/**
* Sets the user name for HTTP adapter authentication.
*
- * See <a href="#http-authentication-user">description</a>
- * above.
+ * See <a href="#http-authentication-user">description</a> above.
*/
public void setHttpAuthUser(String user);
/**
* Returns the password for HTTP adapter authentication.
*
- * See <a href="#http-authentication-password">description</a>
- * above.
+ * See <a href="#http-authentication-password">description</a> above.
*/
public String getHttpAuthPassword();
-
+
/**
* Sets the password for HTTP adapter authentication.
*
- * See <a href="#http-authentication-password">description</a>
- * above.
+ * See <a href="#http-authentication-password">description</a> above.
*/
public void setHttpAuthPassword(String password);
@@ -649,7 +618,7 @@ public interface AgentConfig extends DistributedSystemConfig {
* See <a href="#rmi-port">description</a> above.
*/
public void setRmiPort(int port);
-
+
/**
* Returns the port of the RMI Connector Server.
*
@@ -665,22 +634,20 @@ public interface AgentConfig extends DistributedSystemConfig {
*
* See <a href="#rmi-server-port">description</a> above.
*
- * @param port rmi-server-port to set.
+ * @param port rmi-server-port to set.
* @since GemFire 6.5
*/
public void setRmiServerPort(int port);
/**
- * Returns the bind address to which the RMI adapter's listening
- * sockets are bound.
+ * Returns the bind address to which the RMI adapter's listening sockets are bound.
*
* See <a href="#rmi-bind-address">description</a> above.
*/
public String getRmiBindAddress();
/**
- * Sets the bind address to which the RMI adapter's listening
- * sockets are bound.
+ * Sets the bind address to which the RMI adapter's listening sockets are bound.
*
* See <a href="#rmi-bind-address">description</a> above.
*/
@@ -727,7 +694,7 @@ public interface AgentConfig extends DistributedSystemConfig {
* See <a href="#snmp-directory">description</a> above.
*/
public void setSnmpDirectory(String snmpDirectory);
-
+
/**
* Returns whether or not SSL is required for the JMX agent.
*
@@ -771,32 +738,28 @@ public interface AgentConfig extends DistributedSystemConfig {
public void setAgentSSLCiphers(String ciphers);
/**
- * Returns whether SSL authentication is used when connecting to the
- * RMI connector.
+ * Returns whether SSL authentication is used when connecting to the RMI connector.
*
* See <a href="#agent-ssl-require-authentication">description</a> above.
*/
public boolean isAgentSSLRequireAuth();
-
+
/**
- * Sets whether SSL authentication is used when connecting to the
- * RMI connector.
+ * Sets whether SSL authentication is used when connecting to the RMI connector.
*
* See <a href="#agent-ssl-require-authentication">description</a> above.
*/
public void setAgentSSLRequireAuth(boolean require);
/**
- * Returns whether SSL authentication is used when connecting to the
- * HTTP connector.
+ * Returns whether SSL authentication is used when connecting to the HTTP connector.
*
* See <a href="#http-ssl-require-authentication">description</a> above.
*/
public boolean isHttpSSLRequireAuth();
-
+
/**
- * Sets whether SSL authentication is used when connecting to the
- * HTTP connector.
+ * Sets whether SSL authentication is used when connecting to the HTTP connector.
*
* See <a href="#http-ssl-require-authentication">description</a> above.
*/
@@ -822,7 +785,7 @@ public interface AgentConfig extends DistributedSystemConfig {
* See <a href="#email-notification-from">description</a> above.
*/
public String getEmailNotificationFrom();
-
+
/**
* Sets the EmailID from whom notification emails are sent.
*
@@ -836,7 +799,7 @@ public interface AgentConfig extends DistributedSystemConfig {
* See <a href="#email-notification-host">description</a> above.
*/
public String getEmailNotificationHost();
-
+
/**
* Sets the Host Name from whom notification emails are sent.
*
@@ -845,21 +808,19 @@ public interface AgentConfig extends DistributedSystemConfig {
public void setEmailNotificationHost(String hostName);
/**
- * Returns the comma separated EmailID list to whom notification
- * emails are sent.
+ * Returns the comma separated EmailID list to whom notification emails are sent.
*
* See <a href="#email-notification-to">description</a> above.
*/
public String getEmailNotificationToList();
-
+
/**
- * Sets the EmailID from whom notification emails are sent as a
- * comma separated list.
+ * Sets the EmailID from whom notification emails are sent as a comma separated list.
*
* See <a href="#email-notification-to">description</a> above.
*/
public void setEmailNotificationToList(String emailIDs);
-
+
/**
* Returns the name of the file to be used for saving agent state
*
@@ -875,9 +836,9 @@ public interface AgentConfig extends DistributedSystemConfig {
public void setStateSaveFile(String file);
/**
- * Returns an <code>AgentConfig</code> with the same configuration
- * as this <code>AgentConfig</code>.
+ * Returns an <code>AgentConfig</code> with the same configuration as this
+ * <code>AgentConfig</code>.
*/
- public Object clone() throws CloneNotSupportedException;
+ public Object clone() throws CloneNotSupportedException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentFactory.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentFactory.java
index 69bae36..5228c6b 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/AgentFactory.java
@@ -1,22 +1,20 @@
/*
- * 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
+ * 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.admin.jmx;
-//import org.apache.geode.admin.AdminDistributedSystem;
+// import org.apache.geode.admin.AdminDistributedSystem;
import org.apache.geode.admin.AdminException;
import org.apache.geode.admin.jmx.internal.AgentConfigImpl;
import org.apache.geode.admin.jmx.internal.AgentImpl;
@@ -25,26 +23,25 @@ import org.apache.geode.admin.jmx.internal.AgentImpl;
* A factory class that creates JMX administration entities.
*
* @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class AgentFactory {
/**
- * Defines a "default" GemFire JMX administration agent
- * configuration.
+ * Defines a "default" GemFire JMX administration agent configuration.
*/
public static AgentConfig defineAgent() {
return new AgentConfigImpl();
}
/**
- * Creates an unstarted GemFire JMX administration agent with the
- * given configuration.
+ * Creates an unstarted GemFire JMX administration agent with the given configuration.
*
* @see Agent#start
*/
- public static Agent getAgent(AgentConfig config)
- throws AdminException {
+ public static Agent getAgent(AgentConfig config) throws AdminException {
return new AgentImpl((AgentConfigImpl) config);
}
[03/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
index 3956682..a21dd8a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
@@ -1,18 +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
+ * 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;
@@ -21,132 +19,151 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import java.io.File;
/**
- * Factory for creating instances of {@link DiskStore}.
- * To get an instance of this factory call {@link Cache#createDiskStoreFactory}.
- * If all you want to do is find an existing disk store see {@link Cache#findDiskStore}.
+ * Factory for creating instances of {@link DiskStore}. To get an instance of this factory call
+ * {@link Cache#createDiskStoreFactory}. If all you want to do is find an existing disk store see
+ * {@link Cache#findDiskStore}.
* <P>
- * To use this factory configure it with the <code>set</code> methods and then
- * call {@link #create} to produce a disk store instance.
+ * To use this factory configure it with the <code>set</code> methods and then call {@link #create}
+ * to produce a disk store instance.
*
* @since GemFire 6.5
*/
-public interface DiskStoreFactory
-{
+public interface DiskStoreFactory {
/**
- * The name of the default disk store is "DEFAULT".
- * This name can be used to redefine the default disk store.
- * Regions that have not had their disk-store-name set will
- * use this disk store.
+ * The name of the default disk store is "DEFAULT". This name can be used to redefine the default
+ * disk store. Regions that have not had their disk-store-name set will use this disk store.
*/
public static final String DEFAULT_DISK_STORE_NAME = "DEFAULT";
/**
- * The default setting for auto compaction.
- * <p>Current value: <code>true</code>.
+ * The default setting for auto compaction.
+ * <p>
+ * Current value: <code>true</code>.
*/
public static final boolean DEFAULT_AUTO_COMPACT = true;
-
+
/**
* The default compaction threshold.
- * <p>Current value: <code>50</code>.
+ * <p>
+ * Current value: <code>50</code>.
*/
public static final int DEFAULT_COMPACTION_THRESHOLD = 50;
/**
* The default value of the allow force compaction attribute.
- * <p>Current value: <code>false</code>.
+ * <p>
+ * Current value: <code>false</code>.
*/
public static final boolean DEFAULT_ALLOW_FORCE_COMPACTION = false;
/**
* The default maximum oplog file size in megabytes.
- * <p>Current value: <code>1024</code> which is one gigabyte.
+ * <p>
+ * Current value: <code>1024</code> which is one gigabyte.
*/
- public static final long DEFAULT_MAX_OPLOG_SIZE = Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "DEFAULT_MAX_OPLOG_SIZE", 1024L)
- .longValue(); // 1024 == 1 GB; // sys prop used by dunit and junit
+ public static final long DEFAULT_MAX_OPLOG_SIZE =
+ Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "DEFAULT_MAX_OPLOG_SIZE", 1024L).longValue(); // 1024
+ // ==
+ // 1
+ // GB;
+ // //
+ // sys
+ // prop
+ // used
+ // by
+ // dunit
+ // and
+ // junit
/**
* The default time interval in milliseconds.
- * <p>Current value: <code>1000</code>.
+ * <p>
+ * Current value: <code>1000</code>.
*/
public static final long DEFAULT_TIME_INTERVAL = 1000; // 1 sec;
-
+
/**
* The default write buffer size.
- * <p>Current value: <code>32768</code>.
+ * <p>
+ * Current value: <code>32768</code>.
*/
public static final int DEFAULT_WRITE_BUFFER_SIZE = 32 * 1024;
/**
* The default maximum number of operations that can be asynchronously queued.
- * <p>Current value: <code>0</code>.
+ * <p>
+ * Current value: <code>0</code>.
*/
public static final int DEFAULT_QUEUE_SIZE = 0;
-
+
/**
* The default disk directories.
- * <p>Current value: <code>current directory</code>.
+ * <p>
+ * Current value: <code>current directory</code>.
*/
- public static final File[] DEFAULT_DISK_DIRS = new File[] { new File(".") };
-
+ public static final File[] DEFAULT_DISK_DIRS = new File[] {new File(".")};
+
/**
* The default disk directory size in megabytes.
- * <p>Current value: <code>2,147,483,647</code> which is two petabytes.
+ * <p>
+ * Current value: <code>2,147,483,647</code> which is two petabytes.
*/
public static final int DEFAULT_DISK_DIR_SIZE = Integer.MAX_VALUE; // unlimited for bug 41863
-
+
/**
* The default disk directory sizes.
- * <p>Current value: {@link #DEFAULT_DISK_DIR_SIZE} which is two petabytes each.
+ * <p>
+ * Current value: {@link #DEFAULT_DISK_DIR_SIZE} which is two petabytes each.
*/
public static final int[] DEFAULT_DISK_DIR_SIZES = new int[] {DEFAULT_DISK_DIR_SIZE};
/**
* The default disk usage warning percentage.
- * <p>Current value: <code>90</code>.
+ * <p>
+ * Current value: <code>90</code>.
*/
public static final float DEFAULT_DISK_USAGE_WARNING_PERCENTAGE = 90;
-
+
/**
* The default disk usage critical percentage.
- * <p>Current value: <code>99</code>.
+ * <p>
+ * Current value: <code>99</code>.
*/
public static final float DEFAULT_DISK_USAGE_CRITICAL_PERCENTAGE = 99;
-
- /**
- * Set to <code>true</code> to cause the disk files to be automatically compacted.
- * Set to <code>false</code> if no compaction is needed or manual compaction will be used.
+
+ /**
+ * Set to <code>true</code> to cause the disk files to be automatically compacted. Set to
+ * <code>false</code> if no compaction is needed or manual compaction will be used.
+ *
* @param isAutoCompact if true then use auto compaction
* @return a reference to <code>this</code>
*/
public DiskStoreFactory setAutoCompact(boolean isAutoCompact);
/**
- * Sets the threshold at which an oplog will become compactable. Until it
- * reaches this threshold the oplog will not be compacted. The threshold is a
- * percentage in the range 0..100. When the amount of live data in an oplog
- * becomes less than this percentage then when a compaction is done this
- * garbage will be cleaned up freeing up disk space. Garbage is created by
- * entry destroys, entry updates, and region destroys.
+ * Sets the threshold at which an oplog will become compactable. Until it reaches this threshold
+ * the oplog will not be compacted. The threshold is a percentage in the range 0..100. When the
+ * amount of live data in an oplog becomes less than this percentage then when a compaction is
+ * done this garbage will be cleaned up freeing up disk space. Garbage is created by entry
+ * destroys, entry updates, and region destroys.
*
- * @param compactionThreshold
- * percentage of remaining live data in the oplog at which an oplog
- * is compactable
+ * @param compactionThreshold percentage of remaining live data in the oplog at which an oplog is
+ * compactable
* @return a reference to <code>this</code>
*/
public DiskStoreFactory setCompactionThreshold(int compactionThreshold);
- /**
- * Set to <code>true</code> to allow {@link DiskStore#forceCompaction} to be called
- * on regions using this disk store.
+ /**
+ * Set to <code>true</code> to allow {@link DiskStore#forceCompaction} to be called on regions
+ * using this disk store.
*
* @param allowForceCompaction if true then allow force compaction.
* @return a reference to <code>this</code>
*/
public DiskStoreFactory setAllowForceCompaction(boolean allowForceCompaction);
- /**
- * Sets the maximum size in megabytes a single oplog (operation log) is allowed to be.
- * When an oplog is created this amount of file space will be immediately reserved.
+ /**
+ * Sets the maximum size in megabytes a single oplog (operation log) is allowed to be. When an
+ * oplog is created this amount of file space will be immediately reserved.
*
* @param maxOplogSize maximum size in megabytes for one single oplog file.
* @return a reference to <code>this</code>
@@ -154,12 +171,14 @@ public interface DiskStoreFactory
public DiskStoreFactory setMaxOplogSize(long maxOplogSize);
/**
- * Sets the number of milliseconds that can elapse before
- * data written asynchronously is flushed to disk.
- * <p>For how to configure a region to be asynchronous see: {@link AttributesFactory#setDiskSynchronous}.
+ * Sets the number of milliseconds that can elapse before data written asynchronously is flushed
+ * to disk.
+ * <p>
+ * For how to configure a region to be asynchronous see:
+ * {@link AttributesFactory#setDiskSynchronous}.
*
- * @param timeInterval number of milliseconds that can elapse before
- * async data is flushed to disk.
+ * @param timeInterval number of milliseconds that can elapse before async data is flushed to
+ * disk.
* @return a reference to <code>this</code>
*/
public DiskStoreFactory setTimeInterval(long timeInterval);
@@ -173,25 +192,23 @@ public interface DiskStoreFactory
public DiskStoreFactory setWriteBufferSize(int writeBufferSize);
/**
- * Sets the maximum number of operations that can be asynchronously queued.
- * Once this many pending async operations have been queued async ops will
- * begin blocking until some of the queued ops have been flushed to disk.
+ * Sets the maximum number of operations that can be asynchronously queued. Once this many pending
+ * async operations have been queued async ops will begin blocking until some of the queued ops
+ * have been flushed to disk.
* <p>
* For how to configure a region to be asynchronous see:
* {@link AttributesFactory#setDiskSynchronous}.
*
- * @param queueSize
- * number of operations that can be asynchronously queued. If 0, the
- * queue will be unlimited.
+ * @param queueSize number of operations that can be asynchronously queued. If 0, the queue will
+ * be unlimited.
* @return a reference to <code>this</code>
*/
public DiskStoreFactory setQueueSize(int queueSize);
/**
- * Sets the directories to which this disk store's data is written. If multiple
- * directories are used, GemFire will attempt to distribute the data evenly
- * amongst them.
- * The size of each directory will be set to the default of {@link #DEFAULT_DISK_DIR_SIZE}.
+ * Sets the directories to which this disk store's data is written. If multiple directories are
+ * used, GemFire will attempt to distribute the data evenly amongst them. The size of each
+ * directory will be set to the default of {@link #DEFAULT_DISK_DIR_SIZE}.
*
* @param diskDirs directories to put the oplog files.
* @return a reference to <code>this</code>
@@ -199,21 +216,20 @@ public interface DiskStoreFactory
public DiskStoreFactory setDiskDirs(File[] diskDirs);
/**
- * Sets the directories to which this disk store's data is written
- * and also set the sizes in megabytes of each directory.
+ * Sets the directories to which this disk store's data is written and also set the sizes in
+ * megabytes of each directory.
*
* @param diskDirs directories to put the oplog files.
* @param diskDirSizes sizes of disk directories in megabytes
* @return a reference to <code>this</code>
*
- * @throws IllegalArgumentException if length of the size array
- * does not match to the length of the dir array
+ * @throws IllegalArgumentException if length of the size array does not match to the length of
+ * the dir array
*/
- public DiskStoreFactory setDiskDirsAndSizes(File[] diskDirs,int[] diskDirSizes);
+ public DiskStoreFactory setDiskDirsAndSizes(File[] diskDirs, int[] diskDirSizes);
/**
- * Sets the warning threshold for disk usage as a percentage of the total disk
- * volume.
+ * Sets the warning threshold for disk usage as a percentage of the total disk volume.
*
* @param warningPercent warning percent of disk usage
* @return a reference to <code>this</code>
@@ -222,8 +238,7 @@ public interface DiskStoreFactory
public DiskStoreFactory setDiskUsageWarningPercentage(float warningPercent);
/**
- * Sets the critical threshold for disk usage as a percentage of the total disk
- * volume.
+ * Sets the critical threshold for disk usage as a percentage of the total disk volume.
*
* @param criticalPercent critical percent of disk usage
* @return a reference to <code>this</code>
@@ -237,8 +252,8 @@ public interface DiskStoreFactory
*
* @param name the name of the DiskStore
* @return the newly created DiskStore.
- * @throws IllegalStateException if a disk store with the given name already exists
- * and its configuration is not consistent with this factory.
+ * @throws IllegalStateException if a disk store with the given name already exists and its
+ * configuration is not consistent with this factory.
*/
public DiskStore create(String name);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
index bc42112..1040475 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributes.java
@@ -1,24 +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
+ * 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;
/**
- * Immutable parameter object for describing how {@linkplain
- * Region.Entry region entries} should be written to disk.
+ * Immutable parameter object for describing how {@linkplain Region.Entry region entries} should be
+ * written to disk.
*
* @see DiskWriteAttributesFactory
* @see AttributesFactory#setDiskWriteAttributes
@@ -30,74 +28,66 @@ package org.apache.geode.cache;
* @deprecated as of 6.5 use {@link DiskStore} instead
*/
@Deprecated
-public interface DiskWriteAttributes
- extends java.io.Serializable {
+public interface DiskWriteAttributes extends java.io.Serializable {
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
+
-
/**
- * Returns true if this <code>DiskWriteAttributes</code> object
- * configures synchronous writes.
+ * Returns true if this <code>DiskWriteAttributes</code> object configures synchronous writes.
*
* @return Returns true if writes to disk are synchronous and false otherwise
* @deprecated as of 6.5 use {@link RegionAttributes#isDiskSynchronous} instead.
*/
@Deprecated
public boolean isSynchronous();
-
-
- /**
+
+
+ /**
* Returns true if the oplogs is to be rolled to a more condensed format (on disk)
*
* @return Returns true if the oplogs is to be rolled or false otherwise
*/
public boolean isRollOplogs();
- /**
- * Get the maximum size in megabytes a single oplog (operation log) file should be
+ /**
+ * Get the maximum size in megabytes a single oplog (operation log) file should be
*
* @return the maximum size the operations log file can be
- * @deprecated as of 6.5 use {@link DiskStore#getMaxOplogSize()}
- * instead.
+ * @deprecated as of 6.5 use {@link DiskStore#getMaxOplogSize()} instead.
*/
@Deprecated
public int getMaxOplogSize();
/**
- * Returns the number of milliseconds that can elapse before
- * unwritten data is written to disk. If this
- * <code>DiskWriteAttributes</code> configures synchronous writing,
- * then <code>timeInterval</code> has no meaning.
+ * Returns the number of milliseconds that can elapse before unwritten data is written to disk. If
+ * this <code>DiskWriteAttributes</code> configures synchronous writing, then
+ * <code>timeInterval</code> has no meaning.
*
* @return Returns the time interval in milliseconds that can elapse between two writes to disk
- * @deprecated as of 6.5 use {@link DiskStore#getTimeInterval()}
- * instead.
+ * @deprecated as of 6.5 use {@link DiskStore#getTimeInterval()} instead.
*/
@Deprecated
public long getTimeInterval();
/**
- * Returns the number of unwritten bytes of data that can be
- * enqueued before being written to disk. If this
- * <code>DiskWriteAttributes</code> configures synchronous writing,
- * then <code>bytesThreshold</code> has no meaning.
+ * Returns the number of unwritten bytes of data that can be enqueued before being written to
+ * disk. If this <code>DiskWriteAttributes</code> configures synchronous writing, then
+ * <code>bytesThreshold</code> has no meaning.
*
* @return Returns the number of bytes that can be buffered before being written to disk
- * @deprecated as of 6.5 use {@link DiskStore#getQueueSize()}
- * instead.
+ * @deprecated as of 6.5 use {@link DiskStore#getQueueSize()} instead.
*/
@Deprecated
public long getBytesThreshold();
/**
- * Two <code>DiskWriteAttributes</code> are equal if the both
- * specify the synchronous writes, or they both specify asynchronous
- * writes with the same time interval, bytes threshold, maxOplogSize and
- * compaction values
+ * Two <code>DiskWriteAttributes</code> are equal if the both specify the synchronous writes, or
+ * they both specify asynchronous writes with the same time interval, bytes threshold,
+ * maxOplogSize and compaction values
*
* @return true if o is equal else false
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
index f56fc8d..c1f49c5 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskWriteAttributesFactory.java
@@ -1,18 +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
+ * 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;
@@ -29,8 +27,7 @@ import org.apache.geode.internal.cache.xmlcache.CacheXml;
* @deprecated as of 6.5 use {@link DiskStoreFactory} instead
*/
@Deprecated
-public final class DiskWriteAttributesFactory implements java.io.Serializable
-{
+public final class DiskWriteAttributesFactory implements java.io.Serializable {
private static final long serialVersionUID = -4077746249663727235L;
private final Properties props = new Properties();
@@ -41,8 +38,7 @@ public final class DiskWriteAttributesFactory implements java.io.Serializable
*
* Creates a new instance of DiskWriteAttributesFactory ready to create a
* <code>DiskWriteAttributes</code> with default settings. The default
- * <code>DiskWriteAttributes</code> thus created will have following
- * behaviour.
+ * <code>DiskWriteAttributes</code> thus created will have following behaviour.
* <ul>
* <li>synchronous = false
* <li>auto-compact = true
@@ -58,28 +54,23 @@ public final class DiskWriteAttributesFactory implements java.io.Serializable
}
/**
- * Creates a new instance of DiskWriteAttributesFactory Factory ready to
- * create a <code>DiskWriteAttributes</code> with the same settings as those
- * in the specified <code>DiskWriteAttributes</code>.
+ * Creates a new instance of DiskWriteAttributesFactory Factory ready to create a
+ * <code>DiskWriteAttributes</code> with the same settings as those in the specified
+ * <code>DiskWriteAttributes</code>.
*
- * @param dwa
- * the <code>DiskWriteAttributes</code> used to initialize this
- * DiskWriteAttributesFactory
+ * @param dwa the <code>DiskWriteAttributes</code> used to initialize this
+ * DiskWriteAttributesFactory
*/
public DiskWriteAttributesFactory(DiskWriteAttributes dwa) {
- this.props.setProperty(CacheXml.BYTES_THRESHOLD,
- String.valueOf(dwa.getBytesThreshold()));
+ this.props.setProperty(CacheXml.BYTES_THRESHOLD, String.valueOf(dwa.getBytesThreshold()));
long maxOplogSizeInBytes = convertToBytes(dwa.getMaxOplogSize());
- this.props.setProperty(CacheXml.MAX_OPLOG_SIZE,
- String.valueOf(maxOplogSizeInBytes));
- this.props.setProperty(CacheXml.ROLL_OPLOG,
- String.valueOf(dwa.isRollOplogs()));
- this.props.setProperty(DiskWriteAttributesImpl.SYNCHRONOUS_PROPERTY, String
- .valueOf(dwa.isSynchronous()));
+ this.props.setProperty(CacheXml.MAX_OPLOG_SIZE, String.valueOf(maxOplogSizeInBytes));
+ this.props.setProperty(CacheXml.ROLL_OPLOG, String.valueOf(dwa.isRollOplogs()));
+ this.props.setProperty(DiskWriteAttributesImpl.SYNCHRONOUS_PROPERTY,
+ String.valueOf(dwa.isSynchronous()));
if (dwa.getTimeInterval() > -1) {
- this.props.setProperty(CacheXml.TIME_INTERVAL,
- String.valueOf(dwa.getTimeInterval()));
+ this.props.setProperty(CacheXml.TIME_INTERVAL, String.valueOf(dwa.getTimeInterval()));
}
}
@@ -87,174 +78,163 @@ public final class DiskWriteAttributesFactory implements java.io.Serializable
/**
* Sets whether or not the writing to the disk is synchronous.
*
- * @param isSynchronous
- * boolean if true indicates synchronous writes
+ * @param isSynchronous boolean if true indicates synchronous writes
* @deprecated as of 6.5 use {@link AttributesFactory#setDiskSynchronous} instead
*/
@Deprecated
- public void setSynchronous(boolean isSynchronous)
- {
- this.props.setProperty(DiskWriteAttributesImpl.SYNCHRONOUS_PROPERTY, String
- .valueOf(isSynchronous));
+ public void setSynchronous(boolean isSynchronous) {
+ this.props.setProperty(DiskWriteAttributesImpl.SYNCHRONOUS_PROPERTY,
+ String.valueOf(isSynchronous));
}
/**
* Sets whether or not the rolling of Oplog is enabled .
*
- * @param rollingEnabled true if oplogs are to be compacted automatically;
- * false if no compaction.
+ * @param rollingEnabled true if oplogs are to be compacted automatically; false if no compaction.
* @deprecated as of 6.5 use {@link DiskStoreFactory#setAutoCompact} instead
*/
@Deprecated
- public void setRollOplogs(boolean rollingEnabled)
- {
+ public void setRollOplogs(boolean rollingEnabled) {
this.props.setProperty(CacheXml.ROLL_OPLOG, String.valueOf(rollingEnabled));
}
/**
- * Sets the threshold at which an oplog will become compactable. While
- * the percentage of live records in the oplog exceeds
- * this threshold the oplog will not be compacted.
- * Once the percentage of live is less than or equal to the threshold
- * the oplog can be compacted.
- * The lower the threshold the longer the compactor will wait before compacting an oplog.
- * The threshold is a percentage in the range 0..100.
- * The default is 50%.
- * <P>Examples:
- * A threshold of 100 causes any oplog that is no longer being written to
- * to be compactable.
- * A threshold of 0 causes only oplogs that have no live records to be compactable
- * in which case the compact can simply remove the oplog file.
- * A threshold of 50 causes an oplog to become compactable when half of its
- * live records become dead.
+ * Sets the threshold at which an oplog will become compactable. While the percentage of live
+ * records in the oplog exceeds this threshold the oplog will not be compacted. Once the
+ * percentage of live is less than or equal to the threshold the oplog can be compacted. The lower
+ * the threshold the longer the compactor will wait before compacting an oplog. The threshold is a
+ * percentage in the range 0..100. The default is 50%.
+ * <P>
+ * Examples: A threshold of 100 causes any oplog that is no longer being written to to be
+ * compactable. A threshold of 0 causes only oplogs that have no live records to be compactable in
+ * which case the compact can simply remove the oplog file. A threshold of 50 causes an oplog to
+ * become compactable when half of its live records become dead.
+ *
* @deprecated as of 6.5 use {@link DiskStoreFactory#setCompactionThreshold} instead
*/
@Deprecated
public void setCompactionThreshold(int compactionThreshold) {
if (compactionThreshold < 0) {
- throw new IllegalArgumentException(LocalizedStrings.DiskWriteAttributesImpl_0_HAS_TO_BE_POSITIVE_NUMBER_AND_THE_VALUE_GIVEN_1_IS_NOT_ACCEPTABLE.toLocalizedString(new Object[] {CacheXml.COMPACTION_THRESHOLD, Integer.valueOf(compactionThreshold)}));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DiskWriteAttributesImpl_0_HAS_TO_BE_POSITIVE_NUMBER_AND_THE_VALUE_GIVEN_1_IS_NOT_ACCEPTABLE
+ .toLocalizedString(new Object[] {CacheXml.COMPACTION_THRESHOLD,
+ Integer.valueOf(compactionThreshold)}));
} else if (compactionThreshold > 100) {
- throw new IllegalArgumentException(LocalizedStrings.DiskWriteAttributesImpl_0_HAS_TO_BE_LESS_THAN_2_BUT_WAS_1.toLocalizedString(new Object[] {CacheXml.COMPACTION_THRESHOLD, Integer.valueOf(compactionThreshold), Integer.valueOf(100)}));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DiskWriteAttributesImpl_0_HAS_TO_BE_LESS_THAN_2_BUT_WAS_1
+ .toLocalizedString(new Object[] {CacheXml.COMPACTION_THRESHOLD,
+ Integer.valueOf(compactionThreshold), Integer.valueOf(100)}));
}
- this.props.setProperty(CacheXml.COMPACTION_THRESHOLD,
- String.valueOf(compactionThreshold));
+ this.props.setProperty(CacheXml.COMPACTION_THRESHOLD, String.valueOf(compactionThreshold));
}
-
+
/**
- * Sets the maximum oplog size in bytes. When the active oplog size hits
- * the maximum a new oplog will be created.
- * <P>Note that this method sets the same attribute as {@link #setMaxOplogSize}.
- * The last set of the attribute determines its value.
+ * Sets the maximum oplog size in bytes. When the active oplog size hits the maximum a new oplog
+ * will be created.
+ * <P>
+ * Note that this method sets the same attribute as {@link #setMaxOplogSize}. The last set of the
+ * attribute determines its value.
+ *
* @param maxOplogSize the maximum size of the oplog in bytes.
- * @throws IllegalArgumentException
- * if the value specified is a negative number
+ * @throws IllegalArgumentException if the value specified is a negative number
* @deprecated as of 6.5 use {@link DiskStoreFactory#setMaxOplogSize} instead
*/
@Deprecated
- public void setMaxOplogSizeInBytes(long maxOplogSize)
- {
-
+ public void setMaxOplogSizeInBytes(long maxOplogSize) {
+
if (maxOplogSize < 0) {
- throw new IllegalArgumentException(LocalizedStrings.DiskWriteAttributesFactory_MAXIMUM_OPLOG_SIZE_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE.toLocalizedString(Long.valueOf(maxOplogSize)));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DiskWriteAttributesFactory_MAXIMUM_OPLOG_SIZE_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE
+ .toLocalizedString(Long.valueOf(maxOplogSize)));
}
- this.props.setProperty(CacheXml.MAX_OPLOG_SIZE,
- String.valueOf(maxOplogSize));
+ this.props.setProperty(CacheXml.MAX_OPLOG_SIZE, String.valueOf(maxOplogSize));
}
/**
- * Sets the maximum oplog size in megabytes. When the active oplog size hits
- * the maximum a new oplog will be created.
- * <P>Note that this method sets the same attribute as {@link #setMaxOplogSizeInBytes}.
- * The last set of the attribute determines its value.
+ * Sets the maximum oplog size in megabytes. When the active oplog size hits the maximum a new
+ * oplog will be created.
+ * <P>
+ * Note that this method sets the same attribute as {@link #setMaxOplogSizeInBytes}. The last set
+ * of the attribute determines its value.
+ *
* @param maxOplogSize the maximum size of the oplog in megabytes.
- * @throws IllegalArgumentException
- * if the value specified is a negative number
+ * @throws IllegalArgumentException if the value specified is a negative number
* @deprecated as of 6.5 use {@link DiskStoreFactory#setMaxOplogSize} instead
*/
@Deprecated
- public void setMaxOplogSize(int maxOplogSize)
- {
+ public void setMaxOplogSize(int maxOplogSize) {
if (maxOplogSize < 0) {
- throw new IllegalArgumentException(LocalizedStrings.DiskWriteAttributesFactory_MAXIMUM_OPLOG_SIZE_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE.toLocalizedString(Integer.valueOf(maxOplogSize)));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DiskWriteAttributesFactory_MAXIMUM_OPLOG_SIZE_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE
+ .toLocalizedString(Integer.valueOf(maxOplogSize)));
}
long maxOplogSizeInBytes = convertToBytes(maxOplogSize);
- this.props.setProperty(CacheXml.MAX_OPLOG_SIZE, String
- .valueOf(maxOplogSizeInBytes));
+ this.props.setProperty(CacheXml.MAX_OPLOG_SIZE, String.valueOf(maxOplogSizeInBytes));
}
/**
- * Takes an int which is supposed to be in megabytes
- * and converts it to a long. This conversion takes into
- * account that multiplication can lead to Integer.MAX_VALUE being
- * exceeded
+ * Takes an int which is supposed to be in megabytes and converts it to a long. This conversion
+ * takes into account that multiplication can lead to Integer.MAX_VALUE being exceeded
+ *
* @param megaBytes
* @return the converted value
*/
- private long convertToBytes(int megaBytes)
- {
+ private long convertToBytes(int megaBytes) {
long bytes = megaBytes;
bytes = bytes * 1024 * 1024;
return bytes;
}
-
+
/**
- * Sets the number of milliseconds that can elapse before unwritten data is
- * written to disk. It has significance only in case of asynchronous mode of
- * writing.
+ * Sets the number of milliseconds that can elapse before unwritten data is written to disk. It
+ * has significance only in case of asynchronous mode of writing.
*
- * @param timeInterval
- * Time interval in milliseconds
- * @throws IllegalArgumentException
- * if the value specified is a negative number
+ * @param timeInterval Time interval in milliseconds
+ * @throws IllegalArgumentException if the value specified is a negative number
* @deprecated as of 6.5 use {@link DiskStoreFactory#setTimeInterval} instead
*/
@Deprecated
- public void setTimeInterval(long timeInterval)
- {
+ public void setTimeInterval(long timeInterval) {
if (timeInterval < 0) {
- throw new IllegalArgumentException(LocalizedStrings.DiskWriteAttributesFactory_TIME_INTERVAL_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE.toLocalizedString(Long.valueOf(timeInterval)));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DiskWriteAttributesFactory_TIME_INTERVAL_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE
+ .toLocalizedString(Long.valueOf(timeInterval)));
}
- this.props.setProperty(CacheXml.TIME_INTERVAL,
- String.valueOf(timeInterval));
+ this.props.setProperty(CacheXml.TIME_INTERVAL, String.valueOf(timeInterval));
}
/**
- * Sets the number of unwritten bytes of data that can be enqueued before
- * being written to disk. It has significance only in case of asynchronous mode
- * of writing.
+ * Sets the number of unwritten bytes of data that can be enqueued before being written to disk.
+ * It has significance only in case of asynchronous mode of writing.
*
- * @param bytesThreshold the maximum number of bytes to enqueue before async data
- * is flushed.
- * @throws IllegalArgumentException
- * if the value specified is a negative number
+ * @param bytesThreshold the maximum number of bytes to enqueue before async data is flushed.
+ * @throws IllegalArgumentException if the value specified is a negative number
* @deprecated as of 6.5 use {@link DiskStoreFactory#setQueueSize} instead
*/
@Deprecated
- public void setBytesThreshold(long bytesThreshold)
- {
+ public void setBytesThreshold(long bytesThreshold) {
if (bytesThreshold < 0) {
- throw new IllegalArgumentException(LocalizedStrings.DiskWriteAttributesFactory_QUEUE_SIZE_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE.toLocalizedString(Long.valueOf(bytesThreshold)));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DiskWriteAttributesFactory_QUEUE_SIZE_SPECIFIED_HAS_TO_BE_A_NONNEGATIVE_NUMBER_AND_THE_VALUE_GIVEN_0_IS_NOT_ACCEPTABLE
+ .toLocalizedString(Long.valueOf(bytesThreshold)));
}
- this.props.setProperty(CacheXml.BYTES_THRESHOLD,
- String.valueOf(bytesThreshold));
+ this.props.setProperty(CacheXml.BYTES_THRESHOLD, String.valueOf(bytesThreshold));
}
/**
* Creates a <code>DiskWriteAttributes</code> with the current settings.
*
* @return the newly created <code>DiskWriteAttributes</code>
- * @throws IllegalStateException
- * if the current settings has compaction enabled with maximum Oplog
- * Size specified as infinite ( represented by 0 ) *
+ * @throws IllegalStateException if the current settings has compaction enabled with maximum Oplog
+ * Size specified as infinite ( represented by 0 ) *
* @since GemFire 5.1
* @deprecated as of 6.5 use {@link DiskStoreFactory#create} instead
*/
@Deprecated
- public DiskWriteAttributes create()
- {
+ public DiskWriteAttributes create() {
return new DiskWriteAttributesImpl(this.props);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DuplicatePrimaryPartitionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DuplicatePrimaryPartitionException.java b/geode-core/src/main/java/org/apache/geode/cache/DuplicatePrimaryPartitionException.java
index 74a1753..9da6b04 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DuplicatePrimaryPartitionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DuplicatePrimaryPartitionException.java
@@ -1,26 +1,23 @@
/*
- * 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
+ * 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;
import org.apache.geode.GemFireException;
/**
- * This exception is thrown when two nodes are defined with same primary
- * partitions
+ * This exception is thrown when two nodes are defined with same primary partitions
*
* @since GemFire 6.6
*/
@@ -29,8 +26,7 @@ public class DuplicatePrimaryPartitionException extends GemFireException {
private static final long serialVersionUID = 1L;
/**
- * Creates a new <code>DuplicatePrimaryPartitionException</code> with no
- * detailed message.
+ * Creates a new <code>DuplicatePrimaryPartitionException</code> with no detailed message.
*/
public DuplicatePrimaryPartitionException() {
@@ -38,24 +34,23 @@ public class DuplicatePrimaryPartitionException extends GemFireException {
}
/**
- * Creates a new <code>DuplicatePrimaryPartitionException</code> with the
- * given detail message.
+ * Creates a new <code>DuplicatePrimaryPartitionException</code> with the given detail message.
*/
public DuplicatePrimaryPartitionException(String message) {
super(message);
}
/**
- * Creates a new <code>DuplicatePrimaryPartitionException</code> with the
- * given cause and no detail message
+ * Creates a new <code>DuplicatePrimaryPartitionException</code> with the given cause and no
+ * detail message
*/
public DuplicatePrimaryPartitionException(Throwable cause) {
super(cause);
}
/**
- * Creates a new <code>DuplicatePrimaryPartitionException</code> with the
- * given detail message and cause.
+ * Creates a new <code>DuplicatePrimaryPartitionException</code> with the given detail message and
+ * cause.
*/
public DuplicatePrimaryPartitionException(String message, Throwable cause) {
super(message, cause);
[35/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
index f0eb160..e4f9a41 100644
--- a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
+++ b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
@@ -1,32 +1,29 @@
/*
- * 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
+ * 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;
/**
* Abstract cancellation proxy for cancelling an operation, esp. a thread.
*
- * Creators of services or threads should implement a subclass of CancelCriterion,
- * and implement the two methods - cancelInProgress, and generateCancelledException(e).
+ * Creators of services or threads should implement a subclass of CancelCriterion, and implement the
+ * two methods - cancelInProgress, and generateCancelledException(e).
*
* Code inside the service can check to see if the service is cancelled by calling
- * {@link #checkCancelInProgress(Throwable)}. Generally the pattern is to check
- * before performing an operation, check if the service is canceled before propgrating
- * an exception futher up the stack, and check for cancelation inside a long loop.
- * Eg.
+ * {@link #checkCancelInProgress(Throwable)}. Generally the pattern is to check before performing an
+ * operation, check if the service is canceled before propgrating an exception futher up the stack,
+ * and check for cancelation inside a long loop. Eg.
*
* <code>
* while(true) {
@@ -43,25 +40,25 @@ package org.apache.geode;
* @see CancelException
* @since GemFire 5.1
*/
-public abstract class CancelCriterion
-{
-
+public abstract class CancelCriterion {
+
/**
- * Indicate if the service is in the progress of being cancelled. The
- * typical use of this is to indicate, in the case of an {@link InterruptedException},
- * that the current operation should be cancelled.
- * @return null if the service is not shutting down, or a message that can be used to
- * construct an exception indicating the service is shut down.
+ * Indicate if the service is in the progress of being cancelled. The typical use of this is to
+ * indicate, in the case of an {@link InterruptedException}, that the current operation should be
+ * cancelled.
+ *
+ * @return null if the service is not shutting down, or a message that can be used to construct an
+ * exception indicating the service is shut down.
*/
public abstract String cancelInProgress();
-//import org.apache.geode.distributed.internal.DistributionManager;
-// * <p>
-// * In particular, a {@link DistributionManager} returns a non-null result if
-// * message distribution has been terminated.
-
+ // import org.apache.geode.distributed.internal.DistributionManager;
+ // * <p>
+ // * In particular, a {@link DistributionManager} returns a non-null result if
+ // * message distribution has been terminated.
+
/**
- * Use this utility function in your implementation of cancelInProgress()
- * and cancelled() to indicate a system failure
+ * Use this utility function in your implementation of cancelInProgress() and cancelled() to
+ * indicate a system failure
*
* @return failure string if system failure has occurred
*/
@@ -75,11 +72,10 @@ public abstract class CancelCriterion
}
/**
- * See if the current operation is being cancelled. If so, it either
- * throws a {@link RuntimeException} (usually a {@link CancelException}).
+ * See if the current operation is being cancelled. If so, it either throws a
+ * {@link RuntimeException} (usually a {@link CancelException}).
*
- * @param e an underlying exception or null if there is no exception
- * that triggered this check
+ * @param e an underlying exception or null if there is no exception that triggered this check
* @see #cancelInProgress()
*/
public final void checkCancelInProgress(Throwable e) {
@@ -93,23 +89,21 @@ public abstract class CancelCriterion
/**
* Template factory method for generating the exception to be thrown by
- * {@link #checkCancelInProgress(Throwable)}. Override this to specify
- * different exception for checkCancelInProgress() to throw.
+ * {@link #checkCancelInProgress(Throwable)}. Override this to specify different exception for
+ * checkCancelInProgress() to throw.
*
- * This method should wrap the exception in a service specific
- * CancelationException (eg CacheClosedException).
- * or return null if the service is not being canceled.
+ * This method should wrap the exception in a service specific CancelationException (eg
+ * CacheClosedException). or return null if the service is not being canceled.
*
- * @param e
- * an underlying exception, if any
- * @return RuntimeException to be thrown by checkCancelInProgress(), null if
- * the receiver has not been cancelled.
+ * @param e an underlying exception, if any
+ * @return RuntimeException to be thrown by checkCancelInProgress(), null if the receiver has not
+ * been cancelled.
*/
abstract public RuntimeException generateCancelledException(Throwable e);
/**
- * Checks to see if a cancellation is in progress. This is equivalent to
- * the expression (cancelInProgress() != null).
+ * Checks to see if a cancellation is in progress. This is equivalent to the expression
+ * (cancelInProgress() != null).
*
* @return true if a cancellation is in progress, false if not
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/CancelException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CancelException.java b/geode-core/src/main/java/org/apache/geode/CancelException.java
index 422036a..49413f2 100644
--- a/geode-core/src/main/java/org/apache/geode/CancelException.java
+++ b/geode-core/src/main/java/org/apache/geode/CancelException.java
@@ -1,18 +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
+ * 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.
*/
/**
*
@@ -22,8 +20,7 @@ package org.apache.geode;
import org.apache.geode.cache.CacheRuntimeException;
/**
- * Abstract root class of all GemFire exceptions representing system
- * cancellation
+ * Abstract root class of all GemFire exceptions representing system cancellation
*
* @since GemFire 6.0
*/
@@ -33,11 +30,11 @@ public abstract class CancelException extends CacheRuntimeException {
/**
* for serialization
*/
- public CancelException() {
- }
+ public CancelException() {}
/**
* Create instance with given message
+ *
* @param message the message
*/
public CancelException(String message) {
@@ -46,6 +43,7 @@ public abstract class CancelException extends CacheRuntimeException {
/**
* Create instance with given message and cause
+ *
* @param message the message
* @param cause the cause
*/
@@ -55,6 +53,7 @@ public abstract class CancelException extends CacheRuntimeException {
/**
* Create instance with empty message and given cause
+ *
* @param cause the cause
*/
public CancelException(Throwable cause) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
index d62d873..10e6f16 100644
--- a/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/CanonicalInstantiator.java
@@ -1,69 +1,55 @@
/*
- * 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
+ * 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;
import java.io.*;
/**
- * <code>CanonicalInstantiator</code> is much like its parent
- * <code>Instantiator</code> except that instead of
- * needing to implement <code>newInstance()</code>
- * you now must implement <code>newInstance(DataInput)</code>.
- * The addition of the <code>DataInput</code> parameter allows the instance
- * creator to optionally read data from the data input stream and use it to
- * decide the instance to create. This allows a value that represents a
- * canonical instance to be written by a class's {@link DataSerializer#toData}
- * and then be read by <code>newInstance(DataInput)</code>
- * and map it back to a canonical instance.
+ * <code>CanonicalInstantiator</code> is much like its parent <code>Instantiator</code> except that
+ * instead of needing to implement <code>newInstance()</code> you now must implement
+ * <code>newInstance(DataInput)</code>. The addition of the <code>DataInput</code> parameter allows
+ * the instance creator to optionally read data from the data input stream and use it to decide the
+ * instance to create. This allows a value that represents a canonical instance to be written by a
+ * class's {@link DataSerializer#toData} and then be read by <code>newInstance(DataInput)</code> and
+ * map it back to a canonical instance.
* <p>
- * Note that {@link DataSerializer#fromData} is always called on the instance
- * returned from <code>newInstance(DataInput)</code>.
+ * Note that {@link DataSerializer#fromData} is always called on the instance returned from
+ * <code>newInstance(DataInput)</code>.
*
* @since GemFire 5.1
*/
public abstract class CanonicalInstantiator extends Instantiator {
/**
- * Creates a new <code>CanonicalInstantiator</code> that instantiates a given
- * class.
+ * Creates a new <code>CanonicalInstantiator</code> that instantiates a given class.
*
- * @param c
- * The <code>DataSerializable</code> class to register. This
- * class must have a static initializer that registers this
- * <code>Instantiator</code>.
- * @param classId
- * A unique id for class <code>c</code>. The
- * <code>classId</code> must not be zero.
+ * @param c The <code>DataSerializable</code> class to register. This class must have a static
+ * initializer that registers this <code>Instantiator</code>.
+ * @param classId A unique id for class <code>c</code>. The <code>classId</code> must not be zero.
* This has been an <code>int</code> since dsPhase1.
*
- * @throws IllegalArgumentException
- * If <code>c</code> does not implement
- * <code>DataSerializable</code>, <code>classId</code> is
- * less than or equal to zero.
- * @throws NullPointerException
- * If <code>c</code> is <code>null</code>
+ * @throws IllegalArgumentException If <code>c</code> does not implement
+ * <code>DataSerializable</code>, <code>classId</code> is less than or equal to zero.
+ * @throws NullPointerException If <code>c</code> is <code>null</code>
*/
public CanonicalInstantiator(Class<? extends DataSerializable> c, int classId) {
super(c, classId);
}
-
+
/**
- * This method is not supported and if called will
- * throw UnsupportedOperationException.
- * Use {@link #newInstance(DataInput)} instead.
+ * This method is not supported and if called will throw UnsupportedOperationException. Use
+ * {@link #newInstance(DataInput)} instead.
*
* @throws UnsupportedOperationException in all cases
*/
@@ -71,15 +57,15 @@ public abstract class CanonicalInstantiator extends Instantiator {
public final DataSerializable newInstance() {
throw new UnsupportedOperationException();
}
+
/**
- * Creates a new "empty" instance of a <Code>DataSerializable</code>
- * class whose state will be filled in by invoking its
- * {@link DataSerializable#fromData fromData} method.
+ * Creates a new "empty" instance of a <Code>DataSerializable</code> class whose state will be
+ * filled in by invoking its {@link DataSerializable#fromData fromData} method.
+ *
* @param in the data input that can be read to decide what instance to create.
* @return the new "empty" instance.
* @throws IOException if a read from <code>in</code> fails.
* @since GemFire 5.1
*/
- public abstract DataSerializable newInstance(DataInput in)
- throws IOException;
+ public abstract DataSerializable newInstance(DataInput in) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/CopyException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CopyException.java b/geode-core/src/main/java/org/apache/geode/CopyException.java
index 8ad9c57..00ad5da 100644
--- a/geode-core/src/main/java/org/apache/geode/CopyException.java
+++ b/geode-core/src/main/java/org/apache/geode/CopyException.java
@@ -1,18 +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
+ * 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;
@@ -25,15 +23,15 @@ package org.apache.geode;
* @since GemFire 4.0
*/
public class CopyException extends GemFireException {
-private static final long serialVersionUID = -1143711608610323585L;
-
+ private static final long serialVersionUID = -1143711608610323585L;
+
/**
* Constructs a new <code>CopyException</code>.
*/
public CopyException() {
super();
}
-
+
/**
* Constructs a new <code>CopyException</code> with a message string.
*
@@ -42,10 +40,9 @@ private static final long serialVersionUID = -1143711608610323585L;
public CopyException(String msg) {
super(msg);
}
-
+
/**
- * Constructs a new <code>CopyException</code> with a message string
- * and a cause.
+ * Constructs a new <code>CopyException</code> with a message string and a cause.
*
* @param msg the message string
* @param cause a causal Throwable
@@ -53,7 +50,7 @@ private static final long serialVersionUID = -1143711608610323585L;
public CopyException(String msg, Throwable cause) {
super(msg, cause);
}
-
+
/**
* Constructs a new <code>CopyException</code> with a cause.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/CopyHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/CopyHelper.java b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
index dd79c0e..86592c0 100644
--- a/geode-core/src/main/java/org/apache/geode/CopyHelper.java
+++ b/geode-core/src/main/java/org/apache/geode/CopyHelper.java
@@ -1,20 +1,19 @@
/*
- * 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
+ * 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;
+
import java.io.DataInputStream;
import java.io.IOException;
import java.io.Serializable;
@@ -35,19 +34,19 @@ import org.apache.geode.pdx.WritablePdxInstance;
import org.apache.geode.pdx.internal.PdxUnreadData;
/**
- * A static helper for optimally creating copies. Creating copies
- * of cache values provides improved concurrency as well as isolation.
- * For transactions, creating a copy is the guaranteed way to enforce
- * "Read Committed" isolation on changes to cache
- * <code>Entries</code>.
-
- * <p>Here is a simple example of how to use <code>CopyHelper.copy</code>
- * <pre>
- * Object o = r.get("stringBuf");
- * StringBuffer s = (StringBuffer) CopyHelper.copy(o);
- * s.append("... and they lived happily ever after. The End.");
- * r.put("stringBuf", s);
- * </pre>
+ * A static helper for optimally creating copies. Creating copies of cache values provides improved
+ * concurrency as well as isolation. For transactions, creating a copy is the guaranteed way to
+ * enforce "Read Committed" isolation on changes to cache <code>Entries</code>.
+ *
+ * <p>
+ * Here is a simple example of how to use <code>CopyHelper.copy</code>
+ *
+ * <pre>
+ * Object o = r.get("stringBuf");
+ * StringBuffer s = (StringBuffer) CopyHelper.copy(o);
+ * s.append("... and they lived happily ever after. The End.");
+ * r.put("stringBuf", s);
+ * </pre>
*
* @see Cloneable
* @see Serializable
@@ -61,13 +60,11 @@ import org.apache.geode.pdx.internal.PdxUnreadData;
public final class CopyHelper {
// no instances allowed
- private CopyHelper() {
- }
+ private CopyHelper() {}
/**
- * Return true if the given object is an instance of a well known
- * immutable class.
- * The well known classes are:
+ * Return true if the given object is an instance of a well known immutable class. The well known
+ * classes are:
* <ul>
* <li>String
* <li>Byte
@@ -82,6 +79,7 @@ public final class CopyHelper {
* <li>UUID
* <li>PdxInstance but not WritablePdxInstance
* </ul>
+ *
* @param o the object to check
* @return true if o is an instance of a well known immutable class.
* @since GemFire 6.6.2
@@ -91,48 +89,62 @@ public final class CopyHelper {
return true;
}
if (o instanceof Number) {
- if (o instanceof Integer) return true;
- if (o instanceof Long) return true;
- if (o instanceof Byte) return true;
- if (o instanceof Short) return true;
- if (o instanceof Float) return true;
- if (o instanceof Double) return true;
+ if (o instanceof Integer)
+ return true;
+ if (o instanceof Long)
+ return true;
+ if (o instanceof Byte)
+ return true;
+ if (o instanceof Short)
+ return true;
+ if (o instanceof Float)
+ return true;
+ if (o instanceof Double)
+ return true;
// subclasses of non-final classes may be mutable
- if (o.getClass().equals(BigInteger.class)) return true;
- if (o.getClass().equals(BigDecimal.class)) return true;
+ if (o.getClass().equals(BigInteger.class))
+ return true;
+ if (o.getClass().equals(BigDecimal.class))
+ return true;
}
if (o instanceof PdxInstance && !(o instanceof WritablePdxInstance)) {
// no need to copy since it is immutable
return true;
}
- if (o instanceof Character) return true;
- if (o instanceof UUID) return true;
+ if (o instanceof Character)
+ return true;
+ if (o instanceof UUID)
+ return true;
return false;
}
+
/**
- * <p>Makes a copy of the specified object. The object returned is not guaranteed
- * to be a deep copy of the original object, as explained below.
+ * <p>
+ * Makes a copy of the specified object. The object returned is not guaranteed to be a deep copy
+ * of the original object, as explained below.
*
- * <p>Copies can only be made if the original is a <tt>Cloneable</tt> or serializable by
- * GemFire.
- * If o is a {@link #isWellKnownImmutableInstance(Object) well known immutable instance}
- * then it will be returned without copying it.
+ * <p>
+ * Copies can only be made if the original is a <tt>Cloneable</tt> or serializable by GemFire. If
+ * o is a {@link #isWellKnownImmutableInstance(Object) well known immutable instance} then it will
+ * be returned without copying it.
*
- * <p>If the argument o is an instance of {@link java.lang.Cloneable}, a copy is
- * made by invoking <tt>clone</tt> on it. Note that not all implementations of <tt>clone</tt>
- * make deep copies (e.g. {@link java.util.HashMap#clone HashMap.clone}). Otherwise, if the
- * argument is not an instance of <tt>Cloneable</tt>, a copy is made using serialization: if
- * GemFire serialization is implemented, it is used; otherwise, java serialization is used.
+ * <p>
+ * If the argument o is an instance of {@link java.lang.Cloneable}, a copy is made by invoking
+ * <tt>clone</tt> on it. Note that not all implementations of <tt>clone</tt> make deep copies
+ * (e.g. {@link java.util.HashMap#clone HashMap.clone}). Otherwise, if the argument is not an
+ * instance of <tt>Cloneable</tt>, a copy is made using serialization: if GemFire serialization is
+ * implemented, it is used; otherwise, java serialization is used.
*
- * <p> The difference between this method and {@link #deepCopy(Object) deepCopy}, is that
- * this method uses <tt>clone</tt> if available, whereas <tt>deepCopy</tt> does not. As a
- * result, for <tt>Cloneable</tt> objects copied using this method, how deep a copy the
- * returned object is depends on its implementation of <tt>clone</tt>.
+ * <p>
+ * The difference between this method and {@link #deepCopy(Object) deepCopy}, is that this method
+ * uses <tt>clone</tt> if available, whereas <tt>deepCopy</tt> does not. As a result, for
+ * <tt>Cloneable</tt> objects copied using this method, how deep a copy the returned object is
+ * depends on its implementation of <tt>clone</tt>.
*
* @param o the original object that a copy is needed of
* @return the new instance that is a copy of of the original
- * @throws CopyException if copying fails because a class could not
- * be found or could not be serialized.
+ * @throws CopyException if copying fails because a class could not be found or could not be
+ * serialized.
* @see #deepCopy(Object)
* @since GemFire 4.0
*/
@@ -145,7 +157,8 @@ public final class CopyHelper {
} else if (o instanceof Token) {
return o;
} else {
- if (isWellKnownImmutableInstance(o)) return o;
+ if (isWellKnownImmutableInstance(o))
+ return o;
if (o instanceof Cloneable) {
try {
// Note that Object.clone is protected so we need to use reflection
@@ -158,7 +171,7 @@ public final class CopyHelper {
// because Object.clone is protected.
Method m = c.getDeclaredMethod("clone", new Class[0]);
m.setAccessible(true);
- copy = (T)m.invoke(o, new Object[0]);
+ copy = (T) m.invoke(o, new Object[0]);
return copy;
} catch (NoSuchMethodException ignore) {
// try using Serialization
@@ -171,7 +184,8 @@ public final class CopyHelper {
if (cause instanceof CloneNotSupportedException) {
// try using Serialization
} else {
- throw new CopyException(LocalizedStrings.CopyHelper_CLONE_FAILED.toLocalizedString(), cause != null ? cause : ex);
+ throw new CopyException(LocalizedStrings.CopyHelper_CLONE_FAILED.toLocalizedString(),
+ cause != null ? cause : ex);
}
}
} else if (o instanceof CachedDeserializable) {
@@ -179,28 +193,28 @@ public final class CopyHelper {
return copy;
} else if (o.getClass().isArray() && o.getClass().getComponentType().isPrimitive()) {
if (o instanceof byte[]) {
- byte[] a = (byte[])o;
+ byte[] a = (byte[]) o;
copy = (T) Arrays.copyOf(a, a.length);
} else if (o instanceof boolean[]) {
- boolean[] a = (boolean[])o;
+ boolean[] a = (boolean[]) o;
copy = (T) Arrays.copyOf(a, a.length);
} else if (o instanceof char[]) {
- char[] a = (char[])o;
+ char[] a = (char[]) o;
copy = (T) Arrays.copyOf(a, a.length);
} else if (o instanceof int[]) {
- int[] a = (int[])o;
+ int[] a = (int[]) o;
copy = (T) Arrays.copyOf(a, a.length);
} else if (o instanceof long[]) {
- long[] a = (long[])o;
+ long[] a = (long[]) o;
copy = (T) Arrays.copyOf(a, a.length);
} else if (o instanceof short[]) {
- short[] a = (short[])o;
+ short[] a = (short[]) o;
copy = (T) Arrays.copyOf(a, a.length);
} else if (o instanceof float[]) {
- float[] a = (float[])o;
+ float[] a = (float[]) o;
copy = (T) Arrays.copyOf(a, a.length);
} else if (o instanceof double[]) {
- double[] a = (double[])o;
+ double[] a = (double[]) o;
copy = (T) Arrays.copyOf(a, a.length);
}
return copy;
@@ -217,20 +231,22 @@ public final class CopyHelper {
}
/**
- * Makes a deep copy of the specified object o using serialization, so the object
- * has to be serializable by GemFire.
+ * Makes a deep copy of the specified object o using serialization, so the object has to be
+ * serializable by GemFire.
*
- * <p>If o is a {@link #isWellKnownImmutableInstance(Object) well known immutable
- * instance} then it will be returned without copying it.
+ * <p>
+ * If o is a {@link #isWellKnownImmutableInstance(Object) well known immutable instance} then it
+ * will be returned without copying it.
*
- * <p>The passed in object is serialized in memory, and then deserialized into
- * a new instance, which is returned. If GemFire serialization is implemented
- * for the object, it is used; otherwise, java serialization is used.
+ * <p>
+ * The passed in object is serialized in memory, and then deserialized into a new instance, which
+ * is returned. If GemFire serialization is implemented for the object, it is used; otherwise,
+ * java serialization is used.
*
* @param o the original object to be copied
* @return the new instance that is a copy of the original
- * @throws CopyException if copying fails because a class could not
- * be found or could not be serialized
+ * @throws CopyException if copying fails because a class could not be found or could not be
+ * serialized
* @see #copy(Object)
*/
public static <T> T deepCopy(T o) {
@@ -252,15 +268,19 @@ public final class CopyHelper {
}
@SuppressWarnings("unchecked")
- private static<T> T doDeepCopy(T o) {
+ private static <T> T doDeepCopy(T o) {
try {
HeapDataOutputStream hdos = new HeapDataOutputStream(Version.CURRENT);
DataSerializer.writeObject(o, hdos);
- return (T)DataSerializer.readObject(new DataInputStream(hdos.getInputStream()));
+ return (T) DataSerializer.readObject(new DataInputStream(hdos.getInputStream()));
} catch (ClassNotFoundException ex) {
- throw new CopyException(LocalizedStrings.CopyHelper_COPY_FAILED_ON_INSTANCE_OF_0.toLocalizedString(o.getClass()), ex);
+ throw new CopyException(
+ LocalizedStrings.CopyHelper_COPY_FAILED_ON_INSTANCE_OF_0.toLocalizedString(o.getClass()),
+ ex);
} catch (IOException ex) {
- throw new CopyException(LocalizedStrings.CopyHelper_COPY_FAILED_ON_INSTANCE_OF_0.toLocalizedString(o.getClass()), ex);
+ throw new CopyException(
+ LocalizedStrings.CopyHelper_COPY_FAILED_ON_INSTANCE_OF_0.toLocalizedString(o.getClass()),
+ ex);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/DataSerializable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializable.java b/geode-core/src/main/java/org/apache/geode/DataSerializable.java
index d7c60a5..4c35c31 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializable.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializable.java
@@ -1,137 +1,114 @@
/*
- * 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
+ * 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;
import java.io.*;
/**
- * An interface for objects whose state can be written/read as
- * primitive types and strings ("data"). That is, instead of
- * serializing itself to an {@link java.io.ObjectOutputStream}, a
- * <code>DataSerializable</code> can serialize itself to a {@link
- * DataOutput}. By implementing this interface, objects can be
- * serialized faster and in a more compact format than standard Java
- * serialization. The {@link DataSerializer} class contains a number
- * of static methods that may be helpful to implementations of
- * <code>DataSerializable</code>.
+ * An interface for objects whose state can be written/read as primitive types and strings ("data").
+ * That is, instead of serializing itself to an {@link java.io.ObjectOutputStream}, a
+ * <code>DataSerializable</code> can serialize itself to a {@link DataOutput}. By implementing this
+ * interface, objects can be serialized faster and in a more compact format than standard Java
+ * serialization. The {@link DataSerializer} class contains a number of static methods that may be
+ * helpful to implementations of <code>DataSerializable</code>.
*
* <P>
*
- * When possible, GemFire respects the <code>DataSerializable</code>
- * contract to provide optimal object serialization. For instance, if
- * a <code>DataSerializable</code> object is
- * {@linkplain org.apache.geode.cache.Region#put(Object, Object) placed} into a distributed
- * cache region, its <code>toData</code> method will be used to
- * serialize it when it is sent to another member of the distributed
- * system.
+ * When possible, GemFire respects the <code>DataSerializable</code> contract to provide optimal
+ * object serialization. For instance, if a <code>DataSerializable</code> object is
+ * {@linkplain org.apache.geode.cache.Region#put(Object, Object) placed} into a distributed cache
+ * region, its <code>toData</code> method will be used to serialize it when it is sent to another
+ * member of the distributed system.
*
* <P>
*
- * To avoid the overhead of Java reflection,
- * <code>DataSerializable</code> classes may register an {@link
- * Instantiator} to be used during deserialization. Alternatively,
- * classes that implement <code>DataSerializable</code> can provide a
- * zero-argument constructor that will be invoked when they are read
- * with {@link DataSerializer#readObject}.
+ * To avoid the overhead of Java reflection, <code>DataSerializable</code> classes may register an
+ * {@link Instantiator} to be used during deserialization. Alternatively, classes that implement
+ * <code>DataSerializable</code> can provide a zero-argument constructor that will be invoked when
+ * they are read with {@link DataSerializer#readObject}.
*
* <P>
*
- * Some classes (especially third-party classes that you may not have
- * the source code to) cannot be modified to implement
- * <code>DataSerializable</code>. These classes can be data
- * serialized by an instance of {@link DataSerializer}.
+ * Some classes (especially third-party classes that you may not have the source code to) cannot be
+ * modified to implement <code>DataSerializable</code>. These classes can be data serialized by an
+ * instance of {@link DataSerializer}.
*
* <P>
*
- * <code>DataSerializable</code> offers improved performance over
- * standard Java serialization, but does not offer all of the features
- * of standard Java serialization. In particular, data serialization
- * does not attempt to maintain referential integrity among the
- * objects it is writing or reading. As a result, data serialization
- * should not be used with complex object graphs. Attempting to data
- * serialize graphs that contain object cycles will result in infinite
- * recursion and a {@link StackOverflowError}. Attempting to
- * deserialize an object graph that contains multiple reference
- * paths to the same object will result in multiple copies of the
- * objects that are referred to through multiple paths.
+ * <code>DataSerializable</code> offers improved performance over standard Java serialization, but
+ * does not offer all of the features of standard Java serialization. In particular, data
+ * serialization does not attempt to maintain referential integrity among the objects it is writing
+ * or reading. As a result, data serialization should not be used with complex object graphs.
+ * Attempting to data serialize graphs that contain object cycles will result in infinite recursion
+ * and a {@link StackOverflowError}. Attempting to deserialize an object graph that contains
+ * multiple reference paths to the same object will result in multiple copies of the objects that
+ * are referred to through multiple paths.
*
* <P>
*
* <CENTER>
- * <IMG src="{@docRoot}/javadoc-images/data-serialization-exceptions.gif"
- * HEIGHT="219" WIDTH="698">
+ * <IMG src="{@docRoot}/javadoc-images/data-serialization-exceptions.gif" HEIGHT="219" WIDTH="698">
* </CENTER>
*
* @see java.io.Serializable
* @see DataSerializer
* @see Instantiator
*
- * @since GemFire 3.5 */
+ * @since GemFire 3.5
+ */
public interface DataSerializable extends Serializable {
/**
- * Writes the state of this object as primitive data to the given
- * <code>DataOutput</code>.
+ * Writes the state of this object as primitive data to the given <code>DataOutput</code>.
* <p>
- * Since 5.7 it is possible for any method call to the specified
- * <code>DataOutput</code> to throw {@link GemFireRethrowable}.
- * It should <em>not</em> be caught by user code.
- * If it is it <em>must</em> be rethrown.
+ * Since 5.7 it is possible for any method call to the specified <code>DataOutput</code> to throw
+ * {@link GemFireRethrowable}. It should <em>not</em> be caught by user code. If it is it
+ * <em>must</em> be rethrown.
*
- * @throws IOException
- * A problem occurs while writing to <code>out</code>
+ * @throws IOException A problem occurs while writing to <code>out</code>
*/
public void toData(DataOutput out) throws IOException;
/**
- * Reads the state of this object as primitive data from the given
- * <code>DataInput</code>.
+ * Reads the state of this object as primitive data from the given <code>DataInput</code>.
*
- * @throws IOException
- * A problem occurs while reading from <code>in</code>
- * @throws ClassNotFoundException
- * A class could not be loaded while reading from
- * <code>in</code>
+ * @throws IOException A problem occurs while reading from <code>in</code>
+ * @throws ClassNotFoundException A class could not be loaded while reading from <code>in</code>
*/
- public void fromData(DataInput in)
- throws IOException, ClassNotFoundException;
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException;
- //////////////////////// Inner Classes ////////////////////////
+ //////////////////////// Inner Classes ////////////////////////
/**
- * <code>Replaceable</code> allows an object to write an alternative
- * version of itself to a <code>DataOutput</code>. It is similar to
- * the <code>writeReplace</code> method of standard Java
- * {@linkplain java.io.Serializable serialization}.
+ * <code>Replaceable</code> allows an object to write an alternative version of itself to a
+ * <code>DataOutput</code>. It is similar to the <code>writeReplace</code> method of standard Java
+ * {@linkplain java.io.Serializable serialization}.
*
* <P>
*
- * Note that if a <code>Replaceable</code> is also
- * <code>DataSerializable</code>, its <code>toData</code> method
- * will <B>not</B> be invoked. Instead, its replacement object will
- * be written to the stream using {@link DataSerializer#writeObject(Object, DataOutput)}.
+ * Note that if a <code>Replaceable</code> is also <code>DataSerializable</code>, its
+ * <code>toData</code> method will <B>not</B> be invoked. Instead, its replacement object will be
+ * written to the stream using {@link DataSerializer#writeObject(Object, DataOutput)}.
*
* @see DataSerializer#writeObject(Object, DataOutput)
*/
public interface Replaceable {
/**
- * Replaces this object with another in the "output stream"
- * written by {@link DataSerializer#writeObject(Object, DataOutput)}.
+ * Replaces this object with another in the "output stream" written by
+ * {@link DataSerializer#writeObject(Object, DataOutput)}.
*/
public Object replace() throws IOException;
}
[31/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java b/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
index 4fe13ee..8056b73 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
@@ -1,49 +1,43 @@
/*
- * 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
+ * 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;
-//import org.apache.geode.distributed.DistributedSystem;
-//import org.apache.geode.internal.statistics.StatArchiveFormat;
-//import java.io.IOException;
-//import java.io.Reader;
+// import org.apache.geode.distributed.DistributedSystem;
+// import org.apache.geode.internal.statistics.StatArchiveFormat;
+// import java.io.IOException;
+// import java.io.Reader;
/**
- * Instances of this interface provide methods that create instances
- * of {@link Statistics}.
- * It can also be used to create instances of {@link StatisticDescriptor}
- * and {@link StatisticsType} because it implements {@link StatisticsTypeFactory}.
- * {@link
- * org.apache.geode.distributed.DistributedSystem} is the only
- * instance of this interface.
+ * Instances of this interface provide methods that create instances of {@link Statistics}. It can
+ * also be used to create instances of {@link StatisticDescriptor} and {@link StatisticsType}
+ * because it implements {@link StatisticsTypeFactory}.
+ * {@link org.apache.geode.distributed.DistributedSystem} is the only instance of this interface.
*
* <P>
*
- * A <code>StatisticsFactory</code> can create a {@link
- * StatisticDescriptor statistic} of three numeric types:
- * <code>int</code>, <code>long</code>, and <code>double</code>. A
- * statistic (<code>StatisticDescriptor</code>) can either be a
- * <I>gauge</I> meaning that its value can increase and decrease or a
- * <I>counter</I> meaning that its value is strictly increasing.
- * Marking a statistic as a counter allows statistic display tools
- * to properly display a statistics whose value "wraps around" (that
- * is, exceeds its maximum value).
+ * A <code>StatisticsFactory</code> can create a {@link StatisticDescriptor statistic} of three
+ * numeric types: <code>int</code>, <code>long</code>, and <code>double</code>. A statistic
+ * (<code>StatisticDescriptor</code>) can either be a <I>gauge</I> meaning that its value can
+ * increase and decrease or a <I>counter</I> meaning that its value is strictly increasing. Marking
+ * a statistic as a counter allows statistic display tools to properly display a statistics whose
+ * value "wraps around" (that is, exceeds its maximum value).
+ *
+ * <P>
+ * The following code is an example of how to create a type using the api. In this example the type
+ * has two stats whose values always increase:
*
- * <P>The following code is an example of how to create a type using the api.
- * In this example the type has two stats whose values always increase:
* <pre>
StatisticsFactory f = ...;
StatisticsType t = f.createType(
@@ -62,13 +56,16 @@ package org.apache.geode;
this.sampleCountId = this.samplerStats.nameToId("sampleCount");
this.sampleTimeId = this.samplerStats.nameToId("sampleTime");
* </pre>
+ *
* Later on the stat ids can be used to increment the stats:
+ *
* <pre>
- this.samplerStats.incInt(this.sampleCountId, 1);
- this.samplerStats.incLong(this.sampleTimeId, nanosSpentWorking / 1000000);
+ * this.samplerStats.incInt(this.sampleCountId, 1);
+ * this.samplerStats.incLong(this.sampleTimeId, nanosSpentWorking / 1000000);
* </pre>
- * <P>The following is an example of how to create the same type using XML.
- * The XML data:
+ * <P>
+ * The following is an example of how to create the same type using XML. The XML data:
+ *
* <pre>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE statistics PUBLIC
@@ -88,13 +85,16 @@ package org.apache.geode;
</type>
</statistics>
* </pre>
+ *
* The code to create the type:
+ *
* <pre>
StatisticsFactory f = ...;
Reader r = new InputStreamReader("fileContainingXmlData"));
StatisticsType type = f.createTypesFromXml(r)[0];
* </pre>
* <P>
+ *
* @see <A href="package-summary.html#statistics">Package introduction</A>
*
*
@@ -102,50 +102,63 @@ package org.apache.geode;
*/
public interface StatisticsFactory extends StatisticsTypeFactory {
/**
- * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type} with default ids.
+ * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type} with
+ * default ids.
* <p>
* The created instance may not be {@link Statistics#isAtomic atomic}.
*/
public Statistics createStatistics(StatisticsType type);
+
/**
- * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type}, <code>textId</code>, and with a default numeric id.
+ * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type},
+ * <code>textId</code>, and with a default numeric id.
* <p>
* The created instance may not be {@link Statistics#isAtomic atomic}.
*/
public Statistics createStatistics(StatisticsType type, String textId);
+
/**
- * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type}, <code>textId</code>, and <code>numericId</code>.
+ * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type},
+ * <code>textId</code>, and <code>numericId</code>.
* <p>
* The created instance may not be {@link Statistics#isAtomic atomic}.
*/
public Statistics createStatistics(StatisticsType type, String textId, long numericId);
/**
- * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type} with default ids.
+ * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type} with
+ * default ids.
* <p>
* The created instance will be {@link Statistics#isAtomic atomic}.
*/
public Statistics createAtomicStatistics(StatisticsType type);
+
/**
- * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type}, <code>textId</code>, and with a default numeric id.
+ * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type},
+ * <code>textId</code>, and with a default numeric id.
* <p>
* The created instance will be {@link Statistics#isAtomic atomic}.
*/
public Statistics createAtomicStatistics(StatisticsType type, String textId);
+
/**
- * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type}, <code>textId</code>, and <code>numericId</code>.
+ * Creates and returns a {@link Statistics} instance of the given {@link StatisticsType type},
+ * <code>textId</code>, and <code>numericId</code>.
* <p>
* The created instance will be {@link Statistics#isAtomic atomic}.
*/
public Statistics createAtomicStatistics(StatisticsType type, String textId, long numericId);
+
/**
* Returns an array of all the existing statistics of the given type.
*/
public Statistics[] findStatisticsByType(StatisticsType type);
+
/**
* Returns an array of all the existing statistics with the given textId.
*/
public Statistics[] findStatisticsByTextId(String textId);
+
/**
* Returns an array of all the existing statistics with the given numericId.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/StatisticsType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsType.java b/geode-core/src/main/java/org/apache/geode/StatisticsType.java
index c799cb5..fab47bf 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsType.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsType.java
@@ -1,32 +1,29 @@
/*
- * 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
+ * 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;
-//import org.apache.geode.internal.Assert;
-//import java.io.*;
-//import java.util.*;
+// import org.apache.geode.internal.Assert;
+// import java.io.*;
+// import java.util.*;
/**
- * Used to describe a logical collection of statistics. These descriptions
- * are used to create an instance of {@link Statistics}.
+ * Used to describe a logical collection of statistics. These descriptions are used to create an
+ * instance of {@link Statistics}.
*
* <P>
- * To get an instance of this interface use an instance of
- * {@link StatisticsFactory}.
+ * To get an instance of this interface use an instance of {@link StatisticsFactory}.
*
*
* @since GemFire 3.0
@@ -44,27 +41,23 @@ public interface StatisticsType {
public String getDescription();
/**
- * Returns descriptions of the statistics that this statistics type
- * gathers together
+ * Returns descriptions of the statistics that this statistics type gathers together
*/
public StatisticDescriptor[] getStatistics();
/**
- * Returns the id of the statistic with the given name in this
- * statistics instance.
+ * Returns the id of the statistic with the given name in this statistics instance.
*
- * @throws IllegalArgumentException
- * No statistic named <code>name</code> exists in this
- * statistics instance.
+ * @throws IllegalArgumentException No statistic named <code>name</code> exists in this statistics
+ * instance.
*/
public int nameToId(String name);
+
/**
- * Returns the descriptor of the statistic with the given name in this
- * statistics instance.
+ * Returns the descriptor of the statistic with the given name in this statistics instance.
*
- * @throws IllegalArgumentException
- * No statistic named <code>name</code> exists in this
- * statistics instance.
+ * @throws IllegalArgumentException No statistic named <code>name</code> exists in this statistics
+ * instance.
*/
public StatisticDescriptor nameToDescriptor(String name);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java b/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
index e35725c..d37e2c2 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsTypeFactory.java
@@ -1,45 +1,41 @@
/*
- * 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
+ * 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;
-//import org.apache.geode.distributed.DistributedSystem;
+// import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.statistics.StatArchiveFormat;
import java.io.IOException;
import java.io.Reader;
/**
- * Instances of this interface provide methods that create instances
- * of {@link StatisticDescriptor} and {@link StatisticsType}.
- * Every {@link StatisticsFactory} is also a type factory.
+ * Instances of this interface provide methods that create instances of {@link StatisticDescriptor}
+ * and {@link StatisticsType}. Every {@link StatisticsFactory} is also a type factory.
*
* <P>
*
- * A <code>StatisticsTypeFactory</code> can create a {@link
- * StatisticDescriptor statistic} of three numeric types:
- * <code>int</code>, <code>long</code>, and <code>double</code>. A
- * statistic (<code>StatisticDescriptor</code>) can either be a
- * <I>gauge</I> meaning that its value can increase and decrease or a
- * <I>counter</I> meaning that its value is strictly increasing.
- * Marking a statistic as a counter allows statistic display tools
- * to properly display a statistics whose value "wraps around" (that
- * is, exceeds its maximum value).
+ * A <code>StatisticsTypeFactory</code> can create a {@link StatisticDescriptor statistic} of three
+ * numeric types: <code>int</code>, <code>long</code>, and <code>double</code>. A statistic
+ * (<code>StatisticDescriptor</code>) can either be a <I>gauge</I> meaning that its value can
+ * increase and decrease or a <I>counter</I> meaning that its value is strictly increasing. Marking
+ * a statistic as a counter allows statistic display tools to properly display a statistics whose
+ * value "wraps around" (that is, exceeds its maximum value).
+ *
+ * <P>
+ * The following code is an example of how to create a type using XML. In this example the type has
+ * two stats whose values always increase:
*
- * <P>The following code is an example of how to create a type using XML.
- * In this example the type has two stats whose values always increase:
* <pre>
StatisticsTypeFactory f = ...;
StatisticsType t = f.createType(
@@ -55,8 +51,9 @@ import java.io.Reader;
}
);
* </pre>
- * <P>The following is an example of how to create the same type using XML.
- * The XML data:
+ * <P>
+ * The following is an example of how to create the same type using XML. The XML data:
+ *
* <pre>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE statistics PUBLIC
@@ -76,13 +73,16 @@ import java.io.Reader;
</type>
</statistics>
* </pre>
+ *
* The code to create the type:
+ *
* <pre>
StatisticsTypeFactory f = ...;
Reader r = new InputStreamReader("fileContainingXmlData"));
StatisticsType type = f.createTypesFromXml(r)[0];
* </pre>
* <P>
+ *
* @see <A href="package-summary.html#statistics">Package introduction</A>
*
*
@@ -91,106 +91,121 @@ import java.io.Reader;
public interface StatisticsTypeFactory {
/**
- * Creates and returns an int counter {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>units</code>,
- * and with larger values indicating better performance.
+ * Creates and returns an int counter {@link StatisticDescriptor} with the given
+ * <code>name</code>, <code>description</code>, <code>units</code>, and with larger values
+ * indicating better performance.
*/
- public StatisticDescriptor createIntCounter(String name, String description,
- String units);
+ public StatisticDescriptor createIntCounter(String name, String description, String units);
+
/**
- * Creates and returns a long counter {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>units</code>,
- * and with larger values indicating better performance.
+ * Creates and returns a long counter {@link StatisticDescriptor} with the given
+ * <code>name</code>, <code>description</code>, <code>units</code>, and with larger values
+ * indicating better performance.
*/
- public StatisticDescriptor createLongCounter(String name, String description,
- String units);
+ public StatisticDescriptor createLongCounter(String name, String description, String units);
+
/**
- * Creates and returns a double counter {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>units</code>,
- * and with larger values indicating better performance.
+ * Creates and returns a double counter {@link StatisticDescriptor} with the given
+ * <code>name</code>, <code>description</code>, <code>units</code>, and with larger values
+ * indicating better performance.
*/
- public StatisticDescriptor createDoubleCounter(String name, String description,
- String units);
+ public StatisticDescriptor createDoubleCounter(String name, String description, String units);
+
/**
- * Creates and returns an int gauge {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>units</code>,
- * and with smaller values indicating better performance.
+ * Creates and returns an int gauge {@link StatisticDescriptor} with the given <code>name</code>,
+ * <code>description</code>, <code>units</code>, and with smaller values indicating better
+ * performance.
*/
- public StatisticDescriptor createIntGauge(String name, String description,
- String units);
+ public StatisticDescriptor createIntGauge(String name, String description, String units);
+
/**
- * Creates and returns a long gauge {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>units</code>,
- * and with smaller values indicating better performance.
+ * Creates and returns a long gauge {@link StatisticDescriptor} with the given <code>name</code>,
+ * <code>description</code>, <code>units</code>, and with smaller values indicating better
+ * performance.
*/
- public StatisticDescriptor createLongGauge(String name, String description,
- String units);
+ public StatisticDescriptor createLongGauge(String name, String description, String units);
+
/**
- * Creates and returns a double gauge {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>units</code>,
- * and with smaller values indicating better performance.
+ * Creates and returns a double gauge {@link StatisticDescriptor} with the given
+ * <code>name</code>, <code>description</code>, <code>units</code>, and with smaller values
+ * indicating better performance.
*/
- public StatisticDescriptor createDoubleGauge(String name, String description,
- String units);
+ public StatisticDescriptor createDoubleGauge(String name, String description, String units);
/**
- * Creates and returns an int counter {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
+ * Creates and returns an int counter {@link StatisticDescriptor} with the given
+ * <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
*/
- public StatisticDescriptor createIntCounter(String name, String description,
- String units, boolean largerBetter);
+ public StatisticDescriptor createIntCounter(String name, String description, String units,
+ boolean largerBetter);
+
/**
- * Creates and returns a long counter {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
+ * Creates and returns a long counter {@link StatisticDescriptor} with the given
+ * <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
*/
- public StatisticDescriptor createLongCounter(String name, String description,
- String units, boolean largerBetter);
+ public StatisticDescriptor createLongCounter(String name, String description, String units,
+ boolean largerBetter);
+
/**
- * Creates and returns a double counter {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
+ * Creates and returns a double counter {@link StatisticDescriptor} with the given
+ * <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
*/
- public StatisticDescriptor createDoubleCounter(String name, String description,
- String units, boolean largerBetter);
+ public StatisticDescriptor createDoubleCounter(String name, String description, String units,
+ boolean largerBetter);
+
/**
- * Creates and returns an int gauge {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
+ * Creates and returns an int gauge {@link StatisticDescriptor} with the given <code>name</code>,
+ * <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
*/
- public StatisticDescriptor createIntGauge(String name, String description,
- String units, boolean largerBetter);
+ public StatisticDescriptor createIntGauge(String name, String description, String units,
+ boolean largerBetter);
+
/**
- * Creates and returns a long gauge {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
+ * Creates and returns a long gauge {@link StatisticDescriptor} with the given <code>name</code>,
+ * <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
*/
- public StatisticDescriptor createLongGauge(String name, String description,
- String units, boolean largerBetter);
+ public StatisticDescriptor createLongGauge(String name, String description, String units,
+ boolean largerBetter);
+
/**
- * Creates and returns a double gauge {@link StatisticDescriptor} with the given <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
+ * Creates and returns a double gauge {@link StatisticDescriptor} with the given
+ * <code>name</code>, <code>description</code>, <code>largerBetter</code>, and <code>units</code>.
*/
- public StatisticDescriptor createDoubleGauge(String name, String description,
- String units, boolean largerBetter);
+ public StatisticDescriptor createDoubleGauge(String name, String description, String units,
+ boolean largerBetter);
/**
* The maximum number of descriptors a single statistics type can have.
- * <P> Current value is: <code>254</code>
+ * <P>
+ * Current value is: <code>254</code>
*/
- public final int MAX_DESCRIPTORS_PER_TYPE = StatArchiveFormat.ILLEGAL_STAT_OFFSET-1;
+ public final int MAX_DESCRIPTORS_PER_TYPE = StatArchiveFormat.ILLEGAL_STAT_OFFSET - 1;
/**
- * Creates or finds and returns a {@link StatisticsType} with the given <code>name</code>, <code>description</code>, and {@link StatisticDescriptor statistic descriptions}.
- * @throws IllegalArgumentException if a type with the given <code>name</code> already exists and it differs from the given parameters.
+ * Creates or finds and returns a {@link StatisticsType} with the given <code>name</code>,
+ * <code>description</code>, and {@link StatisticDescriptor statistic descriptions}.
+ *
+ * @throws IllegalArgumentException if a type with the given <code>name</code> already exists and
+ * it differs from the given parameters.
*/
- public StatisticsType createType(String name, String description,
- StatisticDescriptor[] stats);
+ public StatisticsType createType(String name, String description, StatisticDescriptor[] stats);
+
/**
- * Finds and returns an already created {@link StatisticsType} with the given <code>name</code>. Returns <code>null</code> if the type does not exist.
+ * Finds and returns an already created {@link StatisticsType} with the given <code>name</code>.
+ * Returns <code>null</code> if the type does not exist.
*/
public StatisticsType findType(String name);
/**
- * Creates one or more {@link StatisticsType} from the contents of the
- * given <code>reader</code>. The created types can be found by calling
- * {@link #findType}.
+ * Creates one or more {@link StatisticsType} from the contents of the given <code>reader</code>.
+ * The created types can be found by calling {@link #findType}.
*
- * @param reader
- * The source of the XML data which must comply with the
+ * @param reader The source of the XML data which must comply with the
* <code>statisticsType.dtd</code>.
*
- * @throws IllegalArgumentException if a type defined in the reader
- * already exists
- * @throws IOException
- * Something went wrong while reading from
- * <code>reader</code>
- */
- public StatisticsType[] createTypesFromXml(Reader reader)
- throws IOException;
+ * @throws IllegalArgumentException if a type defined in the reader already exists
+ * @throws IOException Something went wrong while reading from <code>reader</code>
+ */
+ public StatisticsType[] createTypesFromXml(Reader reader) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/SystemConnectException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/SystemConnectException.java b/geode-core/src/main/java/org/apache/geode/SystemConnectException.java
index ed41798..1c98aba 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemConnectException.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemConnectException.java
@@ -1,33 +1,29 @@
/*
- * 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
+ * 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;
/**
- * An <code>SystemConnectException</code> is thrown when a
- * GemFire application tries to connect to an
- * existing distributed system and is unable to contact all members of
- * the distributed system to announce its presence. This is usually due
- * to resource depletion problems (low memory or too few file descriptors)
- * in other processes.
+ * An <code>SystemConnectException</code> is thrown when a GemFire application tries to connect to
+ * an existing distributed system and is unable to contact all members of the distributed system to
+ * announce its presence. This is usually due to resource depletion problems (low memory or too few
+ * file descriptors) in other processes.
*/
public class SystemConnectException extends GemFireException {
-private static final long serialVersionUID = -7378174428634468238L;
+ private static final long serialVersionUID = -7378174428634468238L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>SystemConnectException</code>.
@@ -35,7 +31,7 @@ private static final long serialVersionUID = -7378174428634468238L;
public SystemConnectException(String message) {
super(message);
}
-
+
public SystemConnectException(String message, Throwable cause) {
super(message, cause);
}
[36/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index fde41f1..bb13966 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -116,7 +114,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
}
private File findTrustedJKSWithSingleEntry() {
- return new File(TestUtil.getResourcePath(RestAPIsWithSSLDUnitTest.class, "/ssl/trusted.keystore"));
+ return new File(
+ TestUtil.getResourcePath(RestAPIsWithSSLDUnitTest.class, "/ssl/trusted.keystore"));
}
private File findTrustStoreJKSForPath(Properties props) {
@@ -139,12 +138,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
}
@SuppressWarnings("deprecation")
- protected int startBridgeServer(String hostName,
- int restServicePort,
- final String locators,
- final String[] regions,
- final Properties sslProperties,
- boolean clusterLevel) {
+ protected int startBridgeServer(String hostName, int restServicePort, final String locators,
+ final String[] regions, final Properties sslProperties, boolean clusterLevel) {
Properties props = new Properties();
props.setProperty(MCAST_PORT, "0");
@@ -189,7 +184,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
region.put("2", new Person(102L, "Sachin", "Ramesh", "Tendulkar", new Date(), Gender.MALE));
region.put("3", new Person(103L, "Saurabh", "Baburav", "Ganguly", new Date(), Gender.MALE));
region.put("4", new Person(104L, "Rahul", "subrymanyam", "Dravid", new Date(), Gender.MALE));
- region.put("5", new Person(105L, "Jhulan", "Chidambaram", "Goswami", new Date(), Gender.FEMALE));
+ region.put("5",
+ new Person(105L, "Jhulan", "Chidambaram", "Goswami", new Date(), Gender.FEMALE));
Map<String, Object> userMap = new HashMap<String, Object>();
userMap.put("6", new Person(101L, "Rahul", "Rajiv", "Gndhi", new Date(), Gender.MALE));
@@ -198,7 +194,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
userMap.put("9", new Person(104L, "Soniya", "Rajiv", "Gandhi", new Date(), Gender.FEMALE));
userMap.put("10", new Person(104L, "Priyanka", "Robert", "Gandhi", new Date(), Gender.FEMALE));
userMap.put("11", new Person(104L, "Murali", "Manohar", "Joshi", new Date(), Gender.MALE));
- userMap.put("12", new Person(104L, "Lalkrishna", "Parmhansh", "Advani", new Date(), Gender.MALE));
+ userMap.put("12",
+ new Person(104L, "Lalkrishna", "Parmhansh", "Advani", new Date(), Gender.MALE));
userMap.put("13", new Person(104L, "Shushma", "kumari", "Swaraj", new Date(), Gender.FEMALE));
userMap.put("14", new Person(104L, "Arun", "raman", "jetly", new Date(), Gender.MALE));
userMap.put("15", new Person(104L, "Amit", "kumar", "shah", new Date(), Gender.MALE));
@@ -210,7 +207,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
}
- private String startInfraWithSSL(final Properties sslProperties, boolean clusterLevel) throws Exception {
+ private String startInfraWithSSL(final Properties sslProperties, boolean clusterLevel)
+ throws Exception {
final Host host = Host.getHost(0);
VM locator = host.getVM(0);
@@ -230,19 +228,22 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
String locators = locatorHostName + "[" + locatorPort + "]";
// start manager (peer cache)
- manager.invoke("StartManager", () -> startManager(locators, new String[] { REGION_NAME }, sslProperties));
+ manager.invoke("StartManager",
+ () -> startManager(locators, new String[] {REGION_NAME}, sslProperties));
// start startBridgeServer With RestService enabled
String restEndpoint = server.invoke("startBridgeServerWithRestServiceOnInVM", () -> {
final String hostName = server.getHost().getHostName();
final int restServicePort = AvailablePortHelper.getRandomAvailableTCPPort();
- startBridgeServer(hostName, restServicePort, locators, new String[] { REGION_NAME }, sslProperties, clusterLevel);
+ startBridgeServer(hostName, restServicePort, locators, new String[] {REGION_NAME},
+ sslProperties, clusterLevel);
return "https://" + hostName + ":" + restServicePort + urlContext + "/v1";
});
// create a client cache
client.invoke("Create ClientCache", () -> {
- new ClientCacheFactory().setPdxReadSerialized(true).addPoolLocator(locatorHostName, locatorPort).create();
+ new ClientCacheFactory().setPdxReadSerialized(true)
+ .addPoolLocator(locatorHostName, locatorPort).create();
return null;
});
@@ -282,10 +283,12 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
}
}
- private void sslPropertyConverter(Properties properties, Properties newProperties, String propertyName, String newPropertyName) {
+ private void sslPropertyConverter(Properties properties, Properties newProperties,
+ String propertyName, String newPropertyName) {
String property = properties.getProperty(propertyName);
if (property != null) {
- newProperties.setProperty((newPropertyName != null ? newPropertyName : propertyName), property);
+ newProperties.setProperty((newPropertyName != null ? newPropertyName : propertyName),
+ property);
}
}
@@ -293,17 +296,23 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
* @Deprecated once the legacy SSL properties have been removed we need to remove this logic.
*/
@Deprecated()
- private Properties configureSSL(Properties props, Properties sslProperties, boolean clusterLevel) {
+ private Properties configureSSL(Properties props, Properties sslProperties,
+ boolean clusterLevel) {
if (clusterLevel) {
sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_ENABLED, CLUSTER_SSL_ENABLED);
sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE, CLUSTER_SSL_KEYSTORE);
- sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, CLUSTER_SSL_KEYSTORE_PASSWORD);
- sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_TYPE, CLUSTER_SSL_KEYSTORE_TYPE);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_PASSWORD,
+ CLUSTER_SSL_KEYSTORE_PASSWORD);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE_TYPE,
+ CLUSTER_SSL_KEYSTORE_TYPE);
sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_PROTOCOLS, CLUSTER_SSL_PROTOCOLS);
- sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, CLUSTER_SSL_REQUIRE_AUTHENTICATION);
- sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE, CLUSTER_SSL_TRUSTSTORE);
- sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, CLUSTER_SSL_TRUSTSTORE_PASSWORD);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION,
+ CLUSTER_SSL_REQUIRE_AUTHENTICATION);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE,
+ CLUSTER_SSL_TRUSTSTORE);
+ sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD,
+ CLUSTER_SSL_TRUSTSTORE_PASSWORD);
} else {
sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_ENABLED, null);
sslPropertyConverter(sslProperties, props, HTTP_SERVICE_SSL_KEYSTORE, null);
@@ -331,7 +340,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
return props;
}
- private int startManager(final String locators, final String[] regions, final Properties sslProperties) throws IOException {
+ private int startManager(final String locators, final String[] regions,
+ final Properties sslProperties) throws IOException {
IgnoredException.addIgnoredException("java.net.BindException");
IgnoredException.addIgnoredException("java.rmi.server.ExportException");
@@ -348,13 +358,16 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
while (true) {
try {
DistributedSystem ds = getSystem(props);
- System.out.println("Creating cache with http-service-port " + props.getProperty(HTTP_SERVICE_PORT, "7070") + " and jmx-manager-port " + props.getProperty(JMX_MANAGER_PORT, "1099"));
+ System.out.println(
+ "Creating cache with http-service-port " + props.getProperty(HTTP_SERVICE_PORT, "7070")
+ + " and jmx-manager-port " + props.getProperty(JMX_MANAGER_PORT, "1099"));
cache = CacheFactory.create(ds);
System.out.println("Successfully created cache.");
break;
} catch (ManagementException ex) {
- if ((ex.getCause() instanceof BindException) || (ex.getCause() != null && ex.getCause().getCause() instanceof BindException)) {
- //close cache and disconnect
+ if ((ex.getCause() instanceof BindException)
+ || (ex.getCause() != null && ex.getCause().getCause() instanceof BindException)) {
+ // close cache and disconnect
GemFireCacheImpl existingInstance = GemFireCacheImpl.getInstance();
if (existingInstance != null) {
existingInstance.close();
@@ -363,7 +376,7 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
if (ids != null) {
ids.disconnect();
}
- //try a different port
+ // try a different port
int httpServicePort = AvailablePortHelper.getRandomAvailableTCPPort();
int jmxManagerPort = AvailablePortHelper.getRandomAvailableTCPPort();
props.setProperty(HTTP_SERVICE_PORT, Integer.toString(httpServicePort));
@@ -399,7 +412,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
private void createRegionInCache() {
Cache cache = GemFireCacheImpl.getInstance();
assertNotNull(cache);
- RegionFactory<String, Object> regionFactory = cache.createRegionFactory(RegionShortcut.REPLICATE);
+ RegionFactory<String, Object> regionFactory =
+ cache.createRegionFactory(RegionShortcut.REPLICATE);
regionFactory.create(PEOPLE_REGION_NAME);
}
@@ -415,21 +429,24 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
// this is needed
SSLContextBuilder custom = SSLContexts.custom();
- SSLContextBuilder sslContextBuilder = custom.loadTrustMaterial(clientTrust, new TrustSelfSignedStrategy());
- SSLContext sslcontext = sslContextBuilder.loadKeyMaterial(clientKeys, "password".toCharArray(), (aliases, socket) -> {
- if (aliases.size() == 1) {
- return aliases.keySet().stream().findFirst().get();
- }
- if (!StringUtils.isEmpty(properties.getProperty(INVALID_CLIENT_ALIAS))) {
- return properties.getProperty(INVALID_CLIENT_ALIAS);
- } else {
- return properties.getProperty(SSL_WEB_ALIAS);
- }
- }).build();
+ SSLContextBuilder sslContextBuilder =
+ custom.loadTrustMaterial(clientTrust, new TrustSelfSignedStrategy());
+ SSLContext sslcontext = sslContextBuilder
+ .loadKeyMaterial(clientKeys, "password".toCharArray(), (aliases, socket) -> {
+ if (aliases.size() == 1) {
+ return aliases.keySet().stream().findFirst().get();
+ }
+ if (!StringUtils.isEmpty(properties.getProperty(INVALID_CLIENT_ALIAS))) {
+ return properties.getProperty(INVALID_CLIENT_ALIAS);
+ } else {
+ return properties.getProperty(SSL_WEB_ALIAS);
+ }
+ }).build();
// Host checking is disabled here , as tests might run on multiple hosts and
// host entries can not be assumed
- SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(sslcontext, SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
+ SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(
+ sslcontext, SSLConnectionSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
return HttpClients.custom().setSSLSocketFactory(sslConnectionSocketFactory).build();
}
@@ -490,8 +507,10 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSimpleSSLWithMultiKey_KeyStore() throws Exception {
Properties props = new Properties();
- props.setProperty(SSL_KEYSTORE, TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKey.jks"));
- props.setProperty(SSL_TRUSTSTORE, TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKeyTrust.jks"));
+ props.setProperty(SSL_KEYSTORE,
+ TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKey.jks"));
+ props.setProperty(SSL_TRUSTSTORE,
+ TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKeyTrust.jks"));
props.setProperty(SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(SSL_TRUSTSTORE_PASSWORD, "password");
props.setProperty(SSL_KEYSTORE_TYPE, "JKS");
@@ -506,8 +525,10 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSimpleSSLWithMultiKey_KeyStore_WithInvalidClientKey() throws Exception {
Properties props = new Properties();
- props.setProperty(SSL_KEYSTORE, TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKey.jks"));
- props.setProperty(SSL_TRUSTSTORE, TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKeyTrust.jks"));
+ props.setProperty(SSL_KEYSTORE,
+ TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKey.jks"));
+ props.setProperty(SSL_TRUSTSTORE,
+ TestUtil.getResourcePath(getClass(), "/org/apache/geode/internal/net/multiKeyTrust.jks"));
props.setProperty(SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(SSL_TRUSTSTORE_PASSWORD, "password");
props.setProperty(SSL_KEYSTORE_TYPE, "JKS");
@@ -675,7 +696,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_TYPE, "JKS");
String restEndpoint = startInfraWithSSL(props, false);
@@ -686,7 +708,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithoutKeyStoreTypeLegacy() throws Exception {
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
String restEndpoint = startInfraWithSSL(props, false);
@@ -697,7 +720,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithSSLProtocolLegacy() throws Exception {
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "SSL");
@@ -709,7 +733,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithTLSProtocolLegacy() throws Exception {
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLS");
@@ -721,7 +746,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithTLSv11ProtocolLegacy() throws Exception {
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.1");
@@ -733,7 +759,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithTLSv12ProtocolLegacy() throws Exception {
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.2");
@@ -745,7 +772,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testWithMultipleProtocolLegacy() throws Exception {
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "SSL,TLSv1.2");
@@ -758,7 +786,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
System.setProperty("javax.net.debug", "ssl");
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.2");
@@ -777,7 +806,8 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testSSLWithMultipleCipherSuiteLegacy() throws Exception {
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "TLSv1.2");
@@ -796,12 +826,14 @@ public class RestAPIsWithSSLDUnitTest extends LocatorTestBase {
public void testMutualAuthenticationLegacy() throws Exception {
Properties props = new Properties();
props.setProperty(HTTP_SERVICE_SSL_ENABLED, "true");
- props.setProperty(HTTP_SERVICE_SSL_KEYSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_KEYSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, "password");
props.setProperty(HTTP_SERVICE_SSL_PROTOCOLS, "SSL");
props.setProperty(HTTP_SERVICE_SSL_REQUIRE_AUTHENTICATION, "true");
- props.setProperty(HTTP_SERVICE_SSL_TRUSTSTORE, findTrustedJKSWithSingleEntry().getCanonicalPath());
+ props.setProperty(HTTP_SERVICE_SSL_TRUSTSTORE,
+ findTrustedJKSWithSingleEntry().getCanonicalPath());
props.setProperty(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, "password");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
index 233a6e0..7a70dbe 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestTestUtils.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -38,14 +36,14 @@ import org.springframework.web.util.UriComponentsBuilder;
* @see org.springframework.data.gemfire.GemfireTemplate
* @since GemFire 8.0
*/
-public class RestTestUtils {
+public class RestTestUtils {
public static final String BASE_URL = "http://localhost:8080";
public static final String GEMFIRE_REST_API_CONTEXT = "/gemfire-api";
public static final String GEMFIRE_REST_API_VERSION = "/v1";
- public static final URI GEMFIRE_REST_API_WEB_SERVICE_URL = URI
- .create(BASE_URL + GEMFIRE_REST_API_CONTEXT + GEMFIRE_REST_API_VERSION);
+ public static final URI GEMFIRE_REST_API_WEB_SERVICE_URL =
+ URI.create(BASE_URL + GEMFIRE_REST_API_CONTEXT + GEMFIRE_REST_API_VERSION);
private static RestTemplate restTemplate;
@@ -53,57 +51,57 @@ public class RestTestUtils {
if (restTemplate == null) {
restTemplate = new RestTemplate();
- final List<HttpMessageConverter<?>> messageConverters = new ArrayList<HttpMessageConverter<?>>();
+ final List<HttpMessageConverter<?>> messageConverters =
+ new ArrayList<HttpMessageConverter<?>>();
messageConverters.add(new ByteArrayHttpMessageConverter());
messageConverters.add(new ResourceHttpMessageConverter());
messageConverters.add(new StringHttpMessageConverter());
messageConverters.add(createMappingJackson2HttpMessageConverter());
-
+
restTemplate.setMessageConverters(messageConverters);
}
return restTemplate;
}
public static HttpMessageConverter<Object> createMappingJackson2HttpMessageConverter() {
- final Jackson2ObjectMapperFactoryBean objectMapperFactoryBean = new Jackson2ObjectMapperFactoryBean();
+ final Jackson2ObjectMapperFactoryBean objectMapperFactoryBean =
+ new Jackson2ObjectMapperFactoryBean();
objectMapperFactoryBean.setFailOnEmptyBeans(true);
objectMapperFactoryBean.setIndentOutput(true);
objectMapperFactoryBean.setDateFormat(new SimpleDateFormat("MM/dd/yyyy"));
- objectMapperFactoryBean
- .setFeaturesToDisable(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
- objectMapperFactoryBean
- .setFeaturesToEnable(
- com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_COMMENTS,
- com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_SINGLE_QUOTES,
- com.fasterxml.jackson.databind.DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+ objectMapperFactoryBean.setFeaturesToDisable(
+ com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+ objectMapperFactoryBean.setFeaturesToEnable(
+ com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_COMMENTS,
+ com.fasterxml.jackson.core.JsonParser.Feature.ALLOW_SINGLE_QUOTES,
+ com.fasterxml.jackson.databind.DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
objectMapperFactoryBean.afterPropertiesSet();
- final MappingJackson2HttpMessageConverter httpMessageConverter = new MappingJackson2HttpMessageConverter();
+ final MappingJackson2HttpMessageConverter httpMessageConverter =
+ new MappingJackson2HttpMessageConverter();
httpMessageConverter.setObjectMapper(objectMapperFactoryBean.getObject());
return httpMessageConverter;
}
-
- /*
- protected static HttpMessageConverter<Object> createMarshallingHttpMessageConverter() {
- final Jaxb2Marshaller jaxbMarshaller = new Jaxb2Marshaller();
- jaxbMarshaller.setContextPaths("org.apache.geode.web.rest.domain",
- "org.apache.geode.web.controllers.support");
- jaxbMarshaller.setMarshallerProperties(Collections.singletonMap(
- "jaxb.formatted.output", Boolean.TRUE));
+ /*
+ * protected static HttpMessageConverter<Object> createMarshallingHttpMessageConverter() { final
+ * Jaxb2Marshaller jaxbMarshaller = new Jaxb2Marshaller();
+ *
+ * jaxbMarshaller.setContextPaths("org.apache.geode.web.rest.domain",
+ * "org.apache.geode.web.controllers.support");
+ * jaxbMarshaller.setMarshallerProperties(Collections.singletonMap( "jaxb.formatted.output",
+ * Boolean.TRUE));
+ *
+ * return new MarshallingHttpMessageConverter(jaxbMarshaller); }
+ */
- return new MarshallingHttpMessageConverter(jaxbMarshaller);
- }
- */
-
public static URI toUri(final String... pathSegments) {
return toUri(GEMFIRE_REST_API_WEB_SERVICE_URL, pathSegments);
}
public static URI toUri(final URI baseUrl, final String... pathSegments) {
- return UriComponentsBuilder.fromUri(baseUrl).pathSegment(pathSegments)
- .build().toUri();
+ return UriComponentsBuilder.fromUri(baseUrl).pathSegment(pathSegments).build().toUri();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
----------------------------------------------------------------------
diff --git a/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java b/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
index d628ea5..a0e3483 100755
--- a/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
+++ b/geode-common/src/main/java/org/apache/geode/annotations/Experimental.java
@@ -1,18 +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
+ * 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.annotations;
@@ -23,34 +21,29 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Signifies that a public API (public class, method or field) is subject to
- * incompatible changes, or even removal, in a future release. An API bearing
- * this annotation is exempt from any compatibility guarantees made by its
- * containing library.
+ * Signifies that a public API (public class, method or field) is subject to incompatible changes,
+ * or even removal, in a future release. An API bearing this annotation is exempt from any
+ * compatibility guarantees made by its containing library.
*
- * <p>Note that the presence of this annotation implies nothing
- * about the quality or performance of the API in question, only the fact that
- * it is not "API-frozen."
+ * <p>
+ * Note that the presence of this annotation implies nothing about the quality or performance of the
+ * API in question, only the fact that it is not "API-frozen."
*
- * <p>It is generally safe for <i>applications</i> to depend on beta APIs, at
- * the cost of some extra work during upgrades. However, it is generally
- * inadvisable for <i>libraries</i> (which get included on users' class paths,
- * outside the library developers' control) to do so.
+ * <p>
+ * It is generally safe for <i>applications</i> to depend on beta APIs, at the cost of some extra
+ * work during upgrades. However, it is generally inadvisable for <i>libraries</i> (which get
+ * included on users' class paths, outside the library developers' control) to do so.
*
- * <p>Inspired by similar annotations in JGroups, Spark, DataflowJavaSDK.
+ * <p>
+ * Inspired by similar annotations in JGroups, Spark, DataflowJavaSDK.
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
-@Target({
- ElementType.ANNOTATION_TYPE,
- ElementType.CONSTRUCTOR,
- ElementType.FIELD,
- ElementType.METHOD,
- ElementType.PACKAGE,
- ElementType.TYPE})
+@Target({ElementType.ANNOTATION_TYPE, ElementType.CONSTRUCTOR, ElementType.FIELD,
+ ElementType.METHOD, ElementType.PACKAGE, ElementType.TYPE})
public @interface Experimental {
-
+
/** Optional description */
String value() default "";
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
index 487106a..ea6008e 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/ExperimentalJUnitTest.java
@@ -1,18 +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
+ * 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.annotations;
@@ -28,17 +26,16 @@ import org.apache.geode.experimental.nonexperimentalpackage.ClassInNonExperiment
import org.apache.geode.test.junit.categories.UnitTest;
/**
- * Unit tests for the <tt>Experimental</tt> annotation. Verifies that the
- * annotation can be applied to Interfaces, Classes, Public and Protected
- * Fields, Enums, Enum Constants, Public and Protected Methods, Packages,
- * and Constructors.
+ * Unit tests for the <tt>Experimental</tt> annotation. Verifies that the annotation can be applied
+ * to Interfaces, Classes, Public and Protected Fields, Enums, Enum Constants, Public and Protected
+ * Methods, Packages, and Constructors.
*/
@Category(UnitTest.class)
public class ExperimentalJUnitTest {
private static final String FIELD_NAME = "field";
private static final String METHOD_NAME = "method";
-
+
@Test
public void shouldIdentifyExperimentalInterface() throws Exception {
assertThat(isExperimental(RegularInterface.class)).isFalse();
@@ -50,29 +47,32 @@ public class ExperimentalJUnitTest {
assertThat(isExperimental(RegularClass.class)).isFalse();
assertThat(isExperimental(ExperimentalClass.class)).isTrue();
}
-
+
@Test
public void shouldIdentifyExperimentalPublicField() throws Exception {
assertThat(isExperimental(RegularPublicField.class.getField(FIELD_NAME))).isFalse();
assertThat(isExperimental(ExperimentalPublicField.class.getField(FIELD_NAME))).isTrue();
}
-
+
@Test
public void shouldIdentifyExperimentalProtectedField() throws Exception {
assertThat(isExperimental(RegularProtectedField.class.getDeclaredField(FIELD_NAME))).isFalse();
- assertThat(isExperimental(ExperimentalProtectedField.class.getDeclaredField(FIELD_NAME))).isTrue();
+ assertThat(isExperimental(ExperimentalProtectedField.class.getDeclaredField(FIELD_NAME)))
+ .isTrue();
}
-
+
@Test
public void shouldIdentifyExperimentalEnum() throws Exception {
assertThat(isExperimental(RegularEnum.class)).isFalse();
assertThat(isExperimental(ExperimentalEnum.class)).isTrue();
}
-
+
@Test
public void shouldIdentifyExperimentalEnumConstant() throws Exception {
- assertThat(isExperimental(RegularEnumInstance.class.getField(RegularEnumInstance.THREE.name()))).isFalse();
- assertThat(isExperimental(ExperimentalEnumInstance.class.getField(ExperimentalEnumInstance.THREE.name()))).isTrue();
+ assertThat(isExperimental(RegularEnumInstance.class.getField(RegularEnumInstance.THREE.name())))
+ .isFalse();
+ assertThat(isExperimental(
+ ExperimentalEnumInstance.class.getField(ExperimentalEnumInstance.THREE.name()))).isTrue();
}
@Test
@@ -83,8 +83,10 @@ public class ExperimentalJUnitTest {
@Test
public void shouldIdentifyExperimentalProtectedMethod() throws Exception {
- assertThat(isExperimental(RegularProtectedMethod.class.getDeclaredMethod(METHOD_NAME))).isFalse();
- assertThat(isExperimental(ExperimentalProtectedMethod.class.getDeclaredMethod(METHOD_NAME))).isTrue();
+ assertThat(isExperimental(RegularProtectedMethod.class.getDeclaredMethod(METHOD_NAME)))
+ .isFalse();
+ assertThat(isExperimental(ExperimentalProtectedMethod.class.getDeclaredMethod(METHOD_NAME)))
+ .isTrue();
}
@Test
@@ -92,7 +94,7 @@ public class ExperimentalJUnitTest {
assertThat(isExperimental(ClassInNonExperimentalPackage.class.getPackage())).isFalse();
assertThat(isExperimental(ClassInExperimentalPackage.class.getPackage())).isTrue();
}
-
+
@Test
public void shouldIdentifyExperimentalPublicConstructor() throws Exception {
assertThat(isExperimental(RegularPublicConstructor.class.getConstructor())).isFalse();
@@ -108,7 +110,7 @@ public class ExperimentalJUnitTest {
private static boolean isExperimental(final AnnotatedElement element) {
return element.getAnnotation(Experimental.class) != null;
}
-
+
public static interface RegularInterface {
}
@Experimental("This is an experimental interface")
@@ -128,7 +130,7 @@ public class ExperimentalJUnitTest {
@Experimental("This is an experimental public field")
public final boolean field = false;
}
-
+
public static class RegularProtectedField {
protected final boolean field = false;
}
@@ -149,49 +151,39 @@ public class ExperimentalJUnitTest {
ONE, TWO, THREE
}
public static enum ExperimentalEnumInstance {
- ONE,
- TWO,
- @Experimental("This is an experimental enum constant")
+ ONE, TWO, @Experimental("This is an experimental enum constant")
THREE
}
-
+
public static class RegularPublicMethod {
- public void method() {
- }
+ public void method() {}
}
public static class ExperimentalPublicMethod {
@Experimental("This is an experimental public method")
- public void method() {
- }
+ public void method() {}
}
public static class RegularProtectedMethod {
- public void method() {
- }
+ public void method() {}
}
public static class ExperimentalProtectedMethod {
@Experimental("This is an experimental protected method")
- protected void method() {
- }
+ protected void method() {}
}
-
+
public static class RegularPublicConstructor {
- public RegularPublicConstructor() {
- }
+ public RegularPublicConstructor() {}
}
public static class ExperimentalPublicConstructor {
@Experimental("This is an experimental public constructor")
- public ExperimentalPublicConstructor() {
- }
+ public ExperimentalPublicConstructor() {}
}
public static class RegularProtectedConstructor {
- public RegularProtectedConstructor() {
- }
+ public RegularProtectedConstructor() {}
}
public static class ExperimentalProtectedConstructor {
@Experimental("This is an experimental protected constructor")
- public ExperimentalProtectedConstructor() {
- }
+ public ExperimentalProtectedConstructor() {}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
index 3b6e7d2..06bc035 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/ClassInExperimentalPackage.java
@@ -1,24 +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
+ * 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.annotations.experimentalpackage;
/**
- * Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an
- * <tt>Experimental</tt> package.
+ * Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an <tt>Experimental</tt> package.
*
* @see org.apache.geode.annotations.ExperimentalJUnitTest
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
index 288e9aa..d668435 100755
--- a/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
+++ b/geode-common/src/test/java/org/apache/geode/annotations/experimentalpackage/package-info.java
@@ -1,22 +1,19 @@
/*
- * 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
+ * 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.
*/
/**
- * Used by <tt>ExperimentalJUnitTest</tt>. This is an <tt>Experimental</tt>
- * package.
+ * Used by <tt>ExperimentalJUnitTest</tt>. This is an <tt>Experimental</tt> package.
*
* @see org.apache.geode.annotations.ExperimentalJUnitTest
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
index 10f6072..126c6fe 100755
--- a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
+++ b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/ClassInNonExperimentalPackage.java
@@ -1,24 +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
+ * 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.experimental.nonexperimentalpackage;
/**
- * Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an
- * <tt>Experimental</tt> package.
+ * Used by <tt>ExperimentalJUnitTest</tt>. This is a class in an <tt>Experimental</tt> package.
*
* @see org.apache.geode.annotations.ExperimentalJUnitTest
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
----------------------------------------------------------------------
diff --git a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
index 20236a6..ba13c2c 100755
--- a/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
+++ b/geode-common/src/test/java/org/apache/geode/experimental/nonexperimentalpackage/package-info.java
@@ -1,22 +1,19 @@
/*
- * 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
+ * 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.
*/
/**
- * Used by <tt>ExperimentalJUnitTest</tt>. This is a non-<tt>Experimental</tt>
- * package.
+ * Used by <tt>ExperimentalJUnitTest</tt>. This is a non-<tt>Experimental</tt> package.
*
* @see org.apache.geode.annotations.ExperimentalJUnitTest
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
index d7bcc44..2cba958 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionFactoryImpl.java
@@ -1,18 +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
+ * 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.internal.ra;
@@ -23,12 +21,12 @@ import javax.resource.spi.ConnectionManager;
import javax.resource.spi.ManagedConnectionFactory;
import org.apache.geode.ra.GFConnectionFactory;
+
/**
*
*
*/
-public class GFConnectionFactoryImpl implements GFConnectionFactory
-{
+public class GFConnectionFactoryImpl implements GFConnectionFactory {
final private ConnectionManager cm;
final private ManagedConnectionFactory mcf;
@@ -40,25 +38,21 @@ public class GFConnectionFactoryImpl implements GFConnectionFactory
this.mcf = mcf;
}
- public GFConnectionFactoryImpl(ConnectionManager cm,
- ManagedConnectionFactory mcf) {
+ public GFConnectionFactoryImpl(ConnectionManager cm, ManagedConnectionFactory mcf) {
this.cm = cm;
this.mcf = mcf;
}
- public GFConnectionImpl getConnection() throws ResourceException
- {
- return (GFConnectionImpl)cm.allocateConnection(mcf, null);
+ public GFConnectionImpl getConnection() throws ResourceException {
+ return (GFConnectionImpl) cm.allocateConnection(mcf, null);
}
- public void setReference(Reference ref)
- {
+ public void setReference(Reference ref) {
this.ref = ref;
}
- public Reference getReference() throws NamingException
- {
+ public Reference getReference() throws NamingException {
return this.ref;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
index 7a69293..5ff7a71 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/GFConnectionImpl.java
@@ -1,18 +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
+ * 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.internal.ra;
@@ -27,8 +25,7 @@ import org.apache.geode.ra.GFConnection;
*
*
*/
-public class GFConnectionImpl implements GFConnection
-{
+public class GFConnectionImpl implements GFConnection {
private JCAManagedConnection mc;
private Reference ref;
@@ -37,13 +34,11 @@ public class GFConnectionImpl implements GFConnection
this.mc = mc;
}
- public void resetManagedConnection(JCAManagedConnection mc)
- {
+ public void resetManagedConnection(JCAManagedConnection mc) {
this.mc = mc;
}
- public void close() throws ResourceException
- {
+ public void close() throws ResourceException {
// Check if the connection is associated with a JTA. If yes, then
// we should throw an exception on close being invoked.
if (this.mc != null) {
@@ -51,19 +46,16 @@ public class GFConnectionImpl implements GFConnection
}
}
- public void invalidate()
- {
+ public void invalidate() {
this.mc = null;
}
- public void setReference(Reference ref)
- {
+ public void setReference(Reference ref) {
this.ref = ref;
}
- public Reference getReference() throws NamingException
- {
+ public Reference getReference() throws NamingException {
return this.ref;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
index c7b2223..112f2fa 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCALocalTransaction.java
@@ -1,18 +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
+ * 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.internal.ra.spi;
@@ -35,8 +33,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
*
*/
-public class JCALocalTransaction implements LocalTransaction
-{
+public class JCALocalTransaction implements LocalTransaction {
private volatile GemFireCacheImpl cache;
private volatile TXManagerImpl gfTxMgr;
@@ -63,13 +60,11 @@ public class JCALocalTransaction implements LocalTransaction
// this );
}
- public void begin() throws ResourceException
- {
+ public void begin() throws ResourceException {
if (DEBUG) {
try {
throw new NullPointerException("Asif:JCALocalTransaction:begin");
- }
- catch (NullPointerException npe) {
+ } catch (NullPointerException npe) {
npe.printStackTrace();
}
}
@@ -85,8 +80,7 @@ public class JCALocalTransaction implements LocalTransaction
}
TransactionManager tm = cache.getJTATransactionManager();
if (this.tid != null) {
- throw new LocalTransactionException(
- " A transaction is already in progress");
+ throw new LocalTransactionException(" A transaction is already in progress");
}
if (tm != null && tm.getTransaction() != null) {
if (logger.fineEnabled()) {
@@ -103,19 +97,15 @@ public class JCALocalTransaction implements LocalTransaction
if (logger.fineEnabled()) {
logger.fine("JCALocalTransaction:begun GFE transaction");
}
+ } else {
+ throw new LocalTransactionException("GemFire is already associated with a transaction");
}
- else {
- throw new LocalTransactionException(
- "GemFire is already associated with a transaction");
- }
- }
- else {
+ } else {
if (logger.fineEnabled()) {
logger.fine("JCAManagedConnection: JTA Transaction does not exist.");
}
}
- }
- catch (SystemException e) {
+ } catch (SystemException e) {
// this.onError();
throw new ResourceException(e);
}
@@ -129,13 +119,11 @@ public class JCALocalTransaction implements LocalTransaction
}
- public void commit() throws ResourceException
- {
+ public void commit() throws ResourceException {
if (DEBUG) {
try {
throw new NullPointerException("Asif:JCALocalTransaction:commit");
- }
- catch (NullPointerException npe) {
+ } catch (NullPointerException npe) {
npe.printStackTrace();
}
}
@@ -145,15 +133,13 @@ public class JCALocalTransaction implements LocalTransaction
}
TXStateProxy tsp = this.gfTxMgr.getTXState();
if (tsp != null && this.tid != tsp.getTransactionId()) {
- throw new IllegalStateException(
- "Local Transaction associated with Tid = " + this.tid
- + " attempting to commit a different transaction");
+ throw new IllegalStateException("Local Transaction associated with Tid = " + this.tid
+ + " attempting to commit a different transaction");
}
try {
this.gfTxMgr.commit();
this.tid = null;
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new LocalTransactionException(e.toString());
}
// Iterator<ConnectionEventListener> itr = this.listeners.iterator();
@@ -165,21 +151,18 @@ public class JCALocalTransaction implements LocalTransaction
}
- public void rollback() throws ResourceException
- {
+ public void rollback() throws ResourceException {
if (DEBUG) {
try {
throw new NullPointerException("Asif:JJCALocalTransaction:rollback");
- }
- catch (NullPointerException npe) {
+ } catch (NullPointerException npe) {
npe.printStackTrace();
}
}
TXStateProxy tsp = this.gfTxMgr.getTXState();
if (tsp != null && this.tid != tsp.getTransactionId()) {
- throw new IllegalStateException(
- "Local Transaction associated with Tid = " + this.tid
- + " attempting to commit a different transaction");
+ throw new IllegalStateException("Local Transaction associated with Tid = " + this.tid
+ + " attempting to commit a different transaction");
}
LogWriter logger = cache.getLogger();
if (logger.fineEnabled()) {
@@ -187,24 +170,18 @@ public class JCALocalTransaction implements LocalTransaction
}
try {
this.gfTxMgr.rollback();
- }
- catch (IllegalStateException ise) {
+ } catch (IllegalStateException ise) {
// It is possible that the GFE transaction has already been rolled back.
- if (ise
- .getMessage()
- .equals(
- LocalizedStrings.TXManagerImpl_THREAD_DOES_NOT_HAVE_AN_ACTIVE_TRANSACTION
- .toLocalizedString())) {
+ if (ise.getMessage()
+ .equals(LocalizedStrings.TXManagerImpl_THREAD_DOES_NOT_HAVE_AN_ACTIVE_TRANSACTION
+ .toLocalizedString())) {
// /ignore;
- }
- else {
+ } else {
throw new ResourceException(ise);
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new ResourceException(e);
- }
- finally {
+ } finally {
this.tid = null;
}
// Iterator<ConnectionEventListener> itr = this.listeners.iterator();
@@ -216,9 +193,8 @@ public class JCALocalTransaction implements LocalTransaction
}
- private void init() throws SystemException
- {
- this.cache = (GemFireCacheImpl)CacheFactory.getAnyInstance();
+ private void init() throws SystemException {
+ this.cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
LogWriter logger = this.cache.getLogger();
if (logger.fineEnabled()) {
logger.fine("JCAManagedConnection:init. Inside init");
@@ -227,8 +203,7 @@ public class JCALocalTransaction implements LocalTransaction
this.initDone = true;
}
- boolean transactionInProgress()
- {
+ boolean transactionInProgress() {
return this.tid != null;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java
index 4a9c903..520f7e2 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnection.java
@@ -1,18 +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
+ * 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.internal.ra.spi;
@@ -71,35 +69,31 @@ public class JCAManagedConnection implements ManagedConnection
public JCAManagedConnection(JCAManagedConnectionFactory fact) {
this.factory = fact;
this.listeners = Collections
- .<ConnectionEventListener> synchronizedList(new ArrayList<ConnectionEventListener>());
+ .<ConnectionEventListener>synchronizedList(new ArrayList<ConnectionEventListener>());
this.localTran = new JCALocalTransaction();
- this.connections = Collections
- .<GFConnectionImpl> synchronizedSet(new HashSet<GFConnectionImpl>());
+ this.connections =
+ Collections.<GFConnectionImpl>synchronizedSet(new HashSet<GFConnectionImpl>());
}
- public void addConnectionEventListener(ConnectionEventListener listener)
- {
+ public void addConnectionEventListener(ConnectionEventListener listener) {
this.listeners.add(listener);
}
- public void associateConnection(Object conn) throws ResourceException
- {
+ public void associateConnection(Object conn) throws ResourceException {
if (!(conn instanceof GFConnectionImpl)) {
throw new ResourceException("Connection is not of type GFConnection");
}
- ((GFConnectionImpl)conn).resetManagedConnection(this);
- this.connections.add((GFConnectionImpl)conn);
+ ((GFConnectionImpl) conn).resetManagedConnection(this);
+ this.connections.add((GFConnectionImpl) conn);
}
- public void cleanup() throws ResourceException
- {
+ public void cleanup() throws ResourceException {
if (DEBUG) {
try {
throw new NullPointerException("Asif:JCAManagedConnection:cleanup");
- }
- catch (NullPointerException npe) {
+ } catch (NullPointerException npe) {
npe.printStackTrace();
}
}
@@ -114,21 +108,18 @@ public class JCAManagedConnection implements ManagedConnection
if (this.localTran == null || this.localTran.transactionInProgress()) {
if (this.initDone && !this.cache.isClosed()) {
this.localTran = new JCALocalTransaction(cache, gfTxMgr);
- }
- else {
+ } else {
this.localTran = new JCALocalTransaction();
}
}
}
- public void destroy() throws ResourceException
- {
+ public void destroy() throws ResourceException {
if (DEBUG) {
try {
throw new NullPointerException("Asif:JCAManagedConnection:destroy");
- }
- catch (NullPointerException npe) {
+ } catch (NullPointerException npe) {
npe.printStackTrace();
}
}
@@ -146,15 +137,11 @@ public class JCAManagedConnection implements ManagedConnection
this.listeners.clear();
}
- public Object getConnection(Subject arg0, ConnectionRequestInfo arg1)
- throws ResourceException
- {
+ public Object getConnection(Subject arg0, ConnectionRequestInfo arg1) throws ResourceException {
if (DEBUG) {
try {
- throw new NullPointerException(
- "Asif:JCAManagedConnection:getConnection");
- }
- catch (NullPointerException npe) {
+ throw new NullPointerException("Asif:JCAManagedConnection:getConnection");
+ } catch (NullPointerException npe) {
npe.printStackTrace();
}
}
@@ -164,23 +151,20 @@ public class JCAManagedConnection implements ManagedConnection
}
LogWriter logger = this.cache.getLogger();
if (logger.fineEnabled()) {
- logger
- .fine("JCAManagedConnection:getConnection. Returning new Connection");
+ logger.fine("JCAManagedConnection:getConnection. Returning new Connection");
}
GFConnectionImpl conn = new GFConnectionImpl(this);
this.connections.add(conn);
return conn;
- }
- catch (SystemException e) {
+ } catch (SystemException e) {
this.onError(e);
throw new ResourceException("GemFire Resource unavailable", e);
}
}
- private void init() throws SystemException
- {
- this.cache = (GemFireCacheImpl)CacheFactory.getAnyInstance();
+ private void init() throws SystemException {
+ this.cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
LogWriter logger = this.cache.getLogger();
if (logger.fineEnabled()) {
logger.fine("JCAManagedConnection:init. Inside init");
@@ -189,14 +173,11 @@ public class JCAManagedConnection implements ManagedConnection
this.initDone = true;
}
- public LocalTransaction getLocalTransaction() throws ResourceException
- {
+ public LocalTransaction getLocalTransaction() throws ResourceException {
if (DEBUG) {
try {
- throw new NullPointerException(
- "Asif:JCAManagedConnection:getLocalTransaction");
- }
- catch (NullPointerException npe) {
+ throw new NullPointerException("Asif:JCAManagedConnection:getLocalTransaction");
+ } catch (NullPointerException npe) {
npe.printStackTrace();
}
}
@@ -204,18 +185,15 @@ public class JCAManagedConnection implements ManagedConnection
return this.localTran;
}
- public PrintWriter getLogWriter() throws ResourceException
- {
+ public PrintWriter getLogWriter() throws ResourceException {
return this.logger;
}
- public ManagedConnectionMetaData getMetaData() throws ResourceException
- {
+ public ManagedConnectionMetaData getMetaData() throws ResourceException {
if (DEBUG) {
try {
throw new NullPointerException("Asif:JCAManagedConnection:getMetaData");
- }
- catch (NullPointerException npe) {
+ } catch (NullPointerException npe) {
npe.printStackTrace();
}
}
@@ -229,24 +207,20 @@ public class JCAManagedConnection implements ManagedConnection
this.factory.getVersion(), this.factory.getUserName());
}
- public XAResource getXAResource() throws ResourceException
- {
+ public XAResource getXAResource() throws ResourceException {
throw new NotSupportedException("XA Transaction not supported");
}
- public void removeConnectionEventListener(ConnectionEventListener arg0)
- {
+ public void removeConnectionEventListener(ConnectionEventListener arg0) {
this.listeners.remove(arg0);
}
- public void setLogWriter(PrintWriter logger) throws ResourceException
- {
+ public void setLogWriter(PrintWriter logger) throws ResourceException {
this.logger = logger;
}
- private void onError(Exception e)
- {
+ private void onError(Exception e) {
this.localTran = null;
@@ -257,8 +231,8 @@ public class JCAManagedConnection implements ManagedConnection
conn.invalidate();
synchronized (this.listeners) {
Iterator<ConnectionEventListener> itr = this.listeners.iterator();
- ConnectionEvent ce = new ConnectionEvent(this,
- ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
+ ConnectionEvent ce =
+ new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, e);
ce.setConnectionHandle(conn);
while (itr.hasNext()) {
itr.next().connectionErrorOccurred(ce);
@@ -270,14 +244,12 @@ public class JCAManagedConnection implements ManagedConnection
}
- public void onClose(GFConnectionImpl conn) throws ResourceException
- {
+ public void onClose(GFConnectionImpl conn) throws ResourceException {
conn.invalidate();
this.connections.remove(conn);
synchronized (this.listeners) {
Iterator<ConnectionEventListener> itr = this.listeners.iterator();
- ConnectionEvent ce = new ConnectionEvent(this,
- ConnectionEvent.CONNECTION_CLOSED);
+ ConnectionEvent ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_CLOSED);
ce.setConnectionHandle(conn);
while (itr.hasNext()) {
itr.next().connectionClosed(ce);
@@ -287,8 +259,7 @@ public class JCAManagedConnection implements ManagedConnection
// safe to dissociate this managedconnection so that it can go to pool
if (this.initDone && !this.cache.isClosed()) {
this.localTran = new JCALocalTransaction(this.cache, this.gfTxMgr);
- }
- else {
+ } else {
this.localTran = new JCALocalTransaction();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
index fda8707..99cff78 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionFactory.java
@@ -1,18 +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
+ * 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.internal.ra.spi;
@@ -27,12 +25,12 @@ import javax.resource.spi.ManagedConnectionFactory;
import javax.security.auth.Subject;
import org.apache.geode.internal.ra.GFConnectionFactoryImpl;
+
/**
*
*
*/
-public class JCAManagedConnectionFactory implements ManagedConnectionFactory
-{
+public class JCAManagedConnectionFactory implements ManagedConnectionFactory {
private String productName;
private String version;
@@ -41,103 +39,83 @@ public class JCAManagedConnectionFactory implements ManagedConnectionFactory
private PrintWriter logger;
- public Object createConnectionFactory() throws ResourceException
- {
+ public Object createConnectionFactory() throws ResourceException {
return new GFConnectionFactoryImpl(this);
}
- public Object createConnectionFactory(ConnectionManager cm)
- throws ResourceException
- {
+ public Object createConnectionFactory(ConnectionManager cm) throws ResourceException {
return new GFConnectionFactoryImpl(cm, this);
}
- public ManagedConnection createManagedConnection(Subject arg0,
- ConnectionRequestInfo arg1) throws ResourceException
- {
+ public ManagedConnection createManagedConnection(Subject arg0, ConnectionRequestInfo arg1)
+ throws ResourceException {
return new JCAManagedConnection(this);
}
- public PrintWriter getLogWriter() throws ResourceException
- {
+ public PrintWriter getLogWriter() throws ResourceException {
return this.logger;
}
public ManagedConnection matchManagedConnections(Set arg0, Subject arg1,
- ConnectionRequestInfo arg2) throws ResourceException
- {
+ ConnectionRequestInfo arg2) throws ResourceException {
// TODO Auto-generated method stub
return null;
}
- public void setLogWriter(PrintWriter logger) throws ResourceException
- {
+ public void setLogWriter(PrintWriter logger) throws ResourceException {
this.logger = logger;
}
- public boolean equals(Object obj)
- {
+ public boolean equals(Object obj) {
if (obj instanceof JCAManagedConnectionFactory) {
return true;
- }
- else {
+ } else {
return false;
}
}
- public int hashCode()
- {
+ public int hashCode() {
return 0;
}
- public void setUserName(String user)
- {
+ public void setUserName(String user) {
if (this.logger != null) {
- logger.println("JCAManagedConnectionFactory::setUserName:. user name is="
- + user);
+ logger.println("JCAManagedConnectionFactory::setUserName:. user name is=" + user);
}
this.user = user;
}
- public String getUserName()
- {
+ public String getUserName() {
return this.user;
}
- public void setProductName(String name)
- {
+ public void setProductName(String name) {
if (this.logger != null) {
- logger
- .println("JCAManagedConnectionFactory::setProductName:. Product name is="
- + name);
+ logger.println("JCAManagedConnectionFactory::setProductName:. Product name is=" + name);
}
this.productName = name;
}
- public String getProductName()
- {
+ public String getProductName() {
return this.productName;
}
- public void setVersion(String version)
- {
+ public void setVersion(String version) {
if (this.logger != null) {
- logger.println("JCAManagedConnectionFactory::setVersion:. version is="
- + version);
+ logger.println("JCAManagedConnectionFactory::setVersion:. version is=" + version);
}
this.version = version;
}
- public String getVersion()
- {
+ public String getVersion() {
return this.version;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
----------------------------------------------------------------------
diff --git a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
index 6a04ac3..e6c7e6a 100644
--- a/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
+++ b/geode-core/src/jca/java/org/apache/geode/internal/ra/spi/JCAManagedConnectionMetaData.java
@@ -1,65 +1,58 @@
/*
- * 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
+ * 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.internal.ra.spi;
import javax.resource.ResourceException;
import javax.resource.spi.ManagedConnectionMetaData;
+
/**
*
*
*/
-public class JCAManagedConnectionMetaData implements ManagedConnectionMetaData
-{
+public class JCAManagedConnectionMetaData implements ManagedConnectionMetaData {
private final String prodName;
private final String version;
private final String user;
- public JCAManagedConnectionMetaData(String prodName, String version,
- String user) {
+ public JCAManagedConnectionMetaData(String prodName, String version, String user) {
this.prodName = prodName;
this.version = version;
this.user = user;
}
-
- public String getEISProductName() throws ResourceException
- {
+
+ public String getEISProductName() throws ResourceException {
return this.prodName;
}
-
- public String getEISProductVersion() throws ResourceException
- {
+
+ public String getEISProductVersion() throws ResourceException {
return this.version;
}
-
- public int getMaxConnections() throws ResourceException
- {
+
+ public int getMaxConnections() throws ResourceException {
return 0;
}
-
- public String getUserName() throws ResourceException
- {
+
+ public String getUserName() throws ResourceException {
return this.user;
}
[78/98] [abbrv] incubator-geode git commit: Adding 1.0.0-incubating
to the releases page
Posted by ds...@apache.org.
Adding 1.0.0-incubating to the releases page
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/60f8a808
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/60f8a808
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/60f8a808
Branch: refs/heads/feature/GEM-983
Commit: 60f8a808096d7d8c7ca74ad6545d63f88a42e888
Parents: 06de527
Author: Swapnil Bawaskar <sb...@pivotal.io>
Authored: Tue Oct 25 14:38:50 2016 -0700
Committer: Swapnil Bawaskar <sb...@pivotal.io>
Committed: Tue Oct 25 14:38:50 2016 -0700
----------------------------------------------------------------------
geode-site/website/content/releases/index.html | 51 +++++++++++++++++++++
1 file changed, 51 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60f8a808/geode-site/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/releases/index.html b/geode-site/website/content/releases/index.html
index c5d4971..51e3096 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -34,6 +34,57 @@ under the License. -->
</p>
<!-- RELEASES -->
<div class="container">
+ <!-- START OF 1.0 -->
+ <h3><span class="icon-flag-checkered"> 1.0.0-incubating</span></h3>
+ <!-- BINARY -->
+ <ul>
+ <span class="icon-cloud-download"> <strong>Binaries </strong>
+ [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip">ZIP</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.sha256">SHA-256</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.asc">PGP</a> ] -
+ [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz">TAR.GZ</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.sha256">SHA-256</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.asc">PGP</a> ]
+ </span>
+
+ <blockquote>Binary downloads are provided for the convenience of our users and are not official Apache Geode releases. </blockquote>
+ </li>
+ </ul>
+ <!-- SOURCE -->
+ <ul>
+ <span class="icon-cloud-download"> <strong>Source</strong>
+ [ <a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip">ZIP</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.sha256">SHA-256</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.asc">PGP</a>
+ ] -
+ [<a href="http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz">TAR.GZ</a>, <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.sha256">SHA-256</a>,
+ <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.asc">PGP</a>
+ ]
+ </span>
+ </li>
+ </ul>
+ <!-- DEPENDENCY MANAGERS -->
+ <div class="container">
+ <h4><span class="icon-archive"> Dependency Managers</span></h4>
+ <ul>
+ <li> <strong>Gradle</strong>
+ <pre class="prettyprint">
+ dependencies {
+ compile 'org.apache.geode:geode-core:1.0.0-incubating'
+ }</pre>
+ <!-- ><script src="https://gist.github.com/markito/b7796cafef4bd273bd07.js"></script>-->
+ </li>
+ <li> <strong>Maven</strong>
+ <pre class="prettyprint">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geode</groupId>
+ <artifactId>geode-core</artifactId>
+ <version>1.0.0-incubating</version>
+ </dependency>
+ </dependencies></pre>
+ </li>
+ </ul>
+ </div>
+ <!-- END OF 1.0 -->
+
<!-- START OF M3 -->
<h3><span class="icon-flag-checkered"> 1.0.0-incubating.M3</span></h3>
<!-- BINARY -->
[02/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
index a4d84a6..57a1a46 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
@@ -1,18 +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
+ * 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;
@@ -53,97 +51,100 @@ import org.apache.geode.security.GemFireSecurityException;
/**
- * DynamicRegionFactory provides a distributed region creation service.
- * Any other member of the GemFire DistributedSystem that has created
- * an instance of this class will automatically instantiate regions created
- * through the factory from anywhere else in the DistributedSystem.
- * <p><p>
+ * DynamicRegionFactory provides a distributed region creation service. Any other member of the
+ * GemFire DistributedSystem that has created an instance of this class will automatically
+ * instantiate regions created through the factory from anywhere else in the DistributedSystem.
+ * <p>
+ * <p>
* Instructions for Use:<br>
* <ul>
- * <li> If your application is a client in a client/server installation,
- * either specify the pool name in the
- * {@link DynamicRegionFactory.Config} you'll use to create a
- * DynamicRegionFactory <i>or</i> specify it
- * in a dynamic-region-factory element in your cache.xml.
+ * <li>If your application is a client in a client/server installation, either specify the pool name
+ * in the {@link DynamicRegionFactory.Config} you'll use to create a DynamicRegionFactory <i>or</i>
+ * specify it in a dynamic-region-factory element in your cache.xml.
*
- * <li> Before you've created a GemFire Cache in your application, add a
- * line of code as follows:<br>
- * <pre><code> DynamicRegionFactory factory = DynamicRegionFactory.get();
- * factory.open(config);</code></pre>
- * <pre><code> DynamicRegionFactory myFactoryHandle = DynamicRegionFactory.get().open(config);</code></pre>
+ * <li>Before you've created a GemFire Cache in your application, add a line of code as follows:<br>
+ *
+ * <pre>
+ * <code> DynamicRegionFactory factory = DynamicRegionFactory.get();
+ * factory.open(config);</code>
+ * </pre>
+ *
+ * <pre>
+ * <code> DynamicRegionFactory myFactoryHandle = DynamicRegionFactory.get().open(config);</code>
+ * </pre>
+ *
* or just use a dynamic-region-factory element in the cache.xml.
*
- * <li> Create the GemFire Cache. During cache creation, the list of dynamic Regions will either be discovered
- * by recovering
- * their names from disk (see {@link DynamicRegionFactory.Config#persistBackup}) or from other members of the
- * distributed system.
- * These dynamic Regions will be created before Cache creation completes.
+ * <li>Create the GemFire Cache. During cache creation, the list of dynamic Regions will either be
+ * discovered by recovering their names from disk (see
+ * {@link DynamicRegionFactory.Config#persistBackup}) or from other members of the distributed
+ * system. These dynamic Regions will be created before Cache creation completes.
*
- * <li> Thereafter, when you want to create dynamic distributed Regions,
- * create them using the {@link #createDynamicRegion}. Regions created with the factory will
- * inherit their RegionAttributes from their parent Region, though you can override
- * callbacks when you configure the factory.
+ * <li>Thereafter, when you want to create dynamic distributed Regions, create them using the
+ * {@link #createDynamicRegion}. Regions created with the factory will inherit their
+ * RegionAttributes from their parent Region, though you can override callbacks when you configure
+ * the factory.
*
- * <p>All other instances of GemFire across the distributed system that
- * instantiate and open a DynamicRegionFactory will also get the dynamic distributed Regions.
+ * <p>
+ * All other instances of GemFire across the distributed system that instantiate and open a
+ * DynamicRegionFactory will also get the dynamic distributed Regions.
*
* <li>Non-dynamic parent Regions should be declared in cache.xml so that they can be created before
- * the dynamic Region factory goes active and starts creating Regions. You will have cache creation
+ * the dynamic Region factory goes active and starts creating Regions. You will have cache creation
* problems if this isn't done.
*
- * <li>A DynamicRegionListener can be registered before open is called and before cache creation
- * so that the listener will be called if dynamic Regions are created during cache creation.
+ * <li>A DynamicRegionListener can be registered before open is called and before cache creation so
+ * that the listener will be called if dynamic Regions are created during cache creation.
*
* </ul>
- * <p>Saving the factory on disk:
- * If {@link DynamicRegionFactory.Config#persistBackup} is configured for the factory, dynamic Region information
- * is written to disk for recovery.
- * By default the current directory is used for this information. The {@link DynamicRegionFactory.Config#diskDir}
+ * <p>
+ * Saving the factory on disk: If {@link DynamicRegionFactory.Config#persistBackup} is configured
+ * for the factory, dynamic Region information is written to disk for recovery. By default the
+ * current directory is used for this information. The {@link DynamicRegionFactory.Config#diskDir}
* can be used to change this default.
* <p>
- * Registering interest in cache server information: The {@link DynamicRegionFactory.Config#registerInterest}
- * setting determines whether clients will register interest in server keys or not. You will generally want
- * this to be turned on so that clients will see updates made to servers. In server processes, DynamicRegionFactory
- * forces use of NotifyBySubscription.
+ * Registering interest in cache server information: The
+ * {@link DynamicRegionFactory.Config#registerInterest} setting determines whether clients will
+ * register interest in server keys or not. You will generally want this to be turned on so that
+ * clients will see updates made to servers. In server processes, DynamicRegionFactory forces use of
+ * NotifyBySubscription.
* </ul>
* <p>
* Notes:
* <ul>
* <li>DynamicRegionFactories in non-client VMs must not be configured with a pool.
- * <li>If {@link #open()} is called before cache creation and the cache.xml has a dynamic-region-factory
- * element then the cache.xml will override the open call's configuration.
+ * <li>If {@link #open()} is called before cache creation and the cache.xml has a
+ * dynamic-region-factory element then the cache.xml will override the open call's configuration.
*
- * <li>Since the RegionAttributes of a dynamically created Region are copied
- * from the parent Region, any callbacks, ({@link CacheListener},
- * {@link CacheWriter}, and {@link CacheLoader}
- * are shared by the parent and all its dynamic children
- * so make sure the callback is thread-safe and that its
- * {@link CacheCallback#close} implementation does not stop it from functioning.
- * However the products LRUAlgorithm instances will
- * be cloned so that each dynamic Region has its own callback.
+ * <li>Since the RegionAttributes of a dynamically created Region are copied from the parent Region,
+ * any callbacks, ({@link CacheListener}, {@link CacheWriter}, and {@link CacheLoader} are shared by
+ * the parent and all its dynamic children so make sure the callback is thread-safe and that its
+ * {@link CacheCallback#close} implementation does not stop it from functioning. However the
+ * products LRUAlgorithm instances will be cloned so that each dynamic Region has its own callback.
*
- * <li>The root Region name "DynamicRegions" is reserved. The factory creates a root Region of
- * that name and uses it to keep track of what dynamic Regions exist. Applications should
- * not directly access this Region; instead use the methods on this factory.
+ * <li>The root Region name "DynamicRegions" is reserved. The factory creates a root Region of that
+ * name and uses it to keep track of what dynamic Regions exist. Applications should not directly
+ * access this Region; instead use the methods on this factory.
* </ul>
+ *
* @since GemFire 4.3
- * @deprecated This class is deprecated. Use {@link FunctionService} to create regions on
- * other members instead.
+ * @deprecated This class is deprecated. Use {@link FunctionService} to create regions on other
+ * members instead.
*
*/
@SuppressWarnings("deprecation")
@Deprecated
-public abstract class DynamicRegionFactory {
+public abstract class DynamicRegionFactory {
public static final String dynamicRegionListName = "__DynamicRegions";
private Region dynamicRegionList = null;
/**
- * This controls the delay introduced to try and avoid any race conditions
- * between propagation of newly created Dynamic Regions
- * and the Entries put into them.
+ * This controls the delay introduced to try and avoid any race conditions between propagation of
+ * newly created Dynamic Regions and the Entries put into them.
*/
- private static final long regionCreateSleepMillis = Long.getLong("DynamicRegionFactory.msDelay", 250).longValue();
- private static DynamicRegionFactory singleInstance = new DynamicRegionFactoryImpl ( );
+ private static final long regionCreateSleepMillis =
+ Long.getLong("DynamicRegionFactory.msDelay", 250).longValue();
+ private static DynamicRegionFactory singleInstance = new DynamicRegionFactoryImpl();
GemFireCacheImpl c = null;
Config config = null;
@@ -159,36 +160,40 @@ public abstract class DynamicRegionFactory {
}
/**
- * Opens the factory with the given settings.
- * This should be sent to the factory before creating a cache. The cache
- * will otherwise open a factory with default settings.
- * This does not need to be sent if the cache.xml declares the use of dynamic regions.
+ * Opens the factory with the given settings. This should be sent to the factory before creating a
+ * cache. The cache will otherwise open a factory with default settings. This does not need to be
+ * sent if the cache.xml declares the use of dynamic regions.
+ *
* @param conf the configuration for this factory.
*/
public void open(Config conf) {
this.config = new Config(conf);
}
+
/**
- * Closes the dynamic region factory, disabling any further creation or
- * destruction of dynamic regions in this cache.
+ * Closes the dynamic region factory, disabling any further creation or destruction of dynamic
+ * regions in this cache.
*/
protected void _close() {
this.config = null;
this.c = null;
}
+
/**
* Returns true if dynamic region factory is open; false if closed.
*/
public boolean isOpen() {
return getConfig() != null;
}
+
/**
- * Returns true if this factory is open and can produce dynamic regions.
- * Factories are only active after their cache has been created.
+ * Returns true if this factory is open and can produce dynamic regions. Factories are only active
+ * after their cache has been created.
*/
public boolean isActive() {
return isOpen() && this.c != null;
}
+
/**
* Returns true if dynamic region factory is closed.
*/
@@ -197,8 +202,7 @@ public abstract class DynamicRegionFactory {
}
/**
- * Returns the configuration for this factory.
- * Returns null if the factory is closed;
+ * Returns the configuration for this factory. Returns null if the factory is closed;
*/
public Config getConfig() {
if (this.config == null)
@@ -213,53 +217,53 @@ public abstract class DynamicRegionFactory {
/**
* The method is for internal use only. It is called implicitly during cache creation.
+ *
* @param theCache The GemFire <code>Cache</code>
* @throws CacheException
*/
- protected void _internalInit ( GemFireCacheImpl theCache ) throws CacheException
- {
+ protected void _internalInit(GemFireCacheImpl theCache) throws CacheException {
if (isClosed()) {
// DynamicRegions are not enabled in this vm. Just return.
return;
}
/**
- * This method is called internally during cache initialization at the correct time.
- * Initialize the factory with a GemFire Cache. We create the metadata Region which holds all our
+ * This method is called internally during cache initialization at the correct time. Initialize
+ * the factory with a GemFire Cache. We create the metadata Region which holds all our
* dynamically created regions.
*/
try {
this.c = theCache;
this.dynamicRegionList = theCache.getRegion(dynamicRegionListName);
- final boolean isClient = this.config.getPoolName()!=null;
+ final boolean isClient = this.config.getPoolName() != null;
if (this.dynamicRegionList == null) {
- InternalRegionArguments ira = new InternalRegionArguments()
- .setDestroyLockFlag(true)
- .setInternalRegion(true)
- .setSnapshotInputStream(null)
- .setImageTarget(null);
- AttributesFactory af = new AttributesFactory ();
+ InternalRegionArguments ira = new InternalRegionArguments().setDestroyLockFlag(true)
+ .setInternalRegion(true).setSnapshotInputStream(null).setImageTarget(null);
+ AttributesFactory af = new AttributesFactory();
if (this.config.getPersistBackup()) {
af.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE);
af.setDiskWriteAttributes(new DiskWriteAttributesFactory().create());
if (this.config.getDiskDir() != null) {
- af.setDiskDirs(new File[]{this.config.getDiskDir()});
+ af.setDiskDirs(new File[] {this.config.getDiskDir()});
}
}
if (isClient) {
af.setScope(Scope.LOCAL);
- af.setDataPolicy(DataPolicy.NORMAL); //MirrorType(MirrorType.NONE);
+ af.setDataPolicy(DataPolicy.NORMAL); // MirrorType(MirrorType.NONE);
af.setStatisticsEnabled(true);
String cpName = this.config.getPoolName();
if (cpName != null) {
Pool cp = PoolManager.find(cpName);
- if(cp==null) {
- throw new IllegalStateException("Invalid pool name specified. This pool is not registered with the cache: " + cpName);
+ if (cp == null) {
+ throw new IllegalStateException(
+ "Invalid pool name specified. This pool is not registered with the cache: "
+ + cpName);
} else {
if (!cp.getSubscriptionEnabled()) {
- throw new IllegalStateException("The client pool of a DynamicRegionFactory must be configured with queue-enabled set to true.");
+ throw new IllegalStateException(
+ "The client pool of a DynamicRegionFactory must be configured with queue-enabled set to true.");
}
af.setPoolName(cpName);
}
@@ -267,9 +271,10 @@ public abstract class DynamicRegionFactory {
ira.setInternalMetaRegion(new LocalMetaRegion(af.create(), ira));
} else {
af.setScope(Scope.DISTRIBUTED_ACK);
- if (!this.config.getPersistBackup()) { // if persistBackup, the data policy has already been set
- af.setDataPolicy(DataPolicy.REPLICATE); //setMirrorType(MirrorType.KEYS_VALUES);
- }
+ if (!this.config.getPersistBackup()) { // if persistBackup, the data policy has already
+ // been set
+ af.setDataPolicy(DataPolicy.REPLICATE); // setMirrorType(MirrorType.KEYS_VALUES);
+ }
for (GatewaySender gs : c.getGatewaySenders()) {
if (!gs.isParallel())
@@ -277,19 +282,19 @@ public abstract class DynamicRegionFactory {
}
ira.setInternalMetaRegion(new DistributedMetaRegion(af.create())); // bug fix 35432
}
-
- try {
- dynamicRegionList = theCache.createVMRegion(dynamicRegionListName, af.create(), ira);
- }
- catch (IOException e) {
+
+ try {
+ dynamicRegionList = theCache.createVMRegion(dynamicRegionListName, af.create(), ira);
+ } catch (IOException e) {
// only if loading snapshot, not here
- InternalGemFireError assErr = new InternalGemFireError(LocalizedStrings.DynamicRegionFactory_UNEXPECTED_EXCEPTION.toLocalizedString());
+ InternalGemFireError assErr = new InternalGemFireError(
+ LocalizedStrings.DynamicRegionFactory_UNEXPECTED_EXCEPTION.toLocalizedString());
assErr.initCause(e);
throw assErr;
- }
- catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e) {
// only if loading snapshot, not here
- InternalGemFireError assErr = new InternalGemFireError(LocalizedStrings.DynamicRegionFactory_UNEXPECTED_EXCEPTION.toLocalizedString());
+ InternalGemFireError assErr = new InternalGemFireError(
+ LocalizedStrings.DynamicRegionFactory_UNEXPECTED_EXCEPTION.toLocalizedString());
assErr.initCause(e);
throw assErr;
}
@@ -305,40 +310,41 @@ public abstract class DynamicRegionFactory {
}
}
- createDefinedDynamicRegions ( );
+ createDefinedDynamicRegions();
- } catch ( CacheException e ) {
+ } catch (CacheException e) {
//
- theCache.getLoggerI18n().warning(LocalizedStrings.DynamicRegionFactory_ERROR_INITIALIZING_DYNAMICREGIONFACTORY, e);
+ theCache.getLoggerI18n().warning(
+ LocalizedStrings.DynamicRegionFactory_ERROR_INITIALIZING_DYNAMICREGIONFACTORY, e);
throw e;
}
}
/**
- * This creates Dynamic Regions that already exist in other publishing processes
+ * This creates Dynamic Regions that already exist in other publishing processes
*
*/
- private void createDefinedDynamicRegions ( ) throws CacheException {
+ private void createDefinedDynamicRegions() throws CacheException {
// TODO: perhaps add some logic here to avoid the possiblity of synchronization issues . . . .
- Set s = dynamicRegionList.entrySet( false );
+ Set s = dynamicRegionList.entrySet(false);
Iterator i = s.iterator();
TreeMap sorted = new TreeMap();
// sort by region name before creating (bug 35528)
- while ( i.hasNext() ) {
- Region.Entry e = (Region.Entry)i.next();
- DynamicRegionAttributes dda = (DynamicRegionAttributes)e.getValue();
+ while (i.hasNext()) {
+ Region.Entry e = (Region.Entry) i.next();
+ DynamicRegionAttributes dda = (DynamicRegionAttributes) e.getValue();
sorted.put(dda.rootRegionName + "/" + dda.name, dda);
}
i = sorted.values().iterator();
-
- while ( i.hasNext() ) {
- DynamicRegionAttributes dda = (DynamicRegionAttributes)i.next();
- doBeforeRegionCreated ( dda.rootRegionName, dda.name, null );
- Region region = createDynamicRegionImpl ( dda.rootRegionName, dda.name, false );
- doAfterRegionCreated ( region, false, false, null );
+ while (i.hasNext()) {
+ DynamicRegionAttributes dda = (DynamicRegionAttributes) i.next();
+
+ doBeforeRegionCreated(dda.rootRegionName, dda.name, null);
+ Region region = createDynamicRegionImpl(dda.rootRegionName, dda.name, false);
+ doAfterRegionCreated(region, false, false, null);
}
@@ -346,6 +352,7 @@ public abstract class DynamicRegionFactory {
/**
* Returns the <code>DynamicRegionFactory</code> singleton instance.
+ *
* @return the <code>DynamicRegionFactory</code> singleton instance
*/
public static DynamicRegionFactory get() {
@@ -354,6 +361,7 @@ public abstract class DynamicRegionFactory {
/**
* Registers a <code>DynamicRegionListener</code> for callbacks.
+ *
* @param listener The <code>DynamicRegionListener</code> to be registered
*/
public void registerDynamicRegionListener(DynamicRegionListener listener) {
@@ -369,6 +377,7 @@ public abstract class DynamicRegionFactory {
/**
* Unregisters a <code>DynamicRegionListener</code> for callbacks.
+ *
* @param listener The <code>DynamicRegionListener</code> to be unregistered
*/
public void unregisterDynamicRegionListener(DynamicRegionListener listener) {
@@ -383,192 +392,200 @@ public abstract class DynamicRegionFactory {
}
}
- private void doBeforeRegionCreated( String parentRegion, String regionName, DistributedMember mbr ) {
- for ( Iterator i = regionListeners.iterator(); i.hasNext(); ) {
- DynamicRegionListener listener = ( DynamicRegionListener ) i.next();
+ private void doBeforeRegionCreated(String parentRegion, String regionName,
+ DistributedMember mbr) {
+ for (Iterator i = regionListeners.iterator(); i.hasNext();) {
+ DynamicRegionListener listener = (DynamicRegionListener) i.next();
try {
- listener.beforeRegionCreate( parentRegion, regionName );
- }
- catch (VirtualMachineError err) {
+ listener.beforeRegionCreate(parentRegion, regionName);
+ } catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- this.c.getLoggerI18n().warning(LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_BEFOREREGIONCREATED, listener, t);
+ this.c.getLoggerI18n().warning(
+ LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_BEFOREREGIONCREATED,
+ listener, t);
}
}
}
- private void doAfterRegionCreated( Region region, boolean distributed, boolean isOriginRemote, DistributedMember mbr ) {
- RegionEvent event = new RegionEventImpl(region, Operation.REGION_CREATE, null, isOriginRemote, getMember(mbr));
- for ( Iterator i = regionListeners.iterator(); i.hasNext(); ) {
- DynamicRegionListener listener = ( DynamicRegionListener ) i.next();
+ private void doAfterRegionCreated(Region region, boolean distributed, boolean isOriginRemote,
+ DistributedMember mbr) {
+ RegionEvent event =
+ new RegionEventImpl(region, Operation.REGION_CREATE, null, isOriginRemote, getMember(mbr));
+ for (Iterator i = regionListeners.iterator(); i.hasNext();) {
+ DynamicRegionListener listener = (DynamicRegionListener) i.next();
try {
- listener.afterRegionCreate( event /*region*/ );
- }
- catch (VirtualMachineError err) {
+ listener.afterRegionCreate(event /* region */ );
+ } catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- this.c.getLoggerI18n().warning(LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_AFTERREGIONCREATED, listener, t);
+ this.c.getLoggerI18n().warning(
+ LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_AFTERREGIONCREATED,
+ listener, t);
}
}
}
- private void doBeforeRegionDestroyed( Region region, boolean distributed, boolean isOriginRemote, boolean expiration, DistributedMember mbr ) {
+ private void doBeforeRegionDestroyed(Region region, boolean distributed, boolean isOriginRemote,
+ boolean expiration, DistributedMember mbr) {
final Operation op;
if (!distributed && !isOriginRemote) {
- op = expiration? Operation.REGION_EXPIRE_LOCAL_DESTROY : Operation.REGION_LOCAL_DESTROY;
- }
- else {
- op = expiration? Operation.REGION_EXPIRE_DESTROY : Operation.REGION_DESTROY;
+ op = expiration ? Operation.REGION_EXPIRE_LOCAL_DESTROY : Operation.REGION_LOCAL_DESTROY;
+ } else {
+ op = expiration ? Operation.REGION_EXPIRE_DESTROY : Operation.REGION_DESTROY;
}
RegionEvent event = new RegionEventImpl(region, op, null, isOriginRemote, getMember(mbr));
- for ( Iterator i = regionListeners.iterator(); i.hasNext(); ) {
- DynamicRegionListener listener = ( DynamicRegionListener ) i.next();
+ for (Iterator i = regionListeners.iterator(); i.hasNext();) {
+ DynamicRegionListener listener = (DynamicRegionListener) i.next();
try {
- listener.beforeRegionDestroy( event /*fullRegionName*/ );
- }
- catch (VirtualMachineError err) {
+ listener.beforeRegionDestroy(event /* fullRegionName */ );
+ } catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- this.c.getLoggerI18n().warning(LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_BEFOREREGIONDESTROYED, listener, t);
+ this.c.getLoggerI18n().warning(
+ LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_BEFOREREGIONDESTROYED,
+ listener, t);
}
}
}
- private void doAfterRegionDestroyed( Region region, boolean distributed, boolean isOriginRemote, boolean expiration, DistributedMember mbr ) {
+ private void doAfterRegionDestroyed(Region region, boolean distributed, boolean isOriginRemote,
+ boolean expiration, DistributedMember mbr) {
final Operation op;
if (!distributed && !isOriginRemote) {
- op = expiration? Operation.REGION_EXPIRE_LOCAL_DESTROY : Operation.REGION_LOCAL_DESTROY;
- }
- else {
- op = expiration? Operation.REGION_EXPIRE_DESTROY : Operation.REGION_DESTROY;
+ op = expiration ? Operation.REGION_EXPIRE_LOCAL_DESTROY : Operation.REGION_LOCAL_DESTROY;
+ } else {
+ op = expiration ? Operation.REGION_EXPIRE_DESTROY : Operation.REGION_DESTROY;
}
RegionEvent event = new RegionEventImpl(region, op, null, isOriginRemote, getMember(mbr));
- for ( Iterator i = regionListeners.iterator(); i.hasNext(); ) {
- DynamicRegionListener listener = ( DynamicRegionListener ) i.next();
+ for (Iterator i = regionListeners.iterator(); i.hasNext();) {
+ DynamicRegionListener listener = (DynamicRegionListener) i.next();
try {
- listener.afterRegionDestroy( event /*fullRegionName*/ );
- }
- catch (VirtualMachineError err) {
+ listener.afterRegionDestroy(event /* fullRegionName */ );
+ } catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- this.c.getLoggerI18n().warning(LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_AFTERREGIONDESTROYED, listener, t);
+ this.c.getLoggerI18n().warning(
+ LocalizedStrings.DynamicRegionFactory_DYNAMICREGIONLISTENER__0__THREW_EXCEPTION_ON_AFTERREGIONDESTROYED,
+ listener, t);
}
}
}
-
+
/** return the argument, or if null the DistributedMember id of this vm */
private DistributedMember getMember(DistributedMember mbr) {
if (mbr == null) {
return InternalDistributedSystem.getAnyInstance().getDistributedMember();
- }
- else {
- return null;
+ } else {
+ return null;
}
}
-
+
/**
- * Creates the dynamic Region in the local cache and distributes the
- * creation to other caches.
+ * Creates the dynamic Region in the local cache and distributes the creation to other caches.
*
* @param parentRegionName the new region is created as a subregion of the region having this path
* @param regionName the name of the new subregion
* @return the <code>Region</code> created
* @throws CacheException
*/
- public Region createDynamicRegion ( String parentRegionName, String regionName ) throws CacheException {
+ public Region createDynamicRegion(String parentRegionName, String regionName)
+ throws CacheException {
if (isClosed()) {
throw new IllegalStateException("Dynamic region factory is closed");
}
- doBeforeRegionCreated ( parentRegionName, regionName, null );
- Region region = createDynamicRegionImpl ( parentRegionName, regionName, true );
- doAfterRegionCreated ( region, false, false, null );
+ doBeforeRegionCreated(parentRegionName, regionName, null);
+ Region region = createDynamicRegionImpl(parentRegionName, regionName, true);
+ doAfterRegionCreated(region, false, false, null);
return region;
}
/**
- * Destroys the dynamic Region in the local cache and distributes the
- * destruction to other caches.
- * @param fullRegionName The full path of the <code>Region</code> to be
- * dynamically destroyed
+ * Destroys the dynamic Region in the local cache and distributes the destruction to other caches.
+ *
+ * @param fullRegionName The full path of the <code>Region</code> to be dynamically destroyed
* @throws CacheException
- * @throws RegionDestroyedException if the dynamic region was never created
- * or has already been destroyed
+ * @throws RegionDestroyedException if the dynamic region was never created or has already been
+ * destroyed
*/
- public void destroyDynamicRegion ( String fullRegionName ) throws CacheException {
+ public void destroyDynamicRegion(String fullRegionName) throws CacheException {
if (!dynamicRegionList.containsKey(fullRegionName)) {
- throw new RegionDestroyedException(LocalizedStrings.DynamicRegionFactory_DYNAMIC_REGION_0_HAS_NOT_BEEN_CREATED.toLocalizedString(fullRegionName), fullRegionName);
+ throw new RegionDestroyedException(
+ LocalizedStrings.DynamicRegionFactory_DYNAMIC_REGION_0_HAS_NOT_BEEN_CREATED
+ .toLocalizedString(fullRegionName),
+ fullRegionName);
}
if (isClosed()) {
throw new IllegalStateException("Dynamic region factory is closed");
}
// Retrieve the region to destroy
- Region region = c.getRegion( fullRegionName );
+ Region region = c.getRegion(fullRegionName);
if (region != null) {
DistributedMember mbr = getMember(null);
- doBeforeRegionDestroyed ( region, false, false, false, mbr );
+ doBeforeRegionDestroyed(region, false, false, false, mbr);
// Locally destroy the region. Let the dynamicRegionList handle distributing
// the destroy.
region.localDestroyRegion();
destroyDynamicRegionImpl(fullRegionName);
- doAfterRegionDestroyed ( region, false, false, false, mbr );
+ doAfterRegionDestroyed(region, false, false, false, mbr);
} else {
// make sure meta region is cleaned up locally and remotely
destroyDynamicRegionImpl(fullRegionName);
}
}
- private Region createDynamicRegionImpl ( String parentRegionName, String newRegionName, boolean addEntry )
- throws CacheException {
+ private Region createDynamicRegionImpl(String parentRegionName, String newRegionName,
+ boolean addEntry) throws CacheException {
- Region parentRegion = c.getRegion ( parentRegionName );
+ Region parentRegion = c.getRegion(parentRegionName);
Region newRegion = null;
- if ( parentRegion == null ) {
- String errMsg = LocalizedStrings.DynamicRegionFactory_ERROR__COULD_NOT_FIND_A_REGION_NAMED___0_.toLocalizedString(parentRegionName);
+ if (parentRegion == null) {
+ String errMsg =
+ LocalizedStrings.DynamicRegionFactory_ERROR__COULD_NOT_FIND_A_REGION_NAMED___0_
+ .toLocalizedString(parentRegionName);
RegionDestroyedException e = new RegionDestroyedException(errMsg, parentRegionName);
- c.getLoggerI18n().warning(LocalizedStrings.DynamicRegionFactory_ERROR__COULD_NOT_FIND_A_REGION_NAMED___0_, parentRegionName, e);
+ c.getLoggerI18n().warning(
+ LocalizedStrings.DynamicRegionFactory_ERROR__COULD_NOT_FIND_A_REGION_NAMED___0_,
+ parentRegionName, e);
throw e;
}
@@ -576,12 +593,12 @@ public abstract class DynamicRegionFactory {
RegionAttributes rra = parentRegion.getAttributes();
RegionAttributes newRegionAttributes = null;
- AttributesFactory af = new AttributesFactory( rra );
+ AttributesFactory af = new AttributesFactory(rra);
{
EvictionAttributes ev = rra.getEvictionAttributes();
if (ev != null && ev.getAlgorithm().isLRU()) {
- EvictionAttributes rev = new EvictionAttributesImpl( (EvictionAttributesImpl)ev );
- af.setEvictionAttributes( rev );
+ EvictionAttributes rev = new EvictionAttributesImpl((EvictionAttributesImpl) ev);
+ af.setEvictionAttributes(rev);
}
}
@@ -591,105 +608,112 @@ public abstract class DynamicRegionFactory {
if (newRegionName.endsWith("_PRTEST_")) {
af.setPartitionAttributes((new PartitionAttributesFactory()).create());
}
-
+
newRegionAttributes = af.create();
try {
- newRegion = parentRegion.createSubregion( newRegionName, newRegionAttributes );
+ newRegion = parentRegion.createSubregion(newRegionName, newRegionAttributes);
c.getLoggerI18n().fine("Created dynamic region " + newRegion);
} catch (RegionExistsException ex) {
// a race condition exists that can cause this so just fine log it
- c.getLoggerI18n().fine("DynamicRegion " + newRegionName + " in parent " + parentRegionName + " already existed");
+ c.getLoggerI18n().fine(
+ "DynamicRegion " + newRegionName + " in parent " + parentRegionName + " already existed");
newRegion = ex.getRegion();
-// } catch ( CacheException e ) {
-// c.getLoggerI18n().warning ( "Error creating new Dynamic Region '" + newRegionName, e );
-// throw e;
+ // } catch ( CacheException e ) {
+ // c.getLoggerI18n().warning ( "Error creating new Dynamic Region '" + newRegionName, e );
+ // throw e;
}
if (addEntry) {
- DynamicRegionAttributes dra = new DynamicRegionAttributes ( );
+ DynamicRegionAttributes dra = new DynamicRegionAttributes();
dra.name = newRegionName;
dra.rootRegionName = parentRegion.getFullPath();
if (c.getLoggerI18n().fineEnabled()) {
- c.getLoggerI18n().fine ("Putting entry into dynamic region list at key: " + newRegion.getFullPath());
+ c.getLoggerI18n()
+ .fine("Putting entry into dynamic region list at key: " + newRegion.getFullPath());
}
- dynamicRegionList.put ( newRegion.getFullPath(), dra );
+ dynamicRegionList.put(newRegion.getFullPath(), dra);
}
if (config.getRegisterInterest()) {
- ServerRegionProxy proxy = ((LocalRegion)newRegion).getServerProxy();
+ ServerRegionProxy proxy = ((LocalRegion) newRegion).getServerProxy();
if (proxy != null) {
- if (((Pool)proxy.getPool()).getSubscriptionEnabled()) {
+ if (((Pool) proxy.getPool()).getSubscriptionEnabled()) {
try {
newRegion.registerInterest("ALL_KEYS");
- }
- catch (GemFireSecurityException ex) {
+ } catch (GemFireSecurityException ex) {
// Ignore security exceptions here
c.getSecurityLoggerI18n().warning(
- LocalizedStrings.DynamicRegionFactory_EXCEPTION_WHEN_REGISTERING_INTEREST_FOR_ALL_KEYS_IN_DYNAMIC_REGION_0_1,
- new Object[] {newRegion.getFullPath(), ex});
+ LocalizedStrings.DynamicRegionFactory_EXCEPTION_WHEN_REGISTERING_INTEREST_FOR_ALL_KEYS_IN_DYNAMIC_REGION_0_1,
+ new Object[] {newRegion.getFullPath(), ex});
}
}
}
}
-
+
if (regionCreateSleepMillis > 0) {
try {
- Thread.sleep( regionCreateSleepMillis );
- } catch ( InterruptedException e ) {
+ Thread.sleep(regionCreateSleepMillis);
+ } catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
}
if (c.getLoggerI18n().fineEnabled()) {
- c.getLoggerI18n().fine ( "Created Dynamic Region " + newRegion.getFullPath() );
+ c.getLoggerI18n().fine("Created Dynamic Region " + newRegion.getFullPath());
}
return newRegion;
}
- private void destroyDynamicRegionImpl(String fullRegionName)
- throws CacheException {
+ private void destroyDynamicRegionImpl(String fullRegionName) throws CacheException {
// Destroy the entry in the dynamicRegionList
try {
if (c.getLoggerI18n().fineEnabled()) {
- c.getLoggerI18n().fine ("Destroying entry from dynamic region list at key: " + fullRegionName);
+ c.getLoggerI18n()
+ .fine("Destroying entry from dynamic region list at key: " + fullRegionName);
}
- dynamicRegionList.destroy ( fullRegionName );
+ dynamicRegionList.destroy(fullRegionName);
} catch (CacheException e) {
- c.getLoggerI18n().warning(LocalizedStrings.DynamicRegionFactory_ERROR_DESTROYING_DYNAMIC_REGION__0, fullRegionName, e);
+ c.getLoggerI18n().warning(
+ LocalizedStrings.DynamicRegionFactory_ERROR_DESTROYING_DYNAMIC_REGION__0, fullRegionName,
+ e);
throw e;
}
if (c.getLoggerI18n().fineEnabled()) {
- c.getLoggerI18n().fine ( "Destroyed Dynamic Region " + fullRegionName );
+ c.getLoggerI18n().fine("Destroyed Dynamic Region " + fullRegionName);
}
}
/**
- * Configuration for dynamic region factory.
- * The default attributes are:
+ * Configuration for dynamic region factory. The default attributes are:
* <ul>
* <li>diskDir: <code>null</code>
* <li>poolName: <code>null</code>
* <li>persistBackup: <code>true</code>
* <li>registerInterest: <code>true</code>
* </ul>
+ *
* @since GemFire 4.3
*/
- public static class Config {
- private static final boolean DISABLE_REGISTER_INTEREST = Boolean.getBoolean("DynamicRegionFactory.disableRegisterInterest");
- private static final boolean DISABLE_PERSIST_BACKUP = Boolean.getBoolean("DynamicRegionFactory.disablePersistence");
+ public static class Config {
+ private static final boolean DISABLE_REGISTER_INTEREST =
+ Boolean.getBoolean("DynamicRegionFactory.disableRegisterInterest");
+ private static final boolean DISABLE_PERSIST_BACKUP =
+ Boolean.getBoolean("DynamicRegionFactory.disablePersistence");
- /** Causes the factory to be persisted on disk. See {@link #diskDir} */
+ /** Causes the factory to be persisted on disk. See {@link #diskDir} */
public final boolean persistBackup;
/** The directory where the factory's {@link #persistBackup} files are placed */
public final File diskDir;
- /** Causes regions created by the factory to register interest in all keys in a corresponding server cache region */
+ /**
+ * Causes regions created by the factory to register interest in all keys in a corresponding
+ * server cache region
+ */
public final boolean registerInterest;
-
+
/**
- * The ${link Pool} to be used by a client factory to communicate with
- * the server-side factory.
+ * The ${link Pool} to be used by a client factory to communicate with the server-side factory.
*/
public final String poolName;
@@ -706,15 +730,11 @@ public abstract class DynamicRegionFactory {
public Config(File diskDir, String poolName) {
this(diskDir, poolName, !DISABLE_PERSIST_BACKUP, !DISABLE_REGISTER_INTEREST);
}
+
/**
* Creates a configuration with the given attributes
*/
- public Config(
- File diskDir,
- String poolName,
- boolean persistBackup,
- boolean registerInterest)
- {
+ public Config(File diskDir, String poolName, boolean persistBackup, boolean registerInterest) {
this.registerInterest = registerInterest;
this.persistBackup = persistBackup;
this.diskDir = diskDir;
@@ -764,34 +784,33 @@ public abstract class DynamicRegionFactory {
public boolean getPersistBackup() {
return this.persistBackup;
}
-
+
/**
- * Returns true if the region will register interest in all keys of a corresponding
- * server cache region
+ * Returns true if the region will register interest in all keys of a corresponding server cache
+ * region
*/
public boolean getRegisterInterest() {
return this.registerInterest;
}
-
+
/**
- * Returns the disk directory that the dynamic region factory data
- * will be written to.
- * Returns null if no directory has been specified.
- * The diskDir is only used if <code>persistBackup</code> is true.
+ * Returns the disk directory that the dynamic region factory data will be written to. Returns
+ * null if no directory has been specified. The diskDir is only used if
+ * <code>persistBackup</code> is true.
*/
public File getDiskDir() {
return this.diskDir;
}
-
-
+
+
/**
- * Returns the name of the {@link Pool} associated with the dynamic region factory.
- * Returns null if there is no connection pool for dynamic regions.
+ * Returns the name of the {@link Pool} associated with the dynamic region factory. Returns null
+ * if there is no connection pool for dynamic regions.
*/
public String getPoolName() {
return this.poolName;
}
-
+
/** create a new Config with settings from another one */
Config(Config conf) {
this.diskDir = conf.diskDir;
@@ -800,28 +819,31 @@ public abstract class DynamicRegionFactory {
this.poolName = conf.poolName;
}
}
-
+
protected void buildDynamicRegion(EntryEvent event) {
if (!DynamicRegionFactory.this.isOpen())
return;
-
+
// Ignore the callback if it originated in this process (because the region
// will already have been created) and the event is not a client event
- if ( !event.isOriginRemote() && !event.isBridgeEvent() ) return;
+ if (!event.isOriginRemote() && !event.isBridgeEvent())
+ return;
//
- DynamicRegionAttributes dra = (DynamicRegionAttributes)event.getNewValue();
+ DynamicRegionAttributes dra = (DynamicRegionAttributes) event.getNewValue();
String parentRegionName = dra.rootRegionName;
String newRegionName = dra.name;
try {
- doBeforeRegionCreated ( parentRegionName, newRegionName, event.getDistributedMember() );
- Region region = createDynamicRegionImpl ( parentRegionName, newRegionName, false);
- doAfterRegionCreated ( region, true, true, event.getDistributedMember() );
- } catch ( Exception e ) {
- c.getLoggerI18n().warning(LocalizedStrings.DynamicRegionFactory_ERROR_ATTEMPTING_TO_LOCALLY_CREATE_DYNAMIC_REGION__0, newRegionName, e);
+ doBeforeRegionCreated(parentRegionName, newRegionName, event.getDistributedMember());
+ Region region = createDynamicRegionImpl(parentRegionName, newRegionName, false);
+ doAfterRegionCreated(region, true, true, event.getDistributedMember());
+ } catch (Exception e) {
+ c.getLoggerI18n().warning(
+ LocalizedStrings.DynamicRegionFactory_ERROR_ATTEMPTING_TO_LOCALLY_CREATE_DYNAMIC_REGION__0,
+ newRegionName, e);
}
}
-
+
protected void razeDynamicRegion(EntryEvent event) {
if (!DynamicRegionFactory.this.isOpen())
return;
@@ -830,65 +852,69 @@ public abstract class DynamicRegionFactory {
// "local" events. If this is a true local then c.getRegion will return
// null and this code will do nothing.
// When bug 35644 fixed the following "if" can be uncommented.
-// // Ignore the callback if it originated in this process (because the region
-// // will already have been destroyed)
-// if ( !event.isOriginRemote() && !(event instanceof BridgeEntryEventImpl)) return;
+ // // Ignore the callback if it originated in this process (because the region
+ // // will already have been destroyed)
+ // if ( !event.isOriginRemote() && !(event instanceof BridgeEntryEventImpl)) return;
- String fullRegionName = ( String ) event.getKey();
- Region drRegion = c.getRegion( fullRegionName );
+ String fullRegionName = (String) event.getKey();
+ Region drRegion = c.getRegion(fullRegionName);
if (drRegion != null) {
try {
- doBeforeRegionDestroyed ( drRegion, true, event.getOperation().isDistributed(), event.getOperation().isExpiration(), event.getDistributedMember() );
+ doBeforeRegionDestroyed(drRegion, true, event.getOperation().isDistributed(),
+ event.getOperation().isExpiration(), event.getDistributedMember());
drRegion.localDestroyRegion();
- doAfterRegionDestroyed ( drRegion, true, event.getOperation().isDistributed(), event.getOperation().isExpiration(), event.getDistributedMember() );
- } catch ( Exception e ) {
- c.getLoggerI18n().warning(LocalizedStrings.DynamicRegionFactory_ERROR_ATTEMPTING_TO_LOCALLY_DESTROY_DYNAMIC_REGION__0, fullRegionName, e);
+ doAfterRegionDestroyed(drRegion, true, event.getOperation().isDistributed(),
+ event.getOperation().isExpiration(), event.getDistributedMember());
+ } catch (Exception e) {
+ c.getLoggerI18n().warning(
+ LocalizedStrings.DynamicRegionFactory_ERROR_ATTEMPTING_TO_LOCALLY_DESTROY_DYNAMIC_REGION__0,
+ fullRegionName, e);
}
}
}
-
-// private class DRListener implements CacheListener {
-// public void afterCreate(EntryEvent arg0) {
-// buildDynamicRegion(arg0);
-// }
-//
-// public void afterDestroy(EntryEvent arg0) {
-// razeDynamicRegion(arg0);
-// }
-//
-// public void afterInvalidate(EntryEvent arg0) {
-// // Stub, nothing to do.
-// }
-//
-// public void afterRegionDestroy(RegionEvent arg0) {
-// // Stub, nothing to do.
-// }
-//
-// public void afterRegionInvalidate(RegionEvent arg0) {
-// // Stub, nothing to do.
-// }
-//
-// public void afterUpdate(EntryEvent arg0) {
-// // Stub, nothing to do.
-// }
-//
-// public void close() {
-// // Stub, nothing to do.
-// }
-// }
-
- // Introduced to keep symmetry with DistributedMetaRegion and potentially provide improved control of
+
+ // private class DRListener implements CacheListener {
+ // public void afterCreate(EntryEvent arg0) {
+ // buildDynamicRegion(arg0);
+ // }
+ //
+ // public void afterDestroy(EntryEvent arg0) {
+ // razeDynamicRegion(arg0);
+ // }
+ //
+ // public void afterInvalidate(EntryEvent arg0) {
+ // // Stub, nothing to do.
+ // }
+ //
+ // public void afterRegionDestroy(RegionEvent arg0) {
+ // // Stub, nothing to do.
+ // }
+ //
+ // public void afterRegionInvalidate(RegionEvent arg0) {
+ // // Stub, nothing to do.
+ // }
+ //
+ // public void afterUpdate(EntryEvent arg0) {
+ // // Stub, nothing to do.
+ // }
+ //
+ // public void close() {
+ // // Stub, nothing to do.
+ // }
+ // }
+
+ // Introduced to keep symmetry with DistributedMetaRegion and potentially provide improved control
+ // of
// the meta data
- private class LocalMetaRegion extends LocalRegion {
+ private class LocalMetaRegion extends LocalRegion {
protected LocalMetaRegion(RegionAttributes attrs, InternalRegionArguments ira) {
super(dynamicRegionListName, attrs, null, DynamicRegionFactory.this.c, ira);
Assert.assertTrue(attrs.getScope().isLocal());
}
-
+
// This is an internal uses only region
@Override
- protected boolean isSecret()
- {
+ protected boolean isSecret() {
return true;
}
@@ -897,21 +923,20 @@ public abstract class DynamicRegionFactory {
return false;
}
-// //@override event tracker not needed for this type of region
-// void initEventTracker() {
-// }
+ // //@override event tracker not needed for this type of region
+ // void initEventTracker() {
+ // }
- // while internal, its contents should be communicated with bridge clients
+ // while internal, its contents should be communicated with bridge clients
@Override
- protected boolean shouldNotifyBridgeClients()
- {
+ protected boolean shouldNotifyBridgeClients() {
return getCache().getCacheServers().size() > 0;
}
// Over-ride the super behavior to perform the destruction of the dynamic region
@Override
- public void invokeDestroyCallbacks(EnumListenerEvent eventType, EntryEventImpl event, boolean callDispatchEventsCallback, boolean notifyGateways )
- {
+ public void invokeDestroyCallbacks(EnumListenerEvent eventType, EntryEventImpl event,
+ boolean callDispatchEventsCallback, boolean notifyGateways) {
Assert.assertTrue(eventType.equals(EnumListenerEvent.AFTER_DESTROY));
// Notify bridge clients (if this is a BridgeServer)
event.setEventType(eventType);
@@ -926,43 +951,42 @@ public abstract class DynamicRegionFactory {
// Over-ride the super behavior to perform the creation of the dynamic region
@Override
- protected long basicPutPart2(EntryEventImpl event, RegionEntry entry,
- boolean isInitialized, long lastModified,
- boolean clearConflict) {
-
- boolean isCreate = event.getOperation().isCreate();
- boolean set = false;
-
- if (isCreate && !event.callbacksInvoked()) {
- // don't notify clients until all peers have created the region so that
- // their register-interest operations will be sure to find data
- event.callbacksInvoked(true);
- set = true;
- }
-
- long result = super.basicPutPart2(event, entry, isInitialized, lastModified, clearConflict);
-
- if (set) {
- event.callbacksInvoked(false);
- }
-
- if (isCreate) {
- buildDynamicRegion(event);
+ protected long basicPutPart2(EntryEventImpl event, RegionEntry entry, boolean isInitialized,
+ long lastModified, boolean clearConflict) {
+
+ boolean isCreate = event.getOperation().isCreate();
+ boolean set = false;
+
+ if (isCreate && !event.callbacksInvoked()) {
+ // don't notify clients until all peers have created the region so that
+ // their register-interest operations will be sure to find data
+ event.callbacksInvoked(true);
+ set = true;
+ }
+
+ long result = super.basicPutPart2(event, entry, isInitialized, lastModified, clearConflict);
+
+ if (set) {
+ event.callbacksInvoked(false);
+ }
+
+ if (isCreate) {
+ buildDynamicRegion(event);
+ }
+ return result;
}
- return result;
- }
-
+
// The dynamic-region meta-region needs to tell clients about the event
// after all servers have created the region so that register-interest
// will work correctly
@Override
- public void basicPutPart3(EntryEventImpl event, RegionEntry entry,
- boolean isInitialized, long lastModified, boolean invokeCallbacks,
- boolean ifNew, boolean ifOld, Object expectedOldValue,
- boolean requireOldValue) {
-
- super.basicPutPart3(event, entry, isInitialized, lastModified, invokeCallbacks, ifNew, ifOld, expectedOldValue, requireOldValue);
-
+ public void basicPutPart3(EntryEventImpl event, RegionEntry entry, boolean isInitialized,
+ long lastModified, boolean invokeCallbacks, boolean ifNew, boolean ifOld,
+ Object expectedOldValue, boolean requireOldValue) {
+
+ super.basicPutPart3(event, entry, isInitialized, lastModified, invokeCallbacks, ifNew, ifOld,
+ expectedOldValue, requireOldValue);
+
// this code is copied from LocalRegion.basicPutPart2
invokeCallbacks &= !entry.isTombstone(); // put() is creating a tombstone
if (invokeCallbacks) {
@@ -973,57 +997,56 @@ public abstract class DynamicRegionFactory {
}
}
if (doCallback) {
- notifyGatewaySender(event.getOperation().isUpdate()? EnumListenerEvent.AFTER_UPDATE
- : EnumListenerEvent.AFTER_CREATE, event);
+ notifyGatewaySender(event.getOperation().isUpdate() ? EnumListenerEvent.AFTER_UPDATE
+ : EnumListenerEvent.AFTER_CREATE, event);
// Notify listeners
if (!event.isBulkOpInProgress()) {
try {
entry.dispatchListenerEvents(event);
- }
- catch (InterruptedException ie) {
+ } catch (InterruptedException ie) {
Thread.currentThread().interrupt();
stopper.checkCancelInProgress(null);
}
}
}
}
- }
+ }
}
- // Part of the fix for bug 35432, which required a change to the
+ // Part of the fix for bug 35432, which required a change to the
// distribution and notification order on the BridgeServer
- private class DistributedMetaRegion extends DistributedRegion {
+ private class DistributedMetaRegion extends DistributedRegion {
protected DistributedMetaRegion(RegionAttributes attrs) {
- super(dynamicRegionListName, attrs, null, DynamicRegionFactory.this.c, new InternalRegionArguments());
+ super(dynamicRegionListName, attrs, null, DynamicRegionFactory.this.c,
+ new InternalRegionArguments());
}
+
// This is an internal uses only region
@Override
- protected boolean isSecret()
- {
+ protected boolean isSecret() {
return true;
}
-
-// //@override event tracker not needed for this type of region
-// void initEventTracker() {
-// }
+
+ // //@override event tracker not needed for this type of region
+ // void initEventTracker() {
+ // }
@Override
protected boolean isCopyOnRead() {
return false;
}
- // while internal, its contents should be communicated with bridge clients
+ // while internal, its contents should be communicated with bridge clients
@Override
- final public boolean shouldNotifyBridgeClients()
- {
+ final public boolean shouldNotifyBridgeClients() {
return getCache().getCacheServers().size() > 0;
- }
-
+ }
+
// Over-ride the super behavior to perform the destruction of the dynamic region
- //
+ //
@Override
- public void invokeDestroyCallbacks(EnumListenerEvent eventType, EntryEventImpl event, boolean callDispatchEventsCallback, boolean notifyGateways)
- {
+ public void invokeDestroyCallbacks(EnumListenerEvent eventType, EntryEventImpl event,
+ boolean callDispatchEventsCallback, boolean notifyGateways) {
Assert.assertTrue(eventType.equals(EnumListenerEvent.AFTER_DESTROY));
// Notify bridge clients (if this is a BridgeServer)
event.setEventType(eventType);
@@ -1037,10 +1060,8 @@ public abstract class DynamicRegionFactory {
}
@Override
- protected long basicPutPart2(EntryEventImpl event, RegionEntry entry,
- boolean isInitialized, long lastModified,
- boolean clearConflict)
- {
+ protected long basicPutPart2(EntryEventImpl event, RegionEntry entry, boolean isInitialized,
+ long lastModified, boolean clearConflict) {
boolean isCreate = event.getOperation().isCreate();
boolean set = false;
if (isCreate && !event.callbacksInvoked()) {
@@ -1049,36 +1070,35 @@ public abstract class DynamicRegionFactory {
event.callbacksInvoked(true);
set = true;
}
-
+
long result = super.basicPutPart2(event, entry, isInitialized, lastModified, clearConflict);
-
+
if (set) {
event.callbacksInvoked(false);
}
-
+
if (isCreate) {
try {
InitialImageOperation.setInhibitStateFlush(true); // fix for bug 36175
buildDynamicRegion(event);
- }
- finally {
+ } finally {
InitialImageOperation.setInhibitStateFlush(false);
}
}
return result;
}
-
+
// The dynamic-region meta-region needs to tell clients about the event
// after all servers have created the region so that register-interest
// will work correctly
@Override
- public void basicPutPart3(EntryEventImpl event, RegionEntry entry,
- boolean isInitialized, long lastModified, boolean invokeCallbacks,
- boolean ifNew, boolean ifOld, Object expectedOldValue,
- boolean requireOldValue) {
+ public void basicPutPart3(EntryEventImpl event, RegionEntry entry, boolean isInitialized,
+ long lastModified, boolean invokeCallbacks, boolean ifNew, boolean ifOld,
+ Object expectedOldValue, boolean requireOldValue) {
+
+ super.basicPutPart3(event, entry, isInitialized, lastModified, invokeCallbacks, ifNew, ifOld,
+ expectedOldValue, requireOldValue);
- super.basicPutPart3(event, entry, isInitialized, lastModified, invokeCallbacks, ifNew, ifOld, expectedOldValue, requireOldValue);
-
// this code is copied from LocalRegion.basicPutPart2
invokeCallbacks &= !entry.isTombstone(); // put() is creating a tombstone
if (invokeCallbacks) {
@@ -1089,14 +1109,13 @@ public abstract class DynamicRegionFactory {
}
}
if (doCallback) {
- notifyGatewaySender(event.getOperation().isUpdate()? EnumListenerEvent.AFTER_UPDATE
- : EnumListenerEvent.AFTER_CREATE, event);
+ notifyGatewaySender(event.getOperation().isUpdate() ? EnumListenerEvent.AFTER_UPDATE
+ : EnumListenerEvent.AFTER_CREATE, event);
// Notify listeners
if (!event.isBulkOpInProgress()) {
try {
entry.dispatchListenerEvents(event);
- }
- catch (InterruptedException ie) {
+ } catch (InterruptedException ie) {
Thread.currentThread().interrupt();
stopper.checkCancelInProgress(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
index b8a47de..5448013 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionListener.java
@@ -1,32 +1,30 @@
/*
- * 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
+ * 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;
/**
- * <code>DynamicRegionListener</code> is an interface that can be
- * implemented to handle dynamic region-related events.
-
- * The methods on a <code>DynamicRegionListener</code> are invoked synchronously.
- * If the listener method takes a long time to execute then it will cause the
- * operation that caused it to be invoked to take a long time.
+ * <code>DynamicRegionListener</code> is an interface that can be implemented to handle dynamic
+ * region-related events.
+ *
+ * The methods on a <code>DynamicRegionListener</code> are invoked synchronously. If the listener
+ * method takes a long time to execute then it will cause the operation that caused it to be invoked
+ * to take a long time.
* <p>
- * Note: It is possible to receive duplicate create events when the DynamicRegionFactory
- * goes active due to Cache creation.
+ * Note: It is possible to receive duplicate create events when the DynamicRegionFactory goes active
+ * due to Cache creation.
* <p>
* See {@link DynamicRegionFactory}
*
@@ -35,8 +33,8 @@ package org.apache.geode.cache;
public interface DynamicRegionListener {
/**
- * Handles the 'before region creation' event of a dynamic region. This method
- * is invoked before the dynamic region is created in the local VM.
+ * Handles the 'before region creation' event of a dynamic region. This method is invoked before
+ * the dynamic region is created in the local VM.
*
* @param parentRegionName The name of the parent region
* @param regionName The name of the region being created
@@ -44,26 +42,26 @@ public interface DynamicRegionListener {
public void beforeRegionCreate(String parentRegionName, String regionName);
/**
- * Handles the 'after region creation' event of a dynamic region. This method
- * is invoked after the dynamic region is created in the local VM.
+ * Handles the 'after region creation' event of a dynamic region. This method is invoked after the
+ * dynamic region is created in the local VM.
*
* @param event A <code>RegionEvent</code> describing the event
*/
- public void afterRegionCreate(RegionEvent<?,?> event);
+ public void afterRegionCreate(RegionEvent<?, ?> event);
/**
- * Handles the 'before region destroyed' event of a dynamic region. This method
- * is invoked before the dynamic region is destroyed in the local VM.
+ * Handles the 'before region destroyed' event of a dynamic region. This method is invoked before
+ * the dynamic region is destroyed in the local VM.
*
* @param event A <code>RegionEvent</code> describing the event
*/
- public void beforeRegionDestroy(RegionEvent<?,?> event);
+ public void beforeRegionDestroy(RegionEvent<?, ?> event);
/**
- * Handles the 'after region destroyed' event of a dynamic region. This method
- * is invoked after the dynamic region is destroyed in the local VM.
+ * Handles the 'after region destroyed' event of a dynamic region. This method is invoked after
+ * the dynamic region is destroyed in the local VM.
*
* @param event A <code>RegionEvent</code> describing the event
*/
- public void afterRegionDestroy(RegionEvent<?,?> event);
+ public void afterRegionDestroy(RegionEvent<?, ?> event);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/EntryDestroyedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryDestroyedException.java b/geode-core/src/main/java/org/apache/geode/cache/EntryDestroyedException.java
index 2958ad0..fd622e0 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryDestroyedException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryDestroyedException.java
@@ -1,20 +1,19 @@
/*
- * 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
+ * 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;
+
/**
* Indicates that a method was invoked on an entry that has been destroyed.
*
@@ -23,37 +22,39 @@ package org.apache.geode.cache;
* @see Region.Entry
* @since GemFire 3.0
*/
-public class EntryDestroyedException extends CacheRuntimeException
-{
+public class EntryDestroyedException extends CacheRuntimeException {
private static final long serialVersionUID = 831865939772672542L;
- /** Constructs a new <code>EntryDestroyedException</code>. */
- public EntryDestroyedException()
- {
- super();
+
+ /** Constructs a new <code>EntryDestroyedException</code>. */
+ public EntryDestroyedException() {
+ super();
}
/**
* Constructs a new <code>EntryDestroyedException</code> with the message.
+ *
* @param s the detailed message for this exception
*/
- public EntryDestroyedException(String s)
- {
+ public EntryDestroyedException(String s) {
super(s);
}
- /** Constructs a new <code>EntryDestroyedException</code> with a detailed message
- * and a causal exception.
+ /**
+ * Constructs a new <code>EntryDestroyedException</code> with a detailed message and a causal
+ * exception.
+ *
* @param s the message
* @param ex a causal Throwable
*/
- public EntryDestroyedException(String s, Throwable ex)
- {
+ public EntryDestroyedException(String s, Throwable ex) {
super(s, ex);
}
-
- /** Construct a <code>EntryDestroyedException</code> with a cause.
+
+ /**
+ * Construct a <code>EntryDestroyedException</code> with a cause.
+ *
* @param ex the causal Throwable
- */
+ */
public EntryDestroyedException(Throwable ex) {
super(ex);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java b/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
index 8dda363..10f0916 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryEvent.java
@@ -1,34 +1,32 @@
/*
- * 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
+ * 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;
-//import java.io.*;
+// import java.io.*;
-/** Contains information about an event affecting an entry, including
- * its identity and the the circumstances of the event.
- * It is passed in to <code>CacheListener</code>, <code>CapacityController</code>, and <code>CacheWriter</code>.
+/**
+ * Contains information about an event affecting an entry, including its identity and the the
+ * circumstances of the event. It is passed in to <code>CacheListener</code>,
+ * <code>CapacityController</code>, and <code>CacheWriter</code>.
* <p>
- * If this event originated from a region stored off heap then this event can
- * only be used as long as the notification method that obtained it has not returned.
- * For example in your implementation of {@link CacheListener#afterUpdate(EntryEvent)} the event parameter
- * is only valid until your afterUpdate method returns. It is not safe to store instances of this
- * class and use them later when using off heap storage.
- * Attempts to access off-heap data from this event after it has expired will result in an
- * IllegalStateException.
+ * If this event originated from a region stored off heap then this event can only be used as long
+ * as the notification method that obtained it has not returned. For example in your implementation
+ * of {@link CacheListener#afterUpdate(EntryEvent)} the event parameter is only valid until your
+ * afterUpdate method returns. It is not safe to store instances of this class and use them later
+ * when using off heap storage. Attempts to access off-heap data from this event after it has
+ * expired will result in an IllegalStateException.
*
*
*
@@ -37,35 +35,36 @@ package org.apache.geode.cache;
* @see RegionEvent
* @since GemFire 3.0
*/
-public interface EntryEvent<K,V> extends CacheEvent<K,V> {
+public interface EntryEvent<K, V> extends CacheEvent<K, V> {
- /** Returns the key.
+ /**
+ * Returns the key.
+ *
* @return the key
*/
public K getKey();
-
-
+
+
/**
- * Returns the value in the cache prior to this event.
- * When passed to an event handler after an event occurs, this value
- * reflects the value that was in the cache in this VM, not necessarily
- * the value that was in the cache VM that initiated the operation.
- * In certain scenarios the old value may no longer be available in which
- * case <code>null</code> is returned.
- * This can happen for disk regions when the old value is on disk only.
+ * Returns the value in the cache prior to this event. When passed to an event handler after an
+ * event occurs, this value reflects the value that was in the cache in this VM, not necessarily
+ * the value that was in the cache VM that initiated the operation. In certain scenarios the old
+ * value may no longer be available in which case <code>null</code> is returned. This can happen
+ * for disk regions when the old value is on disk only.
*
- * @return the old value in the cache prior to this event.
- * If the entry did not exist, was invalid, or was not available,
- * then null is returned.
- * @throws IllegalStateException if off-heap and called after the method that was passed this EntryEvent returns.
+ * @return the old value in the cache prior to this event. If the entry did not exist, was
+ * invalid, or was not available, then null is returned.
+ * @throws IllegalStateException if off-heap and called after the method that was passed this
+ * EntryEvent returns.
*/
public V getOldValue();
-
+
/**
* Returns the serialized form of the value in the cache before this event.
*
* @return the serialized form of the value in the cache before this event
- * @throws IllegalStateException if off-heap and called after the method that was passed this EntryEvent returns.
+ * @throws IllegalStateException if off-heap and called after the method that was passed this
+ * EntryEvent returns.
*
* @since GemFire 5.5
*/
@@ -75,27 +74,30 @@ public interface EntryEvent<K,V> extends CacheEvent<K,V> {
* Returns the value in the cache after this event.
*
* @return the value in the cache after this event
- * @throws IllegalStateException if off-heap and called after the method that was passed this EntryEvent returns.
+ * @throws IllegalStateException if off-heap and called after the method that was passed this
+ * EntryEvent returns.
*/
public V getNewValue();
-
+
/**
* Returns the serialized form of the value in the cache after this event.
*
* @return the serialized form of the value in the cache after this event
- * @throws IllegalStateException if off-heap and called after the method that was passed this EntryEvent returns.
+ * @throws IllegalStateException if off-heap and called after the method that was passed this
+ * EntryEvent returns.
*
* @since GemFire 5.5
*/
public SerializedCacheValue<V> getSerializedNewValue();
// Flag query methods
-
- /** Returns true if this event resulted from a loader running in this cache.
- * Note that this will be true even if the local loader called <code>netSearch</code>.
+
+ /**
+ * Returns true if this event resulted from a loader running in this cache. Note that this will be
+ * true even if the local loader called <code>netSearch</code>.
*
- * If this event is for a Partitioned Region, then true will be returned if the
- * loader ran in the same VM as where the data is hosted. If true is returned, and {@link CacheEvent#isOriginRemote}
+ * If this event is for a Partitioned Region, then true will be returned if the loader ran in the
+ * same VM as where the data is hosted. If true is returned, and {@link CacheEvent#isOriginRemote}
* is true, it means the data is not hosted locally, but the loader was run local to the data.
*
* @return true if this event resulted from local loader execution
@@ -103,41 +105,47 @@ public interface EntryEvent<K,V> extends CacheEvent<K,V> {
*/
@Deprecated
public boolean isLocalLoad();
-
- /** Returns true if this event resulted from a loader running that was remote
- * from the cache that requested it, i.e., a netLoad. Note that the cache
- * that requested the netLoad may not be this cache in which case
- * <code>isOriginRemote</code> will also return true.
+
+ /**
+ * Returns true if this event resulted from a loader running that was remote from the cache that
+ * requested it, i.e., a netLoad. Note that the cache that requested the netLoad may not be this
+ * cache in which case <code>isOriginRemote</code> will also return true.
+ *
* @return true if this event resulted from a netLoad
* @deprecated as of GemFire 5.0, use {@link Operation#isNetLoad} instead.
*/
@Deprecated
public boolean isNetLoad();
-
- /** Returns true if this event resulted from a loader.
+
+ /**
+ * Returns true if this event resulted from a loader.
+ *
* @return true if isLocalLoad or isNetLoad
* @deprecated as of GemFire 5.0, use {@link Operation#isLoad} instead.
*/
@Deprecated
public boolean isLoad();
-
- /** Returns true if this event resulted from a <code>netSearch</code>. If the <code>netSearch</code>
- * was invoked by a loader however, this will return false and <code>isLocalLoad()</code>
- * or <code>isNetLoad()</code> will return true instead.
+
+ /**
+ * Returns true if this event resulted from a <code>netSearch</code>. If the
+ * <code>netSearch</code> was invoked by a loader however, this will return false and
+ * <code>isLocalLoad()</code> or <code>isNetLoad()</code> will return true instead.
*
* @return true if this event resulted from a netSearch
* @deprecated as of GemFire 5.0, use {@link Operation#isNetSearch} instead.
*/
@Deprecated
public boolean isNetSearch();
+
/**
* Gets the TransactionId for this EntryEvent.
- * @return the ID of the transaction that performed the operation that
- * generated this event; null if no transaction involved.
+ *
+ * @return the ID of the transaction that performed the operation that generated this event; null
+ * if no transaction involved.
* @since GemFire 4.0
*/
public TransactionId getTransactionId();
-
+
/**
* Returns true if this event originated on a client.
*
@@ -147,6 +155,7 @@ public interface EntryEvent<K,V> extends CacheEvent<K,V> {
*/
@Deprecated
public boolean isBridgeEvent();
+
/**
* Returns true if this event originated on a client.
*
@@ -154,12 +163,12 @@ public interface EntryEvent<K,V> extends CacheEvent<K,V> {
* @return true if this event originated on a client.
*/
public boolean hasClientOrigin();
+
/**
- * Returns <code>true</code> if the old value is "available".
- * Not available means that an old value existed but it could not be obtained
- * or it was deemed too expensive to obtain.
- * Note that {@link #getOldValue} will return <code>null</code> when this
- * method returns <code>false</code>.
+ * Returns <code>true</code> if the old value is "available". Not available means that an old
+ * value existed but it could not be obtained or it was deemed too expensive to obtain. Note that
+ * {@link #getOldValue} will return <code>null</code> when this method returns <code>false</code>.
+ *
* @since GemFire 6.0
*/
public boolean isOldValueAvailable();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/EntryExistsException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryExistsException.java b/geode-core/src/main/java/org/apache/geode/cache/EntryExistsException.java
index 15f915f..a6abbf4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryExistsException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryExistsException.java
@@ -1,24 +1,23 @@
/*
- * 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
+ * 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;
-/** Thrown when attempting to create a <code>Region.Entry</code> that already
- * exists in the <code>Region</code>.
+/**
+ * Thrown when attempting to create a <code>Region.Entry</code> that already exists in the
+ * <code>Region</code>.
*
* @see org.apache.geode.cache.Region#create(Object, Object)
* @see Region.Entry
@@ -32,6 +31,7 @@ public class EntryExistsException extends CacheException {
/**
* Constructs an instance of <code>EntryExistsException</code> with the specified detail message.
+ *
* @param msg the detail message
* @since GemFire 6.5
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundException.java b/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundException.java
index ddc666a..498049b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundException.java
@@ -1,25 +1,24 @@
/*
- * 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
+ * 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;
-/** Thrown when an operation is invoked on <code>Region</code> for an entry that
- * doesn't exist in the <code>Region</code>. This exception is <i>not</i>
- * thrown by {@link org.apache.geode.cache.Region#get(Object)} or {@link Region#getEntry}.
+/**
+ * Thrown when an operation is invoked on <code>Region</code> for an entry that doesn't exist in the
+ * <code>Region</code>. This exception is <i>not</i> thrown by
+ * {@link org.apache.geode.cache.Region#get(Object)} or {@link Region#getEntry}.
*
*
*
@@ -29,18 +28,22 @@ package org.apache.geode.cache;
* @since GemFire 3.0
*/
public class EntryNotFoundException extends CacheException {
-private static final long serialVersionUID = -2404101631744605659L;
+ private static final long serialVersionUID = -2404101631744605659L;
+
/**
- * Constructs an instance of <code>EntryNotFoundException</code> with the specified detail message.
+ * Constructs an instance of <code>EntryNotFoundException</code> with the specified detail
+ * message.
+ *
* @param msg the detail message
*/
public EntryNotFoundException(String msg) {
super(msg);
}
-
+
/**
* Constructs an instance of <code>EntryNotFoundException</code> with the specified detail message
* and cause.
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
[29/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
index 982c4f1..cd4dc7e 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
@@ -1,18 +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
+ * 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.admin;
@@ -28,87 +26,81 @@ import java.util.Set;
import java.util.UUID;
/**
- * Administrative interface for managing an entire GemFire distributed
- * system. This interface should not be confused with {@link
- * org.apache.geode.distributed.DistributedSystem
- * DistributedSystem} that represents a connection to a GemFire
- * distributed system.
+ * Administrative interface for managing an entire GemFire distributed system. This interface should
+ * not be confused with {@link org.apache.geode.distributed.DistributedSystem DistributedSystem}
+ * that represents a connection to a GemFire distributed system.
*
* @see AdminDistributedSystemFactory
*
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @since GemFire 3.5
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface AdminDistributedSystem {
-
+
/**
* Retrieves the unique id for this system.
*/
public String getId();
-
+
/**
- * Retrieves display friendly name for this system. If this administrative
- * VM defined an optional name for its connection to the distributed system,
- * that name will be returned. Otherwise the returned value will be {@link
- * org.apache.geode.admin.AdminDistributedSystem#getId}.
+ * Retrieves display friendly name for this system. If this administrative VM defined an optional
+ * name for its connection to the distributed system, that name will be returned. Otherwise the
+ * returned value will be {@link org.apache.geode.admin.AdminDistributedSystem#getId}.
*/
public String getName();
-
+
/**
- * Retrieves the remote command and formatting this system should use to
- * access and/or manipulate resources on remote machines.
+ * Retrieves the remote command and formatting this system should use to access and/or manipulate
+ * resources on remote machines.
*/
public String getRemoteCommand();
/**
- * Sets the remote command and formatting this system should use to access
- * and/or manipulate resources on remote machines.
+ * Sets the remote command and formatting this system should use to access and/or manipulate
+ * resources on remote machines.
*/
public void setRemoteCommand(String remoteCommand);
/**
- * Sets the lowest level of alert that should be delivered to the
- * {@link AlertListener}s registered on this
- * <code>AdminDistributedSystem</code>. The default level is {@link
- * AlertLevel#WARNING}.
+ * Sets the lowest level of alert that should be delivered to the {@link AlertListener}s
+ * registered on this <code>AdminDistributedSystem</code>. The default level is
+ * {@link AlertLevel#WARNING}.
*/
public void setAlertLevel(AlertLevel level);
/**
- * Returns the lowest level of alerts that should be delivered to
- * the {@link AlertListener}s registered on this
- * <code>AdminDistributedSystem</code>.
+ * Returns the lowest level of alerts that should be delivered to the {@link AlertListener}s
+ * registered on this <code>AdminDistributedSystem</code>.
*
* @see #setAlertLevel
*/
public AlertLevel getAlertLevel();
-
+
/**
- * Sets the lowest level of alert that should be delivered to the
- * {@link AlertListener}s registered on this
- * <code>AdminDistributedSystem</code>. The default level is {@link
- * AlertLevel#WARNING}.
+ * Sets the lowest level of alert that should be delivered to the {@link AlertListener}s
+ * registered on this <code>AdminDistributedSystem</code>. The default level is
+ * {@link AlertLevel#WARNING}.
*/
public void setAlertLevelAsString(String level);
/**
- * Returns the lowest level of alerts that should be delivered to
- * the {@link AlertListener}s registered on this
- * <code>AdminDistributedSystem</code>.
+ * Returns the lowest level of alerts that should be delivered to the {@link AlertListener}s
+ * registered on this <code>AdminDistributedSystem</code>.
*
* @see #setAlertLevelAsString
*/
public String getAlertLevelAsString();
/**
- * Registers an <code>AlertListener</code> that will receive all
- * alerts that are at or above the {@linkplain #setAlertLevel alert
- * level}.
+ * Registers an <code>AlertListener</code> that will receive all alerts that are at or above the
+ * {@linkplain #setAlertLevel alert level}.
*/
public void addAlertListener(AlertListener listener);
/**
- * Unregisters an <code>AlertListener</code>
+ * Unregisters an <code>AlertListener</code>
*/
public void removeAlertListener(AlertListener listener);
@@ -123,42 +115,37 @@ public interface AdminDistributedSystem {
public int getMcastPort();
/**
- * Retrieves comma-delimited list locators to be used if multi-cast port is
- * zero. Format of each locators must be host[port].
+ * Retrieves comma-delimited list locators to be used if multi-cast port is zero. Format of each
+ * locators must be host[port].
*/
public String getLocators();
- /**
+ /**
* Returns true if this system has enabled the use of multicast for communications
*/
public boolean isMcastEnabled();
-
+
/**
* Returns true if any members of this system are currently running.
*/
public boolean isRunning();
- /**
- * Returns <code>true</code> if this is currently connected to the
- * system.
+ /**
+ * Returns <code>true</code> if this is currently connected to the system.
*/
public boolean isConnected();
-
+
/**
* Starts all managed entities that are not currently running.
*
- * @throws AdminException
- * If a problem is encountered while starting the managed
- * entities.
+ * @throws AdminException If a problem is encountered while starting the managed entities.
*/
public void start() throws AdminException;
/**
* Stops all managed entities that are currently running.
*
- * @throws AdminException
- * If a problem is encountered while starting the managed
- * entities.
+ * @throws AdminException If a problem is encountered while starting the managed entities.
*/
public void stop() throws AdminException;
@@ -176,50 +163,44 @@ public interface AdminDistributedSystem {
/**
* Creates a new <code>DistributionLocator</code> that is ready to
- * {@linkplain DistributionLocator#getConfig configure} and
- * {@linkplain #start start}.
+ * {@linkplain DistributionLocator#getConfig configure} and {@linkplain #start start}.
*
* <P>
*
- * It is presumed that the newly-added locator is used to discover
- * members of the distributed system. That is, the host/port of the
- * new locator is appended to the {@link #getLocators locators}
- * attribute of this <code>AdminDistributedSystem</code>.
+ * It is presumed that the newly-added locator is used to discover members of the distributed
+ * system. That is, the host/port of the new locator is appended to the {@link #getLocators
+ * locators} attribute of this <code>AdminDistributedSystem</code>.
*/
public DistributionLocator addDistributionLocator();
-
- /**
- * Returns array of <code>DistributionLocator</code>s administered
- * by this <code>AdminDistributedSystem</code>.
- */
+
+ /**
+ * Returns array of <code>DistributionLocator</code>s administered by this
+ * <code>AdminDistributedSystem</code>.
+ */
public DistributionLocator[] getDistributionLocators();
-
+
/**
- * Retrieves SystemMember instances for every
- * application that is running and currently connection to this
- * system. Note that this list does not include dedicated
- * {@linkplain #getCacheVms cache server vms}.
+ * Retrieves SystemMember instances for every application that is running and currently connection
+ * to this system. Note that this list does not include dedicated {@linkplain #getCacheVms cache
+ * server vms}.
*/
- public SystemMember[] getSystemMemberApplications()
- throws org.apache.geode.admin.AdminException;
+ public SystemMember[] getSystemMemberApplications() throws org.apache.geode.admin.AdminException;
/**
* Display in readable format the latest Alert in this distributed system.
*/
public String getLatestAlert();
-
+
/**
* Returns an object for monitoring the health of GemFire.
*/
public GemFireHealth getGemFireHealth();
/**
- * Connects to the distributed system. This method will return
- * immediately after spawning a background thread that connects to
- * the distributed system. As a result, a
- * <code>AdminDistributedSystem</code> can be "connected" to before
- * any members of the system have been started or have been seen.
- * The {@link #waitToBeConnected} method will wait for the
+ * Connects to the distributed system. This method will return immediately after spawning a
+ * background thread that connects to the distributed system. As a result, a
+ * <code>AdminDistributedSystem</code> can be "connected" to before any members of the system have
+ * been started or have been seen. The {@link #waitToBeConnected} method will wait for the
* connection to be made.
*
* @see #isConnected
@@ -229,36 +210,29 @@ public interface AdminDistributedSystem {
public void connect();
/**
- * Wait for up to a given number of milliseconds for the connection
- * to the distributed system to be made.
+ * Wait for up to a given number of milliseconds for the connection to the distributed system to
+ * be made.
*
- * @param timeout
- * The number of milliseconds to wait for the connection to
- * to be made.
+ * @param timeout The number of milliseconds to wait for the connection to to be made.
*
- * @return Whether or not the connection was made.
- * <code>false</code>, if the method times out
+ * @return Whether or not the connection was made. <code>false</code>, if the method times out
*
- * @throws InterruptedException
- * If the thread invoking this method is interrupted while
- * waiting.
- * @throws IllegalStateException
- * If {@link #connect} has not yet been called.
+ * @throws InterruptedException If the thread invoking this method is interrupted while waiting.
+ * @throws IllegalStateException If {@link #connect} has not yet been called.
*/
- public boolean waitToBeConnected(long timeout)
- throws InterruptedException;
+ public boolean waitToBeConnected(long timeout) throws InterruptedException;
/**
* Disconnects from the distributed system.
*/
public void disconnect();
- /** Returns this system's configuration .*/
+ /** Returns this system's configuration . */
public DistributedSystemConfig getConfig();
-
+
/**
- * Registers a listener that receives callbacks when a member joins
- * or leaves the distributed system.
+ * Registers a listener that receives callbacks when a member joins or leaves the distributed
+ * system.
*/
public void addMembershipListener(SystemMembershipListener listener);
@@ -270,26 +244,25 @@ public interface AdminDistributedSystem {
public void removeMembershipListener(SystemMembershipListener listener);
/**
- * Registers a cache event listener.
- * Does nothing if the listener is already registered. The listeners are called
- * in the order they are registered.
+ * Registers a cache event listener. Does nothing if the listener is already registered. The
+ * listeners are called in the order they are registered.
+ *
* @param listener the listener to register.
- * @since GemFire 5.0
+ * @since GemFire 5.0
*/
- public void addCacheListener(SystemMemberCacheListener listener);
+ public void addCacheListener(SystemMemberCacheListener listener);
- /**
- * Unregisters a cache listener. Does nothing if the listener is
- * not registered.
- * @param listener the listener to unregister.
- * @since GemFire 5.0
- */
- public void removeCacheListener(SystemMemberCacheListener listener);
+ /**
+ * Unregisters a cache listener. Does nothing if the listener is not registered.
+ *
+ * @param listener the listener to unregister.
+ * @since GemFire 5.0
+ */
+ public void removeCacheListener(SystemMemberCacheListener listener);
/**
- * Creates a new cache server that is ready to {@linkplain
- * CacheServerConfig configure} and {@linkplain #start
- * start}.
+ * Creates a new cache server that is ready to {@linkplain CacheServerConfig configure} and
+ * {@linkplain #start start}.
*
* @since GemFire 4.0
* @deprecated as of 5.7 use {@link #addCacheVm} instead.
@@ -298,10 +271,8 @@ public interface AdminDistributedSystem {
public CacheServer addCacheServer() throws AdminException;
/**
- * Returns all of the dedicated cache server members of the
- * distributed system. Because they are not managed entities,
- * application VMs that host a server cache are not included in the
- * array.
+ * Returns all of the dedicated cache server members of the distributed system. Because they are
+ * not managed entities, application VMs that host a server cache are not included in the array.
*
* @since GemFire 4.0
* @deprecated as of 5.7 use {@link #getCacheVms} instead.
@@ -310,33 +281,28 @@ public interface AdminDistributedSystem {
public CacheServer[] getCacheServers() throws AdminException;
/**
- * Returns all the cache server members of the distributed system which are
- * hosting a client queue for the particular durable-client having the given
- * durableClientId
+ * Returns all the cache server members of the distributed system which are hosting a client queue
+ * for the particular durable-client having the given durableClientId
*
- * @param durableClientId -
- * durable-id of the client
+ * @param durableClientId - durable-id of the client
* @return array of CacheServer(s) having the queue for the durable client
* @throws AdminException
*
* @since GemFire 5.6
*/
- public CacheServer[] getCacheServers(String durableClientId)
- throws AdminException;
+ public CacheServer[] getCacheServers(String durableClientId) throws AdminException;
/**
- * Creates a new cache vm that is ready to {@linkplain
- * CacheVmConfig configure} and {@linkplain #start
- * start}.
+ * Creates a new cache vm that is ready to {@linkplain CacheVmConfig configure} and
+ * {@linkplain #start start}.
*
* @since GemFire 5.7
*/
public CacheVm addCacheVm() throws AdminException;
/**
- * Returns all of the dedicated cache server vm members of the
- * distributed system. Because they are not managed entities,
- * application VMs that host a server cache are not included in the
+ * Returns all of the dedicated cache server vm members of the distributed system. Because they
+ * are not managed entities, application VMs that host a server cache are not included in the
* array.
*
* @since GemFire 5.7
@@ -344,52 +310,47 @@ public interface AdminDistributedSystem {
public CacheVm[] getCacheVms() throws AdminException;
/**
- * Returns the administrative SystemMember specified by the {@link
- * org.apache.geode.distributed.DistributedMember}.
+ * Returns the administrative SystemMember specified by the
+ * {@link org.apache.geode.distributed.DistributedMember}.
*
* @param distributedMember the distributed member to lookup
* @return administrative SystemMember for that distributed member
* @since GemFire 5.0
*/
- public SystemMember lookupSystemMember(DistributedMember distributedMember)
- throws AdminException;
+ public SystemMember lookupSystemMember(DistributedMember distributedMember) throws AdminException;
/**
- * Indicate to the distributed system that persistent files have been lost.
- * When a member recovers from a set of persistent files, it will wait for
- * other members that were also persisting the same region to start up. If the
- * persistent files for those other members were lost, this method can be used
- * to tell the remaining members to stop waiting for the lost data.
+ * Indicate to the distributed system that persistent files have been lost. When a member recovers
+ * from a set of persistent files, it will wait for other members that were also persisting the
+ * same region to start up. If the persistent files for those other members were lost, this method
+ * can be used to tell the remaining members to stop waiting for the lost data.
*
- * @param host
- * The host of the member whose files were lost.
- * @param directory
- * The directory where those files resided.
+ * @param host The host of the member whose files were lost.
+ * @param directory The directory where those files resided.
* @since GemFire 6.5
* @deprecated use {@link #revokePersistentMember(UUID)} instead
*/
public void revokePersistentMember(InetAddress host, String directory) throws AdminException;
-
+
/**
- * Indicate to the distributed system that persistent files have been lost.
- * When a member recovers from a set of persistent files, it will wait for
- * other members that were also persisting the same region to start up. If the
- * persistent files for those other members were lost, this method can be used
- * to tell the remaining members to stop waiting for the lost data.
+ * Indicate to the distributed system that persistent files have been lost. When a member recovers
+ * from a set of persistent files, it will wait for other members that were also persisting the
+ * same region to start up. If the persistent files for those other members were lost, this method
+ * can be used to tell the remaining members to stop waiting for the lost data.
*
- * @param diskStoreID
- * The unique id of the disk store which you are revoking. The unique
- * id can be discovered from {@link #getMissingPersistentMembers()}
+ * @param diskStoreID The unique id of the disk store which you are revoking. The unique id can be
+ * discovered from {@link #getMissingPersistentMembers()}
*
* @since GemFire 7.0
*/
public void revokePersistentMember(UUID diskStoreID) throws AdminException;
-
+
/**
- * Retrieve the set of persistent files that the existing members are waiting
- * for. See {@link AdminDistributedSystem#revokePersistentMember(InetAddress, String)}
- * @return The persistent members that were known to the existing persistent members,
- * when the existing members were last online.
+ * Retrieve the set of persistent files that the existing members are waiting for. See
+ * {@link AdminDistributedSystem#revokePersistentMember(InetAddress, String)}
+ *
+ * @return The persistent members that were known to the existing persistent members, when the
+ * existing members were last online.
* @throws AdminException
* @since GemFire 6.5
*
@@ -397,36 +358,33 @@ public interface AdminDistributedSystem {
public Set<PersistentID> getMissingPersistentMembers() throws AdminException;
/**
- * Shuts down all the members of the distributed system with a cache that the admin
- * member is connected to, excluding the stand-alone locators. Calling this method
- * will ensure that regions with the {@link DataPolicy#PERSISTENT_PARTITION} to
- * be shutdown in a way which allows for a faster recovery when the members are
- * restarted.
+ * Shuts down all the members of the distributed system with a cache that the admin member is
+ * connected to, excluding the stand-alone locators. Calling this method will ensure that regions
+ * with the {@link DataPolicy#PERSISTENT_PARTITION} to be shutdown in a way which allows for a
+ * faster recovery when the members are restarted.
+ *
+ * Killing individual members can lead to inconsistencies in the members persistent data, which
+ * gemfire repairs on startup. Calling shutDownAllMembers makes sure that the persistent files are
+ * consistent on shutdown, which makes recovery faster.
*
- * Killing individual members can lead to inconsistencies in the members persistent
- * data, which gemfire repairs on startup. Calling shutDownAllMembers makes sure
- * that the persistent files are consistent on shutdown, which makes recovery faster.
- *
* This is equivalent to calling shutDownAllMembers(0);
+ *
* @return The set of members that were shutdown
* @since GemFire 6.5
*/
public Set<DistributedMember> shutDownAllMembers() throws AdminException;
-
+
/**
- * Shuts down all the members of the distributed system with a cache that the
- * admin member is connected to, excluding the stand-alone locators. Calling
- * this method will ensure that regions with the
- * {@link DataPolicy#PERSISTENT_PARTITION} to be shutdown in a way which
- * allows for a faster recovery when the members are restarted.
+ * Shuts down all the members of the distributed system with a cache that the admin member is
+ * connected to, excluding the stand-alone locators. Calling this method will ensure that regions
+ * with the {@link DataPolicy#PERSISTENT_PARTITION} to be shutdown in a way which allows for a
+ * faster recovery when the members are restarted.
*
- * Killing individual members can lead to inconsistencies in the members
- * persistent data, which gemfire repairs on startup. Calling
- * shutDownAllMembers makes sure that the persistent files are consistent on
- * shutdown, which makes recovery faster.
+ * Killing individual members can lead to inconsistencies in the members persistent data, which
+ * gemfire repairs on startup. Calling shutDownAllMembers makes sure that the persistent files are
+ * consistent on shutdown, which makes recovery faster.
*
- * @param timeout The amount of time to wait (in milliseconds) for the shutdown all to
- * complete.
+ * @param timeout The amount of time to wait (in milliseconds) for the shutdown all to complete.
* @return The set of members that were shutdown, or null if the timeout is exceeded.
*
* @since GemFire 6.5
@@ -434,38 +392,37 @@ public interface AdminDistributedSystem {
public Set<DistributedMember> shutDownAllMembers(long timeout) throws AdminException;
/**
- * Backup the persistent files for all of the members of the distributed
- * system that the admin member is connected to.
+ * Backup the persistent files for all of the members of the distributed system that the admin
+ * member is connected to.
*
* @param targetDir The directory where each member's backup should be placed.
*
- * @return The status of the backup, which includes the set of members
- * that were backed up and the set of members that were known to be
- * offline at the time of backup.
+ * @return The status of the backup, which includes the set of members that were backed up and the
+ * set of members that were known to be offline at the time of backup.
* @since GemFire 6.5
*/
public BackupStatus backupAllMembers(File targetDir) throws AdminException;
-
+
/**
- * Incrementally backup the persistent files for all of the members of the distributed
- * system that the admin member is connected to. Only new operation log files since the previous backup will be copied during this backup.
- * The generated restore script will reference and copy operation log files from the previous backup.
+ * Incrementally backup the persistent files for all of the members of the distributed system that
+ * the admin member is connected to. Only new operation log files since the previous backup will
+ * be copied during this backup. The generated restore script will reference and copy operation
+ * log files from the previous backup.
*
* @param targetDir The directory where each member's backup should be placed.
- * @param baselineDir The directory of a previous backup.
- * If this parameter is null or the directory does not exist (on a member by member basis)
- * a full backup will be performed for the member.
+ * @param baselineDir The directory of a previous backup. If this parameter is null or the
+ * directory does not exist (on a member by member basis) a full backup will be performed
+ * for the member.
*
- * @return The status of the backup, which includes the set of members
- * that were backed up and the set of members that were known to be
- * offline at the time of backup.
+ * @return The status of the backup, which includes the set of members that were backed up and the
+ * set of members that were known to be offline at the time of backup.
* @since GemFire 6.5
*/
- public BackupStatus backupAllMembers(File targetDir,File baselineDir) throws AdminException;
-
+ public BackupStatus backupAllMembers(File targetDir, File baselineDir) throws AdminException;
+
/**
- * Compact the persistent files for all of the members of the distributed
- * system that the admin member connected to.
+ * Compact the persistent files for all of the members of the distributed system that the admin
+ * member connected to.
*
* This is equivalent to calling {DiskStore#forceCompaction} on all members.
*
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
index 6f2af1f..60a8722 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystemFactory.java
@@ -1,18 +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
+ * 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.admin;
@@ -29,25 +27,25 @@ import org.apache.geode.internal.logging.LocalLogWriter;
import java.util.Properties;
/**
- * Factory for creating GemFire administration entities.
+ * Factory for creating GemFire administration entities.
*
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @since GemFire 3.5
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class AdminDistributedSystemFactory {
-
+
/**
- * Sets the address this VM should bind to when connecting to the distributed
- * system. This involves a system property, so using this option will limit
- * all connections to distributed systems to this one network interface.
+ * Sets the address this VM should bind to when connecting to the distributed system. This
+ * involves a system property, so using this option will limit all connections to distributed
+ * systems to this one network interface.
* <p>
- * Using a null or empty bindAddress will clear the usage of this option and
- * connections to distributed systems will return to using all available
- * network interfaces.
+ * Using a null or empty bindAddress will clear the usage of this option and connections to
+ * distributed systems will return to using all available network interfaces.
* <p>
- * This method always throws UnsupportedOperationException because it is
- * now deprecated and is unsafe to use. Please use {@link
- * DistributedSystemConfig#setBindAddress} instead.
+ * This method always throws UnsupportedOperationException because it is now deprecated and is
+ * unsafe to use. Please use {@link DistributedSystemConfig#setBindAddress} instead.
*
* @param bindAddress machine name or IP address to bind to
* @throws UnsupportedOperationException because of deprecation
@@ -55,101 +53,90 @@ public class AdminDistributedSystemFactory {
*/
@Deprecated
public static void bindToAddress(String bindAddress) {
- throw new UnsupportedOperationException(LocalizedStrings.AdminDistributedSystemFactory_PLEASE_USE_DISTRIBUTEDSYSTEMCONFIGSETBINDADDRESS_INSTEAD.toLocalizedString());
+ throw new UnsupportedOperationException(
+ LocalizedStrings.AdminDistributedSystemFactory_PLEASE_USE_DISTRIBUTEDSYSTEMCONFIGSETBINDADDRESS_INSTEAD
+ .toLocalizedString());
}
-
+
/**
- * Defines a "default" distributed system configuration based on VM
- * system properties and the content of
- * <code>gemfire.properties</code>. The {@linkplain
- * DistributedSystemConfig#DEFAULT_REMOTE_COMMAND} default remote
- * command is used.
+ * Defines a "default" distributed system configuration based on VM system properties and the
+ * content of <code>gemfire.properties</code>. The
+ * {@linkplain DistributedSystemConfig#DEFAULT_REMOTE_COMMAND} default remote command is used.
*
* @see DistributedSystem#connect
*/
public static DistributedSystemConfig defineDistributedSystem() {
DistributionConfig dc = new DistributionConfigImpl(new Properties());
- String remoteCommand =
- DistributedSystemConfig.DEFAULT_REMOTE_COMMAND;
+ String remoteCommand = DistributedSystemConfig.DEFAULT_REMOTE_COMMAND;
return new DistributedSystemConfigImpl(dc, remoteCommand);
}
/**
- * Call this method with a value of <code>true</code>
- * to dedicate the VM to GemFire administration only.
- * Default is <code>false</code>.
- * <p>This method <em>must</em> be called before calling
- * {@link AdminDistributedSystem#connect}. It <em>must</em> also be called
- * before {@link DistributedSystem#connect} is when creating a colocated distributed system.
+ * Call this method with a value of <code>true</code> to dedicate the VM to GemFire administration
+ * only. Default is <code>false</code>.
+ * <p>
+ * This method <em>must</em> be called before calling {@link AdminDistributedSystem#connect}. It
+ * <em>must</em> also be called before {@link DistributedSystem#connect} is when creating a
+ * colocated distributed system.
* <p>
* Once it has been enabled be careful to only use GemFire APIs from the
- * <code>org.apache.geode.admin</code> package. In particular do not create
- * a {@link org.apache.geode.cache.Cache} or a normal {@link DistributedSystem}.
+ * <code>org.apache.geode.admin</code> package. In particular do not create a
+ * {@link org.apache.geode.cache.Cache} or a normal {@link DistributedSystem}.
+ *
* @param adminOnly <code>true</code> if this VM should be limited to administration APIs;
- * <code>false</code> if this VM should allow all GemFire APIs.
- * @throws IllegalStateException if a {@link DistributedSystem}
- * or {@link AdminDistributedSystem} connection already exists.
+ * <code>false</code> if this VM should allow all GemFire APIs.
+ * @throws IllegalStateException if a {@link DistributedSystem} or {@link AdminDistributedSystem}
+ * connection already exists.
*
* @since GemFire 5.7
*/
public static void setEnableAdministrationOnly(boolean adminOnly) {
InternalDistributedSystem.setEnableAdministrationOnly(adminOnly);
}
-
+
/**
- * Defines a distributed system configuration for administering the
- * distributed system to which this VM is currently connected. The
- * <code>DistributedSystem</code> is used to configure the discovery
- * mechanism (multicast or locators), bind address, SSL attributes,
- * as well as the logger of the
- * <code>DistributedSystemConfig</code>. Note that the distributed
- * system will not be able to be administered until the {@link
- * AdminDistributedSystem#connect connect} method is invoked.
+ * Defines a distributed system configuration for administering the distributed system to which
+ * this VM is currently connected. The <code>DistributedSystem</code> is used to configure the
+ * discovery mechanism (multicast or locators), bind address, SSL attributes, as well as the
+ * logger of the <code>DistributedSystemConfig</code>. Note that the distributed system will not
+ * be able to be administered until the {@link AdminDistributedSystem#connect connect} method is
+ * invoked.
*
- * @param system
- * A connection to the distributed system
- * @param remoteCommand
- * The shell command that is used to launch processes that
- * run on remote machines. If <code>null</code>, then the
- * {@linkplain DistributedSystemConfig#DEFAULT_REMOTE_COMMAND
- * default} will be used.
+ * @param system A connection to the distributed system
+ * @param remoteCommand The shell command that is used to launch processes that run on remote
+ * machines. If <code>null</code>, then the
+ * {@linkplain DistributedSystemConfig#DEFAULT_REMOTE_COMMAND default} will be used.
*
* @since GemFire 4.0
*/
- public static DistributedSystemConfig
- defineDistributedSystem(DistributedSystem system,
- String remoteCommand)
- throws AdminException {
+ public static DistributedSystemConfig defineDistributedSystem(DistributedSystem system,
+ String remoteCommand) throws AdminException {
- InternalDistributedSystem internal =
- (InternalDistributedSystem) system;
+ InternalDistributedSystem internal = (InternalDistributedSystem) system;
if (remoteCommand == null) {
remoteCommand = DistributedSystemConfig.DEFAULT_REMOTE_COMMAND;
}
-
+
DistributedSystemConfigImpl impl =
- new DistributedSystemConfigImpl(internal.getConfig(),
- remoteCommand);
+ new DistributedSystemConfigImpl(internal.getConfig(), remoteCommand);
return impl;
}
/**
- * Returns the distributed system for administrative monitoring and
- * managing. You must then call {@link
- * AdminDistributedSystem#connect} before interacting with the
- * actual system.
+ * Returns the distributed system for administrative monitoring and managing. You must then call
+ * {@link AdminDistributedSystem#connect} before interacting with the actual system.
*
* @param config configuration definition of the system to administer
* @return administrative interface for a distributed system
*/
public static AdminDistributedSystem getDistributedSystem(DistributedSystemConfig config) {
- return new AdminDistributedSystemImpl((DistributedSystemConfigImpl)config);
+ return new AdminDistributedSystemImpl((DistributedSystemConfigImpl) config);
}
-
+
/**
- * Returns a default GemFire LogWriterI18n for logging. This LogWriterI18n will
- * log to standard out.
+ * Returns a default GemFire LogWriterI18n for logging. This LogWriterI18n will log to standard
+ * out.
*
* @return a GemFire LogWriterI18n for logging
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/AdminException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminException.java b/geode-core/src/main/java/org/apache/geode/admin/AdminException.java
index e7d574d..92b5e47 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminException.java
@@ -1,89 +1,81 @@
/*
- * 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
+ * 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.admin;
import org.apache.geode.GemFireCheckedException;
/**
- * An <code>AdminException</code> is thrown when administration or monitoring
- * of GemFire fails.
+ * An <code>AdminException</code> is thrown when administration or monitoring of GemFire fails.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class AdminException extends GemFireCheckedException {
-private static final long serialVersionUID = 879398950879472021L;
+ private static final long serialVersionUID = 879398950879472021L;
/**
- * Constructs a new exception with <code>null</code> as its detail message.
- * The cause is not initialized, and may subsequently be initialized by a
- * call to {@link Throwable#initCause}.
+ * Constructs a new exception with <code>null</code> as its detail message. The cause is not
+ * initialized, and may subsequently be initialized by a call to {@link Throwable#initCause}.
*/
public AdminException() {
super();
}
/**
- * Constructs a new exception with the specified detail message. The
- * cause is not initialized, and may subsequently be initialized by
- * a call to {@link Throwable#initCause}.
+ * Constructs a new exception with the specified detail message. The cause is not initialized, and
+ * may subsequently be initialized by a call to {@link Throwable#initCause}.
*
- * @param message the detail message. The detail message is saved for
- * later retrieval by the {@link #getMessage()} method.
+ * @param message the detail message. The detail message is saved for later retrieval by the
+ * {@link #getMessage()} method.
*/
public AdminException(String message) {
super(message);
}
/**
- * Constructs a new exception with the specified detail message and
- * cause. <p>Note that the detail message associated with
- * <code>cause</code> is <i>not</i> automatically incorporated in
- * this exception's detail message.
+ * Constructs a new exception with the specified detail message and cause.
+ * <p>
+ * Note that the detail message associated with <code>cause</code> is <i>not</i> automatically
+ * incorporated in this exception's detail message.
*
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
+ * @param message the detail message (which is saved for later retrieval by the
+ * {@link #getMessage()} method).
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or
+ * unknown.)
*/
public AdminException(String message, Throwable cause) {
super(message, cause);
}
/**
- * Constructs a new exception with the specified cause.
- * The detail
- * message will be <tt>(cause==null ? null : cause.toString())</tt> (which
- * typically contains the class and detail message of <tt>cause</tt>).
- * This constructor is useful for exceptions that are little more than
- * wrappers for other throwables (for example, {@link
- * java.security.PrivilegedActionException}).
+ * Constructs a new exception with the specified cause. The detail message will be
+ * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class and detail
+ * message of <tt>cause</tt>). This constructor is useful for exceptions that are little more than
+ * wrappers for other throwables (for example, {@link java.security.PrivilegedActionException}).
*
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or
+ * unknown.)
*/
public AdminException(Throwable cause) {
super(cause);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java b/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java
index e465ddc..ff1b48e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AdminXmlException.java
@@ -1,44 +1,41 @@
/*
- * 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
+ * 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.admin;
/**
- * Thrown when a problem is encountered while working with
- * admin-related XML data.
+ * Thrown when a problem is encountered while working with admin-related XML data.
*
* @see DistributedSystemConfig#getEntityConfigXMLFile
*
* @since GemFire 4.0
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class AdminXmlException extends RuntimeAdminException {
private static final long serialVersionUID = -6848726449157550169L;
/**
- * Creates a new <code>AdminXmlException</code> with the given
- * descriptive message.
+ * Creates a new <code>AdminXmlException</code> with the given descriptive message.
*/
public AdminXmlException(String s) {
super(s);
}
/**
- * Creates a new <code>AdminXmlException</code> with the given
- * descriptive message and cause.
+ * Creates a new <code>AdminXmlException</code> with the given descriptive message and cause.
*/
public AdminXmlException(String s, Throwable cause) {
super(s, cause);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/Alert.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/Alert.java b/geode-core/src/main/java/org/apache/geode/admin/Alert.java
index 9519cba..44c373e 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/Alert.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/Alert.java
@@ -1,45 +1,43 @@
/*
- * 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
+ * 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.admin;
/**
- * An administration alert that is issued by a member of a GemFire
- * distributed system. It is similar to a {@linkplain
- * org.apache.geode.i18n.LogWriterI18n log message}.
+ * An administration alert that is issued by a member of a GemFire distributed system. It is similar
+ * to a {@linkplain org.apache.geode.i18n.LogWriterI18n log message}.
*
- * @see AlertListener
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @see AlertListener
+ * @since GemFire 3.5
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface Alert {
-
+
/** The level at which this alert is issued */
public AlertLevel getLevel();
/**
- * The member of the distributed system that issued the alert, or
- * null if the issuer is no longer a member of the distributed system.
+ * The member of the distributed system that issued the alert, or null if the issuer is no longer
+ * a member of the distributed system.
*/
public SystemMember getSystemMember();
- /**
- * The name of the {@linkplain
- * org.apache.geode.distributed.DistributedSystem#getName
- * distributed system}) through which the alert was issued.
+ /**
+ * The name of the {@linkplain org.apache.geode.distributed.DistributedSystem#getName distributed
+ * system}) through which the alert was issued.
*/
public String getConnectionName();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java b/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
index 0791a5f..2fdcef8 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AlertLevel.java
@@ -1,18 +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
+ * 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.admin;
@@ -20,50 +18,46 @@ import org.apache.geode.internal.admin.Alert;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- * Type-safe enumeration for {@link org.apache.geode.admin.Alert
- * Alert} level.
+ * Type-safe enumeration for {@link org.apache.geode.admin.Alert Alert} level.
*
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @since GemFire 3.5
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class AlertLevel implements java.io.Serializable {
private static final long serialVersionUID = -4752438966587392126L;
-
- public static final AlertLevel WARNING =
- new AlertLevel(Alert.WARNING, "WARNING");
- public static final AlertLevel ERROR =
- new AlertLevel(Alert.ERROR, "ERROR");
- public static final AlertLevel SEVERE =
- new AlertLevel(Alert.SEVERE, "SEVERE");
-
- public static final AlertLevel OFF =
- new AlertLevel(Alert.OFF, "OFF");
+
+ public static final AlertLevel WARNING = new AlertLevel(Alert.WARNING, "WARNING");
+ public static final AlertLevel ERROR = new AlertLevel(Alert.ERROR, "ERROR");
+ public static final AlertLevel SEVERE = new AlertLevel(Alert.SEVERE, "SEVERE");
+
+ public static final AlertLevel OFF = new AlertLevel(Alert.OFF, "OFF");
/** The severity level of this AlertLevel. Greater is more severe. */
private final transient int severity;
-
+
/** The name of this AlertLevel. */
private final transient String name;
-
+
// The 4 declarations below are necessary for serialization
/** int used as ordinal to represent this AlertLevel */
public final int ordinal = nextOrdinal++;
private static int nextOrdinal = 0;
-
- private static final AlertLevel[] VALUES =
- { WARNING, ERROR, SEVERE, OFF };
+
+ private static final AlertLevel[] VALUES = {WARNING, ERROR, SEVERE, OFF};
private Object readResolve() throws java.io.ObjectStreamException {
- return VALUES[ordinal]; // Canonicalize
+ return VALUES[ordinal]; // Canonicalize
}
-
+
/** Creates a new instance of AlertLevel. */
private AlertLevel(int severity, String name) {
this.severity = severity;
this.name = name;
}
-
+
/** Return the AlertLevel represented by specified ordinal */
public static AlertLevel fromOrdinal(int ordinal) {
return VALUES[ordinal];
@@ -72,30 +66,29 @@ public class AlertLevel implements java.io.Serializable {
/**
* Returns the <code>AlertLevel</code> for the given severity
*
- * @throws IllegalArgumentException
- * If there is no alert level with the given
- * <code>severity</code>
+ * @throws IllegalArgumentException If there is no alert level with the given
+ * <code>severity</code>
*/
public static AlertLevel forSeverity(int severity) {
switch (severity) {
- case Alert.WARNING:
- return AlertLevel.WARNING;
- case Alert.ERROR:
- return AlertLevel.ERROR;
- case Alert.SEVERE:
- return AlertLevel.SEVERE;
- case Alert.OFF:
- return AlertLevel.OFF;
- default:
- throw new IllegalArgumentException(LocalizedStrings.AlertLevel_UNKNOWN_ALERT_SEVERITY_0.toLocalizedString(Integer.valueOf(severity)));
+ case Alert.WARNING:
+ return AlertLevel.WARNING;
+ case Alert.ERROR:
+ return AlertLevel.ERROR;
+ case Alert.SEVERE:
+ return AlertLevel.SEVERE;
+ case Alert.OFF:
+ return AlertLevel.OFF;
+ default:
+ throw new IllegalArgumentException(LocalizedStrings.AlertLevel_UNKNOWN_ALERT_SEVERITY_0
+ .toLocalizedString(Integer.valueOf(severity)));
}
}
/**
* Returns the <code>AlertLevel</code> with the given name
*
- * @throws IllegalArgumentException
- * If there is no alert level named <code>name</code>
+ * @throws IllegalArgumentException If there is no alert level named <code>name</code>
*/
public static AlertLevel forName(String name) {
for (int i = 0; i < VALUES.length; i++) {
@@ -105,13 +98,14 @@ public class AlertLevel implements java.io.Serializable {
}
}
- throw new IllegalArgumentException(LocalizedStrings.AlertLevel_THERE_IS_NO_ALERT_LEVEL_0.toLocalizedString(name));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AlertLevel_THERE_IS_NO_ALERT_LEVEL_0.toLocalizedString(name));
}
public int getSeverity() {
return this.severity;
}
-
+
public String getName() {
return this.name;
}
@@ -119,8 +113,8 @@ public class AlertLevel implements java.io.Serializable {
public static AlertLevel[] values() {
return VALUES;
}
-
- /**
+
+ /**
* Returns a string representation for this alert level.
*
* @return the name of this alert level
@@ -130,43 +124,45 @@ public class AlertLevel implements java.io.Serializable {
return this.name /* + "=" + this.severity */;
}
- /**
- * Indicates whether some other object is "equal to" this one.
- *
- * @param other the reference object with which to compare.
- * @return true if this object is the same as the obj argument;
- * false otherwise.
- */
+ /**
+ * Indicates whether some other object is "equal to" this one.
+ *
+ * @param other the reference object with which to compare.
+ * @return true if this object is the same as the obj argument; false otherwise.
+ */
@Override
- public boolean equals(Object other) {
- if (other == this) return true;
- if (other == null) return false;
- if (!(other instanceof AlertLevel)) return false;
- final AlertLevel that = (AlertLevel) other;
-
- if (this.severity != that.severity) return false;
- if (this.name != null &&
- !this.name.equals(that.name)) return false;
-
- return true;
- }
-
- /**
- * Returns a hash code for the object. This method is supported for the
- * benefit of hashtables such as those provided by java.util.Hashtable.
- *
- * @return the integer 0 if description is null; otherwise a unique integer.
- */
+ public boolean equals(Object other) {
+ if (other == this)
+ return true;
+ if (other == null)
+ return false;
+ if (!(other instanceof AlertLevel))
+ return false;
+ final AlertLevel that = (AlertLevel) other;
+
+ if (this.severity != that.severity)
+ return false;
+ if (this.name != null && !this.name.equals(that.name))
+ return false;
+
+ return true;
+ }
+
+ /**
+ * Returns a hash code for the object. This method is supported for the benefit of hashtables such
+ * as those provided by java.util.Hashtable.
+ *
+ * @return the integer 0 if description is null; otherwise a unique integer.
+ */
@Override
- public int hashCode() {
- int result = 17;
- final int mult = 37;
+ public int hashCode() {
+ int result = 17;
+ final int mult = 37;
- result = mult * result + this.severity;
- result = mult * result +
- (this.name == null ? 0 : this.name.hashCode());
+ result = mult * result + this.severity;
+ result = mult * result + (this.name == null ? 0 : this.name.hashCode());
- return result;
- }
+ return result;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java b/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
index f217817..247f4d0 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/AlertListener.java
@@ -1,25 +1,25 @@
/*
- * 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
+ * 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.admin;
/**
- * A listener whose callback methods are invoked when an {@link Alert}
- * is received.
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * A listener whose callback methods are invoked when an {@link Alert} is received.
+ *
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface AlertListener extends java.util.EventListener {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java b/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
index 802d37e..c696b07 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/BackupStatus.java
@@ -1,18 +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
+ * 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.admin;
@@ -27,22 +25,22 @@ import org.apache.geode.distributed.DistributedMember;
* {@link AdminDistributedSystem#backupAllMembers(java.io.File,java.io.File)}.
*
* @since GemFire 6.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public interface BackupStatus {
-
+
/**
- * Returns a map of disk stores that were successfully backed up.
- * The key is an online distributed member. The value is the set of disk
- * stores on that distributed member.
+ * Returns a map of disk stores that were successfully backed up. The key is an online distributed
+ * member. The value is the set of disk stores on that distributed member.
*/
Map<DistributedMember, Set<PersistentID>> getBackedUpDiskStores();
-
+
/**
- * Returns the set of disk stores that were known to be offline at the
- * time of the backup. These members were not backed up. If this set
- * is not empty the backup may not contain a complete snapshot of
- * any partitioned regions in the distributed system.
+ * Returns the set of disk stores that were known to be offline at the time of the backup. These
+ * members were not backed up. If this set is not empty the backup may not contain a complete
+ * snapshot of any partitioned regions in the distributed system.
*/
Set<PersistentID> getOfflineDiskStores();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java b/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
index ac43c1f..338061e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheDoesNotExistException.java
@@ -1,86 +1,80 @@
/*
- * 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
+ * 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.admin;
/**
- * An <code>CacheDoesNotExistException</code> is thrown when an attempt
- * is made to get a cache and one does not exist.
+ * An <code>CacheDoesNotExistException</code> is thrown when an attempt is made to get a cache and
+ * one does not exist.
*
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
+ * @since GemFire 3.5
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
*/
public class CacheDoesNotExistException extends AdminException {
-private static final long serialVersionUID = -1639933911265729978L;
+ private static final long serialVersionUID = -1639933911265729978L;
/**
- * Constructs a new exception with <code>null</code> as its detail message.
- * The cause is not initialized, and may subsequently be initialized by a
- * call to {@link Throwable#initCause}.
+ * Constructs a new exception with <code>null</code> as its detail message. The cause is not
+ * initialized, and may subsequently be initialized by a call to {@link Throwable#initCause}.
*/
public CacheDoesNotExistException() {
super();
}
/**
- * Constructs a new exception with the specified detail message. The
- * cause is not initialized, and may subsequently be initialized by
- * a call to {@link Throwable#initCause}.
+ * Constructs a new exception with the specified detail message. The cause is not initialized, and
+ * may subsequently be initialized by a call to {@link Throwable#initCause}.
*
- * @param message the detail message. The detail message is saved for
- * later retrieval by the {@link #getMessage()} method.
+ * @param message the detail message. The detail message is saved for later retrieval by the
+ * {@link #getMessage()} method.
*/
public CacheDoesNotExistException(String message) {
super(message);
}
/**
- * Constructs a new exception with the specified detail message and
- * cause. <p>Note that the detail message associated with
- * <code>cause</code> is <i>not</i> automatically incorporated in
- * this exception's detail message.
+ * Constructs a new exception with the specified detail message and cause.
+ * <p>
+ * Note that the detail message associated with <code>cause</code> is <i>not</i> automatically
+ * incorporated in this exception's detail message.
*
- * @param message the detail message (which is saved for later retrieval
- * by the {@link #getMessage()} method).
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
+ * @param message the detail message (which is saved for later retrieval by the
+ * {@link #getMessage()} method).
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or
+ * unknown.)
*/
public CacheDoesNotExistException(String message, Throwable cause) {
super(message, cause);
}
/**
- * Constructs a new exception with the specified cause and a detail
- * message of <tt>(cause==null ? null : cause.toString())</tt> (which
- * typically contains the class and detail message of <tt>cause</tt>).
- * This constructor is useful for exceptions that are little more than
- * wrappers for other throwables (for example, {@link
- * java.security.PrivilegedActionException}).
+ * Constructs a new exception with the specified cause and a detail message of
+ * <tt>(cause==null ? null : cause.toString())</tt> (which typically contains the class and detail
+ * message of <tt>cause</tt>). This constructor is useful for exceptions that are little more than
+ * wrappers for other throwables (for example, {@link java.security.PrivilegedActionException}).
*
- * @param cause the cause (which is saved for later retrieval by the
- * {@link #getCause()} method). (A <tt>null</tt> value is
- * permitted, and indicates that the cause is nonexistent or
- * unknown.)
+ * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method).
+ * (A <tt>null</tt> value is permitted, and indicates that the cause is nonexistent or
+ * unknown.)
*/
public CacheDoesNotExistException(Throwable cause) {
super(cause);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java b/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
index f2aeb6d..9f99309 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheHealthConfig.java
@@ -1,60 +1,56 @@
/*
- * 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
+ * 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.admin;
/**
- * Provides configuration information relating to the health of a
- * member of a GemFire distributed system that hosts a GemFire {@link
- * org.apache.geode.cache.Cache Cache}.
+ * Provides configuration information relating to the health of a member of a GemFire distributed
+ * system that hosts a GemFire {@link org.apache.geode.cache.Cache Cache}.
*
* <P>
*
- * If any of the following criteria is true, then a cache member is
- * considered to be in {@link GemFireHealth#OKAY_HEALTH OKAY_HEALTH}.
+ * If any of the following criteria is true, then a cache member is considered to be in
+ * {@link GemFireHealth#OKAY_HEALTH OKAY_HEALTH}.
*
* <UL>
*
- * <LI><code>netSearch</code> operations take {@linkplain
- * #getMaxNetSearchTime too long} to complete.</LI>
+ * <LI><code>netSearch</code> operations take {@linkplain #getMaxNetSearchTime too long} to
+ * complete.</LI>
*
- * <LI>Cache <code>load</code> operations take {@linkplain
- * #getMaxLoadTime too long} to complete.</LI>
+ * <LI>Cache <code>load</code> operations take {@linkplain #getMaxLoadTime too long} to
+ * complete.</LI>
*
- * <LI>The overall cache {@link #getMinHitRatio hitRatio} is too
- * small</LI>
+ * <LI>The overall cache {@link #getMinHitRatio hitRatio} is too small</LI>
*
- * <LI>The number of entries in the Cache {@link #getMaxEventQueueSize
- * event delivery queue} is too large.</LI>
+ * <LI>The number of entries in the Cache {@link #getMaxEventQueueSize event delivery queue} is too
+ * large.</LI>
*
- * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#FULL_ACCESS FULL_ACCESS}
- * on role loss.</LI>
+ * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#FULL_ACCESS
+ * FULL_ACCESS} on role loss.</LI>
*
* </UL>
*
- * If any of the following criteria is true, then a cache member is
- * considered to be in {@link GemFireHealth#POOR_HEALTH POOR_HEALTH}.
+ * If any of the following criteria is true, then a cache member is considered to be in
+ * {@link GemFireHealth#POOR_HEALTH POOR_HEALTH}.
*
* <UL>
*
- * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#NO_ACCESS NO_ACCESS}
- * on role loss.</LI>
+ * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#NO_ACCESS
+ * NO_ACCESS} on role loss.</LI>
*
- * <LI>If one of the regions is configured with {@link org.apache.geode.cache.LossAction#LIMITED_ACCESS LIMITED_ACCESS}
- * on role loss.</LI>
+ * <LI>If one of the regions is configured with
+ * {@link org.apache.geode.cache.LossAction#LIMITED_ACCESS LIMITED_ACCESS} on role loss.</LI>
*
* </UL>
*
@@ -64,60 +60,61 @@ package org.apache.geode.admin;
*
*
* @since GemFire 3.5
- * @deprecated as of 7.0 use the <code><a href="{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code> package instead
- * */
+ * @deprecated as of 7.0 use the <code><a href=
+ * "{@docRoot}/org/apache/geode/management/package-summary.html">management</a></code>
+ * package instead
+ */
public interface CacheHealthConfig {
- /** The default maximum number of milliseconds a
- * <code>netSearch</code> operation can take before the cache member
- * is considered to be unhealthy. */
+ /**
+ * The default maximum number of milliseconds a <code>netSearch</code> operation can take before
+ * the cache member is considered to be unhealthy.
+ */
public static final long DEFAULT_MAX_NET_SEARCH_TIME = 60 * 1000;
- /** The default maximum mumber of milliseconds a cache
- * <code>load</code> operation can take before the cache member is
- * considered to be unhealthy. */
+ /**
+ * The default maximum mumber of milliseconds a cache <code>load</code> operation can take before
+ * the cache member is considered to be unhealthy.
+ */
public static final long DEFAULT_MAX_LOAD_TIME = 60 * 1000;
/** The default minimum hit ratio of a healthy cache member. */
public static final double DEFAULT_MIN_HIT_RATIO = 0.0;
- /** The default maximum number of entries in the event delivery queue
- * of a healthy cache member. */
+ /**
+ * The default maximum number of entries in the event delivery queue of a healthy cache member.
+ */
public static final long DEFAULT_MAX_EVENT_QUEUE_SIZE = 1000;
- /////////////////////// Instance Methods ///////////////////////
-
+ /////////////////////// Instance Methods ///////////////////////
+
/**
- * Returns the maximum number of milliseconds a
- * <code>netSearch</code> operation can take before the cache member
- * is considered to be unhealthy.
+ * Returns the maximum number of milliseconds a <code>netSearch</code> operation can take before
+ * the cache member is considered to be unhealthy.
*
* @see #DEFAULT_MAX_NET_SEARCH_TIME
*/
public long getMaxNetSearchTime();
/**
- * Sets the maximum number of milliseconds a
- * <code>netSearch</code> operation can take before the cache member
- * is considered to be unhealthy.
+ * Sets the maximum number of milliseconds a <code>netSearch</code> operation can take before the
+ * cache member is considered to be unhealthy.
*
* @see #getMaxNetSearchTime
*/
public void setMaxNetSearchTime(long maxNetSearchTime);
/**
- * Returns the maximum mumber of milliseconds a cache
- * <code>load</code> operation can take before the cache member is
- * considered to be unhealthy.
+ * Returns the maximum mumber of milliseconds a cache <code>load</code> operation can take before
+ * the cache member is considered to be unhealthy.
*
* @see #DEFAULT_MAX_LOAD_TIME
*/
public long getMaxLoadTime();
/**
- * Sets the maximum mumber of milliseconds a cache
- * <code>load</code> operation can take before the cache member is
- * considered to be unhealthy.
+ * Sets the maximum mumber of milliseconds a cache <code>load</code> operation can take before the
+ * cache member is considered to be unhealthy.
*
* @see #getMaxLoadTime
*/
@@ -138,16 +135,14 @@ public interface CacheHealthConfig {
public void setMinHitRatio(double minHitRatio);
/**
- * Returns the maximum number of entries in the event delivery queue
- * of a healthy cache member.
+ * Returns the maximum number of entries in the event delivery queue of a healthy cache member.
*
* @see #DEFAULT_MAX_EVENT_QUEUE_SIZE
*/
public long getMaxEventQueueSize();
/**
- * Sets the maximum number of entries in the event delivery queue
- * of a healthy cache member.
+ * Sets the maximum number of entries in the event delivery queue of a healthy cache member.
*
* @see #getMaxEventQueueSize
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java b/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
index 0149a05..a229281 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheServer.java
@@ -1,24 +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
+ * 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.admin;
/**
- * A dedicated cache server VM that is managed by the administration
- * API.
+ * A dedicated cache server VM that is managed by the administration API.
*
* @since GemFire 4.0
* @deprecated as of 5.7 use {@link CacheVm} instead.
@@ -27,15 +24,16 @@ package org.apache.geode.admin;
public interface CacheServer extends SystemMember, ManagedEntity {
/**
* Returns the configuration of this cache vm
+ *
* @deprecated as of 5.7 use {@link CacheVm#getVmConfig} instead.
*/
@Deprecated
public CacheServerConfig getConfig();
+
/**
* Find whether this server is primary for given client (durableClientId)
*
- * @param durableClientId -
- * durable-id of the client
+ * @param durableClientId - durable-id of the client
* @return true if the server is primary for given client
*
* @since GemFire 5.6
[49/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/etc/intellij-java-google-style.xml
----------------------------------------------------------------------
diff --git a/etc/intellij-java-google-style.xml b/etc/intellij-java-google-style.xml
new file mode 100644
index 0000000..22d9c23
--- /dev/null
+++ b/etc/intellij-java-google-style.xml
@@ -0,0 +1,365 @@
+<code_scheme name="GoogleStyle">
+ <option name="JAVA_INDENT_OPTIONS">
+ <value>
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="8" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </value>
+ </option>
+ <option name="OTHER_INDENT_OPTIONS">
+ <value>
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="8" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </value>
+ </option>
+ <option name="LINE_SEPARATOR" value="
" />
+ <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+ <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
+ <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+ <value />
+ </option>
+ <option name="IMPORT_LAYOUT_TABLE">
+ <value>
+ <package name="" withSubpackages="true" static="true" />
+ <emptyLine />
+ <package name="com.google" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="android" withSubpackages="true" static="false" />
+ <package name="antenna" withSubpackages="true" static="false" />
+ <package name="antlr" withSubpackages="true" static="false" />
+ <package name="ar" withSubpackages="true" static="false" />
+ <package name="asposewobfuscated" withSubpackages="true" static="false" />
+ <package name="asquare" withSubpackages="true" static="false" />
+ <package name="atg" withSubpackages="true" static="false" />
+ <package name="au" withSubpackages="true" static="false" />
+ <package name="beaver" withSubpackages="true" static="false" />
+ <package name="bibtex" withSubpackages="true" static="false" />
+ <package name="bmsi" withSubpackages="true" static="false" />
+ <package name="bsh" withSubpackages="true" static="false" />
+ <package name="ccl" withSubpackages="true" static="false" />
+ <package name="cern" withSubpackages="true" static="false" />
+ <package name="ChartDirector" withSubpackages="true" static="false" />
+ <package name="checkers" withSubpackages="true" static="false" />
+ <package name="com" withSubpackages="true" static="false" />
+ <package name="COM" withSubpackages="true" static="false" />
+ <package name="common" withSubpackages="true" static="false" />
+ <package name="contribs" withSubpackages="true" static="false" />
+ <package name="corejava" withSubpackages="true" static="false" />
+ <package name="cryptix" withSubpackages="true" static="false" />
+ <package name="cybervillains" withSubpackages="true" static="false" />
+ <package name="dalvik" withSubpackages="true" static="false" />
+ <package name="danbikel" withSubpackages="true" static="false" />
+ <package name="de" withSubpackages="true" static="false" />
+ <package name="EDU" withSubpackages="true" static="false" />
+ <package name="eg" withSubpackages="true" static="false" />
+ <package name="eu" withSubpackages="true" static="false" />
+ <package name="examples" withSubpackages="true" static="false" />
+ <package name="fat" withSubpackages="true" static="false" />
+ <package name="fit" withSubpackages="true" static="false" />
+ <package name="fitlibrary" withSubpackages="true" static="false" />
+ <package name="fmpp" withSubpackages="true" static="false" />
+ <package name="freemarker" withSubpackages="true" static="false" />
+ <package name="gnu" withSubpackages="true" static="false" />
+ <package name="groovy" withSubpackages="true" static="false" />
+ <package name="groovyjarjarantlr" withSubpackages="true" static="false" />
+ <package name="groovyjarjarasm" withSubpackages="true" static="false" />
+ <package name="hak" withSubpackages="true" static="false" />
+ <package name="hep" withSubpackages="true" static="false" />
+ <package name="ie" withSubpackages="true" static="false" />
+ <package name="io" withSubpackages="true" static="false" />
+ <package name="imageinfo" withSubpackages="true" static="false" />
+ <package name="info" withSubpackages="true" static="false" />
+ <package name="it" withSubpackages="true" static="false" />
+ <package name="jal" withSubpackages="true" static="false" />
+ <package name="Jama" withSubpackages="true" static="false" />
+ <package name="japa" withSubpackages="true" static="false" />
+ <package name="japacheckers" withSubpackages="true" static="false" />
+ <package name="jas" withSubpackages="true" static="false" />
+ <package name="jasmin" withSubpackages="true" static="false" />
+ <package name="javancss" withSubpackages="true" static="false" />
+ <package name="javanet" withSubpackages="true" static="false" />
+ <package name="javassist" withSubpackages="true" static="false" />
+ <package name="javazoom" withSubpackages="true" static="false" />
+ <package name="java_cup" withSubpackages="true" static="false" />
+ <package name="jcifs" withSubpackages="true" static="false" />
+ <package name="jetty" withSubpackages="true" static="false" />
+ <package name="JFlex" withSubpackages="true" static="false" />
+ <package name="jj2000" withSubpackages="true" static="false" />
+ <package name="jline" withSubpackages="true" static="false" />
+ <package name="jp" withSubpackages="true" static="false" />
+ <package name="JSci" withSubpackages="true" static="false" />
+ <package name="jsr166y" withSubpackages="true" static="false" />
+ <package name="junit" withSubpackages="true" static="false" />
+ <package name="jxl" withSubpackages="true" static="false" />
+ <package name="jxxload_help" withSubpackages="true" static="false" />
+ <package name="kawa" withSubpackages="true" static="false" />
+ <package name="kea" withSubpackages="true" static="false" />
+ <package name="libcore" withSubpackages="true" static="false" />
+ <package name="libsvm" withSubpackages="true" static="false" />
+ <package name="lti" withSubpackages="true" static="false" />
+ <package name="memetic" withSubpackages="true" static="false" />
+ <package name="mt" withSubpackages="true" static="false" />
+ <package name="mx4j" withSubpackages="true" static="false" />
+ <package name="net" withSubpackages="true" static="false" />
+ <package name="netscape" withSubpackages="true" static="false" />
+ <package name="nl" withSubpackages="true" static="false" />
+ <package name="nu" withSubpackages="true" static="false" />
+ <package name="oauth" withSubpackages="true" static="false" />
+ <package name="ognl" withSubpackages="true" static="false" />
+ <package name="opennlp" withSubpackages="true" static="false" />
+ <package name="oracle" withSubpackages="true" static="false" />
+ <package name="org" withSubpackages="true" static="false" />
+ <package name="penn2dg" withSubpackages="true" static="false" />
+ <package name="pennconverter" withSubpackages="true" static="false" />
+ <package name="pl" withSubpackages="true" static="false" />
+ <package name="prefuse" withSubpackages="true" static="false" />
+ <package name="proguard" withSubpackages="true" static="false" />
+ <package name="repackage" withSubpackages="true" static="false" />
+ <package name="scm" withSubpackages="true" static="false" />
+ <package name="se" withSubpackages="true" static="false" />
+ <package name="serp" withSubpackages="true" static="false" />
+ <package name="simple" withSubpackages="true" static="false" />
+ <package name="soot" withSubpackages="true" static="false" />
+ <package name="sqlj" withSubpackages="true" static="false" />
+ <package name="src" withSubpackages="true" static="false" />
+ <package name="ssa" withSubpackages="true" static="false" />
+ <package name="sun" withSubpackages="true" static="false" />
+ <package name="sunlabs" withSubpackages="true" static="false" />
+ <package name="tcl" withSubpackages="true" static="false" />
+ <package name="testdata" withSubpackages="true" static="false" />
+ <package name="testshell" withSubpackages="true" static="false" />
+ <package name="testsuite" withSubpackages="true" static="false" />
+ <package name="twitter4j" withSubpackages="true" static="false" />
+ <package name="uk" withSubpackages="true" static="false" />
+ <package name="ViolinStrings" withSubpackages="true" static="false" />
+ <package name="weka" withSubpackages="true" static="false" />
+ <package name="wet" withSubpackages="true" static="false" />
+ <package name="winstone" withSubpackages="true" static="false" />
+ <package name="woolfel" withSubpackages="true" static="false" />
+ <package name="wowza" withSubpackages="true" static="false" />
+ <emptyLine />
+ <package name="java" withSubpackages="true" static="false" />
+ <package name="javax" withSubpackages="true" static="false" />
+ <package name="" withSubpackages="true" static="false" />
+ </value>
+ </option>
+ <option name="STATIC_METHODS_ORDER_WEIGHT" value="5" />
+ <option name="METHODS_ORDER_WEIGHT" value="4" />
+ <option name="RIGHT_MARGIN" value="100" />
+ <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+ <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+ <option name="JD_ADD_BLANK_AFTER_DESCRIPTION" value="false" />
+ <option name="JD_P_AT_EMPTY_LINES" value="false" />
+ <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+ <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+ <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+ <option name="HTML_KEEP_BLANK_LINES" value="1" />
+ <option name="HTML_ALIGN_TEXT" value="true" />
+ <option name="KEEP_LINE_BREAKS" value="false" />
+ <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+ <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+ <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+ <option name="BLANK_LINES_AROUND_CLASS" value="0" />
+ <option name="BLANK_LINES_AROUND_FIELD" value="1" />
+ <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+ <option name="BRACE_STYLE" value="2" />
+ <option name="CLASS_BRACE_STYLE" value="2" />
+ <option name="METHOD_BRACE_STYLE" value="2" />
+ <option name="ELSE_ON_NEW_LINE" value="true" />
+ <option name="WHILE_ON_NEW_LINE" value="true" />
+ <option name="CATCH_ON_NEW_LINE" value="true" />
+ <option name="FINALLY_ON_NEW_LINE" value="true" />
+ <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+ <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+ <option name="SPACE_AFTER_TYPE_CAST" value="false" />
+ <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
+ <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="CALL_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+ <option name="METHOD_PARAMETERS_WRAP" value="1" />
+ <option name="EXTENDS_LIST_WRAP" value="1" />
+ <option name="THROWS_LIST_WRAP" value="1" />
+ <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+ <option name="THROWS_KEYWORD_WRAP" value="1" />
+ <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="WRAP_COMMENTS" value="true" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <JavaCodeStyleSettings>
+ <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+ <option name="CLASS_NAMES_IN_JAVADOC" value="3" />
+ </JavaCodeStyleSettings>
+ <MarkdownNavigatorCodeStyleSettings>
+ <option name="RIGHT_MARGIN" value="72" />
+ </MarkdownNavigatorCodeStyleSettings>
+ <XML>
+ <option name="XML_KEEP_BLANK_LINES" value="1" />
+ <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+ </XML>
+ <ADDITIONAL_INDENT_OPTIONS fileType="haml">
+ <option name="INDENT_SIZE" value="2" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="java">
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="8" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="js">
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="sass">
+ <option name="INDENT_SIZE" value="2" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <ADDITIONAL_INDENT_OPTIONS fileType="yml">
+ <option name="INDENT_SIZE" value="2" />
+ </ADDITIONAL_INDENT_OPTIONS>
+ <codeStyleSettings language="ECMA Script Level 4">
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_WRAP" value="1" />
+ <option name="EXTENDS_LIST_WRAP" value="1" />
+ <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+ <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="WRAP_COMMENTS" value="true" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+ </codeStyleSettings>
+ <codeStyleSettings language="JAVA">
+ <option name="RIGHT_MARGIN" value="100" />
+ <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_WRAP" value="1" />
+ <option name="EXTENDS_LIST_WRAP" value="1" />
+ <option name="THROWS_LIST_WRAP" value="1" />
+ <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+ <option name="THROWS_KEYWORD_WRAP" value="1" />
+ <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <indentOptions>
+ <option name="INDENT_SIZE" value="2" />
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ <option name="TAB_SIZE" value="8" />
+ </indentOptions>
+ </codeStyleSettings>
+ <codeStyleSettings language="JavaScript">
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="WRAP_COMMENTS" value="true" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+ </codeStyleSettings>
+ <codeStyleSettings language="PHP">
+ <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
+ <option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
+ <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+ <option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+ <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
+ <option name="CALL_PARAMETERS_WRAP" value="1" />
+ <option name="METHOD_PARAMETERS_WRAP" value="1" />
+ <option name="EXTENDS_LIST_WRAP" value="1" />
+ <option name="THROWS_LIST_WRAP" value="1" />
+ <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+ <option name="THROWS_KEYWORD_WRAP" value="1" />
+ <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+ <option name="BINARY_OPERATION_WRAP" value="1" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="TERNARY_OPERATION_WRAP" value="1" />
+ <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="5" />
+ <option name="WRAP_COMMENTS" value="true" />
+ <option name="IF_BRACE_FORCE" value="3" />
+ <option name="DOWHILE_BRACE_FORCE" value="3" />
+ <option name="WHILE_BRACE_FORCE" value="3" />
+ <option name="FOR_BRACE_FORCE" value="3" />
+ <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+ <indentOptions>
+ <option name="INDENT_SIZE" value="4" />
+ <option name="CONTINUATION_INDENT_SIZE" value="8" />
+ <option name="TAB_SIZE" value="4" />
+ <option name="USE_TAB_CHARACTER" value="false" />
+ <option name="SMART_TABS" value="false" />
+ <option name="LABEL_INDENT_SIZE" value="0" />
+ <option name="LABEL_INDENT_ABSOLUTE" value="false" />
+ <option name="USE_RELATIVE_INDENTS" value="false" />
+ </indentOptions>
+ </codeStyleSettings>
+</code_scheme>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/etc/intellijIdeaCodeStyle.xml
----------------------------------------------------------------------
diff --git a/etc/intellijIdeaCodeStyle.xml b/etc/intellijIdeaCodeStyle.xml
deleted file mode 100755
index 0b5c31b..0000000
--- a/etc/intellijIdeaCodeStyle.xml
+++ /dev/null
@@ -1,477 +0,0 @@
-<code_scheme name="Apache Geode">
- <option name="OTHER_INDENT_OPTIONS">
- <value>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="2" />
- <option name="TAB_SIZE" value="2" />
- <option name="USE_TAB_CHARACTER" value="false" />
- <option name="SMART_TABS" value="false" />
- <option name="LABEL_INDENT_SIZE" value="0" />
- <option name="LABEL_INDENT_ABSOLUTE" value="false" />
- <option name="USE_RELATIVE_INDENTS" value="false" />
- </value>
- </option>
- <option name="LINE_SEPARATOR" value="
" />
- <option name="GENERATE_FINAL_LOCALS" value="true" />
- <option name="GENERATE_FINAL_PARAMETERS" value="true" />
- <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
- <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1000" />
- <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="1" />
- <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
- <value />
- </option>
- <option name="IMPORT_LAYOUT_TABLE">
- <value>
- <package name="" withSubpackages="true" static="true" />
- <emptyLine />
- <package name="java" withSubpackages="true" static="false" />
- <emptyLine />
- <package name="javax" withSubpackages="true" static="false" />
- <emptyLine />
- <package name="" withSubpackages="true" static="false" />
- <emptyLine />
- <package name="org.apache.geode" withSubpackages="true" static="false" />
- <emptyLine />
- <package name="com.gemstone" withSubpackages="true" static="false" />
- </value>
- </option>
- <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
- <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
- <option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
- <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
- <option name="JD_KEEP_INVALID_TAGS" value="false" />
- <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
- <option name="HTML_ATTRIBUTE_WRAP" value="0" />
- <option name="HTML_ALIGN_TEXT" value="true" />
- <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" />
- <option name="WRAP_COMMENTS" value="true" />
- <JavaCodeStyleSettings>
- <option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
- </JavaCodeStyleSettings>
- <XML>
- <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
- </XML>
- <codeStyleSettings language="Groovy">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="2" />
- <option name="TAB_SIZE" value="2" />
- </indentOptions>
- </codeStyleSettings>
- <codeStyleSettings language="JAVA">
- <option name="RIGHT_MARGIN" value="999" />
- <option name="KEEP_LINE_BREAKS" value="false" />
- <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
- <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
- <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
- <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
- <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
- <option name="ALIGN_MULTILINE_PARENTHESIZED_EXPRESSION" value="true" />
- <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
- <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
- <option name="PREFER_PARAMETERS_WRAP" value="true" />
- <option name="METHOD_PARAMETERS_WRAP" value="5" />
- <option name="EXTENDS_KEYWORD_WRAP" value="1" />
- <option name="THROWS_KEYWORD_WRAP" value="1" />
- <option name="METHOD_CALL_CHAIN_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_WRAP" value="5" />
- <option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
- <option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
- <option name="IF_BRACE_FORCE" value="3" />
- <option name="DOWHILE_BRACE_FORCE" value="3" />
- <option name="WHILE_BRACE_FORCE" value="3" />
- <option name="FOR_BRACE_FORCE" value="3" />
- <option name="VARIABLE_ANNOTATION_WRAP" value="2" />
- <option name="WRAP_ON_TYPING" value="0" />
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="2" />
- <option name="TAB_SIZE" value="2" />
- </indentOptions>
- <arrangement>
- <tokens>
- <token id="visibility" name="visibility">
- <rules>
- <rule>
- <match>
- <PUBLIC>true</PUBLIC>
- </match>
- </rule>
- <rule>
- <match>
- <PROTECTED>true</PROTECTED>
- </match>
- </rule>
- <rule>
- <match>
- <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
- </match>
- </rule>
- <rule>
- <match>
- <PRIVATE>true</PRIVATE>
- </match>
- </rule>
- </rules>
- </token>
- </tokens>
- <rules>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <FINAL>true</FINAL>
- <PUBLIC>true</PUBLIC>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <FINAL>true</FINAL>
- <PROTECTED>true</PROTECTED>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <FINAL>true</FINAL>
- <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <FINAL>true</FINAL>
- <PRIVATE>true</PRIVATE>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PUBLIC>true</PUBLIC>
- <STATIC>true</STATIC>
- <VOLATILE>true</VOLATILE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PROTECTED>true</PROTECTED>
- <STATIC>true</STATIC>
- <VOLATILE>true</VOLATILE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
- <STATIC>true</STATIC>
- <VOLATILE>true</VOLATILE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PRIVATE>true</PRIVATE>
- <STATIC>true</STATIC>
- <VOLATILE>true</VOLATILE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PUBLIC>true</PUBLIC>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PROTECTED>true</PROTECTED>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PRIVATE>true</PRIVATE>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <FINAL>true</FINAL>
- <PUBLIC>true</PUBLIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <FINAL>true</FINAL>
- <PROTECTED>true</PROTECTED>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <FINAL>true</FINAL>
- <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <FINAL>true</FINAL>
- <PRIVATE>true</PRIVATE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PUBLIC>true</PUBLIC>
- <VOLATILE>true</VOLATILE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PROTECTED>true</PROTECTED>
- <VOLATILE>true</VOLATILE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
- <VOLATILE>true</VOLATILE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PRIVATE>true</PRIVATE>
- <VOLATILE>true</VOLATILE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PUBLIC>true</PUBLIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PROTECTED>true</PROTECTED>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PACKAGE_PRIVATE>true</PACKAGE_PRIVATE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <FIELD>true</FIELD>
- <PRIVATE>true</PRIVATE>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <FIELD>true</FIELD>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <INITIALIZER_BLOCK>true</INITIALIZER_BLOCK>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <CONSTRUCTOR>true</CONSTRUCTOR>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <METHOD>true</METHOD>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <METHOD>true</METHOD>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <ENUM>true</ENUM>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <INTERFACE>true</INTERFACE>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <AND>
- <CLASS>true</CLASS>
- <STATIC>true</STATIC>
- </AND>
- </match>
- </rule>
- </section>
- <section>
- <rule>
- <match>
- <CLASS>true</CLASS>
- </match>
- </rule>
- </section>
- </rules>
- </arrangement>
- </codeStyleSettings>
- <codeStyleSettings language="XML">
- <indentOptions>
- <option name="INDENT_SIZE" value="2" />
- <option name="CONTINUATION_INDENT_SIZE" value="2" />
- <option name="TAB_SIZE" value="2" />
- </indentOptions>
- </codeStyleSettings>
-</code_scheme>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/AbstractSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/AbstractSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/AbstractSessionCache.java
index 7f2aedf..8a7f6f8 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/AbstractSessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/AbstractSessionCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.common;
@@ -28,15 +26,15 @@ import javax.servlet.http.HttpSession;
public abstract class AbstractSessionCache implements SessionCache {
/**
- * The sessionRegion is the <code>Region</code> that actually stores and
- * replicates the <code>Session</code>s.
+ * The sessionRegion is the <code>Region</code> that actually stores and replicates the
+ * <code>Session</code>s.
*/
protected Region<String, HttpSession> sessionRegion;
/**
- * The operatingRegion is the <code>Region</code> used to do HTTP operations.
- * if local cache is enabled, then this will be the local <code>Region</code>;
- * otherwise, it will be the session <code>Region</code>.
+ * The operatingRegion is the <code>Region</code> used to do HTTP operations. if local cache is
+ * enabled, then this will be the local <code>Region</code>; otherwise, it will be the session
+ * <code>Region</code>.
*/
protected Region<String, HttpSession> operatingRegion;
@@ -70,32 +68,29 @@ public abstract class AbstractSessionCache implements SessionCache {
}
protected void createStatistics() {
- this.statistics =
- new DeltaSessionStatistics(getCache().getDistributedSystem(),
- (String) properties.get(CacheProperty.STATISTICS_NAME));
+ this.statistics = new DeltaSessionStatistics(getCache().getDistributedSystem(),
+ (String) properties.get(CacheProperty.STATISTICS_NAME));
}
/**
- * Build up a {@code RegionConfiguraton} object from parameters originally
- * passed in as filter initialization parameters.
+ * Build up a {@code RegionConfiguraton} object from parameters originally passed in as filter
+ * initialization parameters.
*
* @return a {@code RegionConfiguration} object
*/
protected RegionConfiguration createRegionConfiguration() {
RegionConfiguration configuration = new RegionConfiguration();
- configuration.setRegionName(
- (String) properties.get(CacheProperty.REGION_NAME));
- configuration.setRegionAttributesId(
- (String) properties.get(CacheProperty.REGION_ATTRIBUTES_ID));
+ configuration.setRegionName((String) properties.get(CacheProperty.REGION_NAME));
+ configuration
+ .setRegionAttributesId((String) properties.get(CacheProperty.REGION_ATTRIBUTES_ID));
configuration.setEnableGatewayDeltaReplication(
- (Boolean) properties.get(
- CacheProperty.ENABLE_GATEWAY_DELTA_REPLICATION));
+ (Boolean) properties.get(CacheProperty.ENABLE_GATEWAY_DELTA_REPLICATION));
configuration.setEnableGatewayReplication(
(Boolean) properties.get(CacheProperty.ENABLE_GATEWAY_REPLICATION));
- configuration.setEnableDebugListener(
- (Boolean) properties.get(CacheProperty.ENABLE_DEBUG_LISTENER));
+ configuration
+ .setEnableDebugListener((Boolean) properties.get(CacheProperty.ENABLE_DEBUG_LISTENER));
return configuration;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/CacheProperty.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/CacheProperty.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/CacheProperty.java
index 3588022..fe16fc3 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/CacheProperty.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/CacheProperty.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.common;
@@ -37,12 +35,11 @@ public enum CacheProperty {
STATISTICS_NAME(String.class),
/**
- * This parameter can take the following values which match the respective
- * attribute container classes
+ * This parameter can take the following values which match the respective attribute container
+ * classes
* <p/>
- * delta_queued : QueuedDeltaSessionAttributes delta_immediate :
- * DeltaSessionAttributes immediate : ImmediateSessionAttributes queued
- * : QueuedSessionAttributes
+ * delta_queued : QueuedDeltaSessionAttributes delta_immediate : DeltaSessionAttributes immediate
+ * : ImmediateSessionAttributes queued : QueuedSessionAttributes
*/
SESSION_DELTA_POLICY(String.class),
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
index 5cb9543..a1ed5e7 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/ClientServerSessionCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.common;
@@ -43,8 +41,7 @@ import org.slf4j.LoggerFactory;
*/
public class ClientServerSessionCache extends AbstractSessionCache {
- private static final Logger LOG =
- LoggerFactory.getLogger(PeerToPeerSessionCache.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(PeerToPeerSessionCache.class.getName());
private ClientCache cache;
@@ -59,19 +56,15 @@ public class ClientServerSessionCache extends AbstractSessionCache {
* @param cache
* @param properties
*/
- public ClientServerSessionCache(ClientCache cache,
- Map<CacheProperty, Object> properties) {
+ public ClientServerSessionCache(ClientCache cache, Map<CacheProperty, Object> properties) {
super();
this.cache = cache;
/**
- * Set some default properties for this cache if they haven't already
- * been set
+ * Set some default properties for this cache if they haven't already been set
*/
- this.properties.put(CacheProperty.REGION_ATTRIBUTES_ID,
- DEFAULT_REGION_ATTRIBUTES_ID);
- this.properties.put(CacheProperty.ENABLE_LOCAL_CACHE,
- DEFAULT_ENABLE_LOCAL_CACHE);
+ this.properties.put(CacheProperty.REGION_ATTRIBUTES_ID, DEFAULT_REGION_ATTRIBUTES_ID);
+ this.properties.put(CacheProperty.ENABLE_LOCAL_CACHE, DEFAULT_ENABLE_LOCAL_CACHE);
this.properties.putAll(properties);
}
@@ -119,9 +112,7 @@ public class ClientServerSessionCache extends AbstractSessionCache {
private void createOrRetrieveRegion() {
// Retrieve the local session region
- this.sessionRegion =
- this.cache.getRegion(
- (String) properties.get(CacheProperty.REGION_NAME));
+ this.sessionRegion = this.cache.getRegion((String) properties.get(CacheProperty.REGION_NAME));
// If necessary, create the regions on the server and client
if (this.sessionRegion == null) {
@@ -141,8 +132,7 @@ public class ClientServerSessionCache extends AbstractSessionCache {
RegionConfiguration configuration = createRegionConfiguration();
// Send it to the server tier
- Execution execution = FunctionService.onServer(this.cache).withArgs(
- configuration);
+ Execution execution = FunctionService.onServer(this.cache).withArgs(configuration);
ResultCollector collector = execution.execute(CreateRegionFunction.ID);
// Verify the region was successfully created on the servers
@@ -161,22 +151,18 @@ public class ClientServerSessionCache extends AbstractSessionCache {
private Region<String, HttpSession> createLocalSessionRegion() {
ClientRegionFactory<String, HttpSession> factory = null;
- boolean enableLocalCache =
- (Boolean) properties.get(CacheProperty.ENABLE_LOCAL_CACHE);
+ boolean enableLocalCache = (Boolean) properties.get(CacheProperty.ENABLE_LOCAL_CACHE);
String regionName = (String) properties.get(CacheProperty.REGION_NAME);
if (enableLocalCache) {
// Create the region factory with caching and heap LRU enabled
- factory = ((ClientCache) this.cache).
- createClientRegionFactory(
- ClientRegionShortcut.CACHING_PROXY_HEAP_LRU);
+ factory = ((ClientCache) this.cache)
+ .createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY_HEAP_LRU);
LOG.info("Created new local client session region: {}", regionName);
} else {
// Create the region factory without caching enabled
- factory = ((ClientCache) this.cache).createClientRegionFactory(
- ClientRegionShortcut.PROXY);
- LOG.info(
- "Created new local client (uncached) session region: {} without any session expiry",
+ factory = ((ClientCache) this.cache).createClientRegionFactory(ClientRegionShortcut.PROXY);
+ LOG.info("Created new local client (uncached) session region: {} without any session expiry",
regionName);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
index 684ee81..ff47e78 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/PeerToPeerSessionCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.common;
@@ -41,13 +39,11 @@ import org.slf4j.LoggerFactory;
*/
public class PeerToPeerSessionCache extends AbstractSessionCache {
- private static final Logger LOG =
- LoggerFactory.getLogger(PeerToPeerSessionCache.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(PeerToPeerSessionCache.class.getName());
private Cache cache;
- private static final String DEFAULT_REGION_ATTRIBUTES_ID =
- RegionShortcut.REPLICATE.toString();
+ private static final String DEFAULT_REGION_ATTRIBUTES_ID = RegionShortcut.REPLICATE.toString();
private static final Boolean DEFAULT_ENABLE_LOCAL_CACHE = false;
@@ -57,19 +53,15 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
* @param cache
* @param properties
*/
- public PeerToPeerSessionCache(Cache cache,
- Map<CacheProperty, Object> properties) {
+ public PeerToPeerSessionCache(Cache cache, Map<CacheProperty, Object> properties) {
super();
this.cache = cache;
/**
- * Set some default properties for this cache if they haven't already
- * been set
+ * Set some default properties for this cache if they haven't already been set
*/
- this.properties.put(CacheProperty.REGION_ATTRIBUTES_ID,
- DEFAULT_REGION_ATTRIBUTES_ID);
- this.properties.put(CacheProperty.ENABLE_LOCAL_CACHE,
- DEFAULT_ENABLE_LOCAL_CACHE);
+ this.properties.put(CacheProperty.REGION_ATTRIBUTES_ID, DEFAULT_REGION_ATTRIBUTES_ID);
+ this.properties.put(CacheProperty.ENABLE_LOCAL_CACHE, DEFAULT_ENABLE_LOCAL_CACHE);
this.properties.putAll(properties);
}
@@ -85,15 +77,11 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
createOrRetrieveRegion();
/**
- * If local cache is enabled, create the local region fronting the
- * session region and set it as the operating region; otherwise, use
- * the session region directly as the operating region.
+ * If local cache is enabled, create the local region fronting the session region and set it as
+ * the operating region; otherwise, use the session region directly as the operating region.
*/
- boolean enableLocalCache =
- (Boolean) properties.get(CacheProperty.ENABLE_LOCAL_CACHE);
- operatingRegion = enableLocalCache
- ? createOrRetrieveLocalRegion()
- : this.sessionRegion;
+ boolean enableLocalCache = (Boolean) properties.get(CacheProperty.ENABLE_LOCAL_CACHE);
+ operatingRegion = enableLocalCache ? createOrRetrieveLocalRegion() : this.sessionRegion;
// Create or retrieve the statistics
createStatistics();
@@ -114,17 +102,13 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
private void registerFunctions() {
// Register the touch partitioned region entries function if it is not already registered
- if (!FunctionService.isRegistered(
- TouchPartitionedRegionEntriesFunction.ID)) {
- FunctionService.registerFunction(
- new TouchPartitionedRegionEntriesFunction());
+ if (!FunctionService.isRegistered(TouchPartitionedRegionEntriesFunction.ID)) {
+ FunctionService.registerFunction(new TouchPartitionedRegionEntriesFunction());
}
// Register the touch replicated region entries function if it is not already registered
- if (!FunctionService.isRegistered(
- TouchReplicatedRegionEntriesFunction.ID)) {
- FunctionService.registerFunction(
- new TouchReplicatedRegionEntriesFunction());
+ if (!FunctionService.isRegistered(TouchReplicatedRegionEntriesFunction.ID)) {
+ FunctionService.registerFunction(new TouchReplicatedRegionEntriesFunction());
}
}
@@ -135,8 +119,7 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
// Attempt to retrieve the region
// If it already exists, validate it
// If it doesn't already exist, create it
- Region region = this.cache.getRegion(
- (String) properties.get(CacheProperty.REGION_NAME));
+ Region region = this.cache.getRegion((String) properties.get(CacheProperty.REGION_NAME));
if (region == null) {
// Create the region
region = RegionHelper.createRegion(cache, configuration);
@@ -159,8 +142,7 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
private Region<String, HttpSession> createOrRetrieveLocalRegion() {
// Attempt to retrieve the fronting region
String frontingRegionName = this.sessionRegion.getName() + "_local";
- Region<String, HttpSession> frontingRegion =
- this.cache.getRegion(frontingRegionName);
+ Region<String, HttpSession> frontingRegion = this.cache.getRegion(frontingRegionName);
if (frontingRegion == null) {
// Create the region factory
@@ -175,8 +157,7 @@ public class PeerToPeerSessionCache extends AbstractSessionCache {
frontingRegion = factory.create(frontingRegionName);
LOG.info("Created new local session region: {}", frontingRegion);
} else {
- LOG.info("Retrieved existing local session region: {}",
- frontingRegion);
+ LOG.info("Retrieved existing local session region: {}", frontingRegion);
}
return frontingRegion;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
index be8252c..9b03bc0 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.common;
@@ -52,8 +50,8 @@ public interface SessionCache {
public Region<String, HttpSession> getOperatingRegion();
/**
- * Get the backing {@code Region} being used. This may not be the same as the
- * region being used by client code to put attributes.
+ * Get the backing {@code Region} being used. This may not be the same as the region being used by
+ * client code to put attributes.
*
* @return a {@code Region<String, HttpSession>} reference
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionExpirationCacheListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionExpirationCacheListener.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionExpirationCacheListener.java
index eccbd49..de3f307 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionExpirationCacheListener.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/common/SessionExpirationCacheListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.common;
@@ -28,8 +26,8 @@ import javax.servlet.http.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SessionExpirationCacheListener extends
- CacheListenerAdapter<String, HttpSession> implements Declarable {
+public class SessionExpirationCacheListener extends CacheListenerAdapter<String, HttpSession>
+ implements Declarable {
private static final Logger LOG =
LoggerFactory.getLogger(SessionExpirationCacheListener.class.getName());
@@ -37,9 +35,8 @@ public class SessionExpirationCacheListener extends
@Override
public void afterDestroy(EntryEvent<String, HttpSession> event) {
/**
- * A Session expired. If it was destroyed by GemFire expiration,
- * process it. If it was destroyed via Session.invalidate, ignore it
- * since it has already been processed.
+ * A Session expired. If it was destroyed by GemFire expiration, process it. If it was destroyed
+ * via Session.invalidate, ignore it since it has already been processed.
*/
if (event.getOperation() == Operation.EXPIRE_DESTROY) {
HttpSession session = (HttpSession) event.getOldValue();
@@ -48,6 +45,5 @@ public class SessionExpirationCacheListener extends
}
@Override
- public void init(Properties p) {
- }
+ public void init(Properties p) {}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/Constants.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/Constants.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/Constants.java
index 807da1d..429c072 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/Constants.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/Constants.java
@@ -1,18 +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
+ * 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.modules.session.internal.filter;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/DummySessionManager.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/DummySessionManager.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/DummySessionManager.java
index ce4f649..b33c8d4 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/DummySessionManager.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/DummySessionManager.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -32,8 +30,7 @@ public class DummySessionManager implements SessionManager {
/**
* Map of sessions
*/
- private final Map<String, HttpSession> sessions =
- new HashMap<String, HttpSession>();
+ private final Map<String, HttpSession> sessions = new HashMap<String, HttpSession>();
private class Attributes extends AbstractSessionAttributes {
@@ -52,15 +49,13 @@ public class DummySessionManager implements SessionManager {
* {@inheritDoc}
*/
@Override
- public void start(Object config, ClassLoader loader) {
- }
+ public void start(Object config, ClassLoader loader) {}
/**
* {@inheritDoc}
*/
@Override
- public void stop() {
- }
+ public void stop() {}
/**
* {@inheritDoc}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireHttpSession.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireHttpSession.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireHttpSession.java
index 0bf4c4a..90edc6a 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireHttpSession.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireHttpSession.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -47,8 +45,7 @@ import org.slf4j.LoggerFactory;
* Class which implements a Gemfire persisted {@code HttpSession}
*/
@SuppressWarnings("deprecation")
-public class GemfireHttpSession implements
- HttpSession, DataSerializable, Delta {
+public class GemfireHttpSession implements HttpSession, DataSerializable, Delta {
private static transient final Logger LOG =
LoggerFactory.getLogger(GemfireHttpSession.class.getName());
@@ -73,8 +70,7 @@ public class GemfireHttpSession implements
private HttpSession nativeSession = null;
/**
- * A session becomes invalid if it is explicitly invalidated or if it
- * expires.
+ * A session becomes invalid if it is explicitly invalidated or if it expires.
*/
private boolean isValid = true;
@@ -83,8 +79,8 @@ public class GemfireHttpSession implements
private boolean isDirty = false;
/**
- * This is set during serialization and then reset by the SessionManager when
- * it is retrieved from the attributes.
+ * This is set during serialization and then reset by the SessionManager when it is retrieved from
+ * the attributes.
*/
private AtomicBoolean serialized = new AtomicBoolean(false);
@@ -103,8 +99,7 @@ public class GemfireHttpSession implements
/**
* Constructor used for de-serialization
*/
- private GemfireHttpSession() {
- }
+ private GemfireHttpSession() {}
/**
* Constructor
@@ -133,9 +128,7 @@ public class GemfireHttpSession implements
ClassLoader loader = ((GemfireSessionManager) manager).getReferenceClassLoader();
if (obj.getClass().getClassLoader() != loader) {
- LOG.debug(
- "Attribute '{}' needs to be reconstructed with a new classloader",
- name);
+ LOG.debug("Attribute '{}' needs to be reconstructed with a new classloader", name);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
@@ -144,15 +137,12 @@ public class GemfireHttpSession implements
oos.close();
ObjectInputStream ois = new ClassLoaderObjectInputStream(
- new ByteArrayInputStream(baos.toByteArray()),
- loader);
+ new ByteArrayInputStream(baos.toByteArray()), loader);
tmpObj = ois.readObject();
} catch (IOException e) {
- LOG.error("Exception while recreating attribute '" + name +
- "'", e);
+ LOG.error("Exception while recreating attribute '" + name + "'", e);
} catch (ClassNotFoundException e) {
- LOG.error("Exception while recreating attribute '" + name +
- "'", e);
+ LOG.error("Exception while recreating attribute '" + name + "'", e);
}
if (tmpObj != null) {
setAttribute(name, tmpObj);
@@ -324,8 +314,7 @@ public class GemfireHttpSession implements
public void setAttribute(final String name, final Object value) {
if (LOG.isDebugEnabled()) {
- LOG.debug("Session {} setting attribute {} = '{}'",
- new Object[]{id, name, value});
+ LOG.debug("Session {} setting attribute {} = '{}'", new Object[] {id, name, value});
}
isDirty = true;
@@ -350,8 +339,7 @@ public class GemfireHttpSession implements
* Gemfire de-serialization {@inheritDoc}
*/
@Override
- public void fromData(DataInput in) throws IOException,
- ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
id = DataSerializer.readString(in);
attributes = DataSerializer.readObject(in);
if (getNativeSession() != null) {
@@ -366,8 +354,7 @@ public class GemfireHttpSession implements
}
/**
- * These three methods handle delta propagation and are deferred to the
- * attribute object.
+ * These three methods handle delta propagation and are deferred to the attribute object.
*/
@Override
public boolean hasDelta() {
@@ -384,16 +371,14 @@ public class GemfireHttpSession implements
}
@Override
- public void fromDelta(DataInput in) throws IOException,
- InvalidDeltaException {
+ public void fromDelta(DataInput in) throws IOException, InvalidDeltaException {
if (attributes instanceof Delta) {
((Delta) attributes).fromDelta(in);
} else {
try {
fromData(in);
} catch (ClassNotFoundException cex) {
- throw new IOException("Unable to forward fromDelta() call "
- + "to fromData()", cex);
+ throw new IOException("Unable to forward fromDelta() call " + "to fromData()", cex);
}
}
}
@@ -401,12 +386,10 @@ public class GemfireHttpSession implements
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
- builder.append("[id=").append(id)
- .append(", isNew=").append(isNew)
- .append(", isValid=").append(isValid)
- .append(", hasDelta=").append(hasDelta())
- .append(", lastAccessedTime=").append(attributes.getLastAccessedTime())
- .append(", jvmOwnerId=").append(attributes.getJvmOwnerId());
+ builder.append("[id=").append(id).append(", isNew=").append(isNew).append(", isValid=")
+ .append(isValid).append(", hasDelta=").append(hasDelta()).append(", lastAccessedTime=")
+ .append(attributes.getLastAccessedTime()).append(", jvmOwnerId=")
+ .append(attributes.getJvmOwnerId());
builder.append("]");
return builder.toString();
}
@@ -462,8 +445,7 @@ public class GemfireHttpSession implements
}
/**
- * Handle the process of failing over the session to a new native session
- * object.
+ * Handle the process of failing over the session to a new native session object.
*
* @param session
*/
@@ -496,9 +478,8 @@ public class GemfireHttpSession implements
}
/**
- * This is called on deserialization. You can only call it once to get a
- * meaningful value as it resets the serialized state. In other words, this
- * call is not idempotent.
+ * This is called on deserialization. You can only call it once to get a meaningful value as it
+ * resets the serialized state. In other words, this call is not idempotent.
*
* @return whether this object has just been serialized
*/
@@ -507,9 +488,8 @@ public class GemfireHttpSession implements
}
/**
- * Called when the session is about to go out of scope. If the session has
- * been defined to use async queued attributes then they will be written out
- * at this point.
+ * Called when the session is about to go out of scope. If the session has been defined to use
+ * async queued attributes then they will be written out at this point.
*/
public void commit() {
attributes.setJvmOwnerId(manager.getJvmId());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionException.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionException.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionException.java
index 895bcaf..a083d8e 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionException.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionException.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
[70/98] [abbrv] incubator-geode git commit: GEODE-2015: Edit links to
docs info
Posted by ds...@apache.org.
GEODE-2015: Edit links to docs info
GEODE-2015: Add images_svg, stylesheets to Rules passthrough
GEODE-2015: Fix extension for Bookbinder update
GEODE-2015: Update GemFire.lock for Bookbinder 10.0.2
Revert "GEODE-2015: Add images_svg, stylesheets to Rules passthrough"
This reverts commit d942321f985173323ae623ba0a08473a28fb91e4.
GEODE-2015: Point user guide link to new location
GEODE-2015: Edit docs to work better with site
GEODE-2015: Add to geode-book README steps to embed docs in site
Update site README with User Guide info
GEODE-2015: Fix user guide paths for website
Fix redirects for docs/guide
GEODE-2015: Improve README instructions
GEODE-2015: Fix doc/site READMEs; fix docs link in project README
Fix README spacing
This closes #267
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a48871ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a48871ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a48871ed
Branch: refs/heads/feature/GEM-983
Commit: a48871eda0b8b08ee9f4e16f3f50857651469765
Parents: b4b6e07
Author: Joey McAllister <jm...@pivotal.io>
Authored: Wed Oct 19 10:33:19 2016 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Mon Oct 24 17:06:14 2016 -0700
----------------------------------------------------------------------
README.md | 8 +-
geode-book/Gemfile.lock | 129 +-
geode-book/README.md | 82 +-
geode-book/config.yml | 2 +-
.../master_middleman/source/index.html.erb | 23 -
.../source/stylesheets/book-styles.css.scss | 18 -
.../source/stylesheets/book-styles.scss | 18 +
.../source/subnavs/geode-subnav.erb | 1745 +++++++++---------
geode-book/redirects.rb | 4 +-
geode-docs/about_geode.html.md.erb | 4 +-
geode-site/website/README.md | 28 +-
geode-site/website/content/docs/index.html | 3 +-
12 files changed, 1037 insertions(+), 1027 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 5521f1b..eee17fc 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
**[Location of Directions for Building from Source](#building)**
**[Geode in 5 minutes](#started)**
**[Application Development](#development)**
-**[Documentation](http://geode.docs.pivotal.io/)**
+**[Documentation](http://geode.incubator.apache.org/docs/)**
**[wiki](https://cwiki.apache.org/confluence/display/GEODE/Index)**
**Continuous Integration** [](https://travis-ci.org/apache/incubator-geode)
@@ -63,7 +63,7 @@ _HelloWorld.java_
import java.util.Map;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.client.*;
-
+
public class HelloWorld {
public static void main(String[] args) throws Exception {
ClientCache cache = new ClientCacheFactory()
@@ -72,10 +72,10 @@ _HelloWorld.java_
Region<String, String> region = cache
.<String, String>createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
.create("region");
-
+
region.put("1", "Hello");
region.put("2", "World");
-
+
for (Map.Entry<String, String> entry : region.entrySet()) {
System.out.format("key = %s, value = %s\n", entry.getKey(), entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/Gemfile.lock
----------------------------------------------------------------------
diff --git a/geode-book/Gemfile.lock b/geode-book/Gemfile.lock
index 1fb5a4c..ed2fbd6 100644
--- a/geode-book/Gemfile.lock
+++ b/geode-book/Gemfile.lock
@@ -9,16 +9,19 @@ GEM
tzinfo (~> 1.1)
addressable (2.4.0)
ansi (1.5.0)
- bookbindery (9.12.0)
+ backports (3.6.8)
+ bookbindery (10.0.2)
ansi (~> 1.4)
css_parser
elasticsearch
fog-aws (~> 0.7.1)
font-awesome-sass
git (~> 1.2.8)
- middleman (~> 3.4.0)
- middleman-livereload (~> 3.4.3)
- middleman-syntax (~> 2.0)
+ middleman
+ middleman-compass
+ middleman-livereload
+ middleman-sprockets
+ middleman-syntax
nokogiri (= 1.6.7.2)
puma
rack-rewrite
@@ -27,13 +30,7 @@ GEM
therubyracer
thor
builder (3.2.2)
- capybara (2.4.4)
- mime-types (>= 1.16)
- nokogiri (>= 1.3.3)
- rack (>= 1.0.0)
- rack-test (>= 0.5.4)
- xpath (~> 2.0)
- chunky_png (1.3.6)
+ chunky_png (1.3.7)
coffee-script (2.4.1)
coffee-script-source
execjs
@@ -50,8 +47,11 @@ GEM
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
+ concurrent-ruby (1.0.2)
+ contracts (0.13.0)
css_parser (1.4.5)
addressable
+ dotenv (2.1.1)
elasticsearch (2.0.0)
elasticsearch-api (= 2.0.0)
elasticsearch-transport (= 2.0.0)
@@ -65,17 +65,20 @@ GEM
http_parser.rb (~> 0.6.0)
erubis (2.7.0)
eventmachine (1.2.0.1)
- excon (0.51.0)
+ excon (0.54.0)
execjs (2.7.0)
faraday (0.9.2)
multipart-post (>= 1.2, < 3)
+ fast_blank (1.0.0)
+ fastimage (2.0.0)
+ addressable (~> 2)
ffi (1.9.14)
fog-aws (0.7.6)
fog-core (~> 1.27)
fog-json (~> 1.0)
fog-xml (~> 0.1)
ipaddress (~> 0.8)
- fog-core (1.42.0)
+ fog-core (1.43.0)
builder
excon (~> 0.49)
formatador (~> 0.2)
@@ -91,9 +94,9 @@ GEM
git (1.2.9.1)
haml (4.0.7)
tilt
- hike (1.2.3)
- hooks (0.4.1)
- uber (~> 0.0.14)
+ hamster (3.0.0)
+ concurrent-ruby (~> 1.0)
+ hashie (3.4.6)
http_parser.rb (0.6.0)
i18n (0.7.0)
ipaddress (0.8.3)
@@ -103,80 +106,82 @@ GEM
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
- middleman (3.4.1)
+ memoist (0.15.0)
+ middleman (4.1.10)
coffee-script (~> 2.2)
- compass (>= 1.0.0, < 2.0.0)
compass-import-once (= 1.0.5)
- execjs (~> 2.0)
haml (>= 4.0.5)
kramdown (~> 1.2)
- middleman-core (= 3.4.1)
- middleman-sprockets (>= 3.1.2)
+ middleman-cli (= 4.1.10)
+ middleman-core (= 4.1.10)
sass (>= 3.4.0, < 4.0)
- uglifier (~> 2.5)
- middleman-core (3.4.1)
- activesupport (~> 4.1)
+ middleman-cli (4.1.10)
+ thor (>= 0.17.0, < 2.0)
+ middleman-compass (4.0.1)
+ compass (>= 1.0.0, < 2.0.0)
+ middleman-core (>= 4.0.0)
+ middleman-core (4.1.10)
+ activesupport (~> 4.2)
+ addressable (~> 2.3)
+ backports (~> 3.6)
bundler (~> 1.1)
- capybara (~> 2.4.4)
+ contracts (~> 0.13.0)
+ dotenv
erubis
- hooks (~> 0.3)
+ execjs (~> 2.0)
+ fast_blank
+ fastimage (~> 2.0)
+ hamster (~> 3.0)
+ hashie (~> 3.4)
i18n (~> 0.7.0)
- listen (~> 3.0.3)
- padrino-helpers (~> 0.12.3)
+ listen (~> 3.0.0)
+ memoist (~> 0.14)
+ padrino-helpers (~> 0.13.0)
+ parallel
rack (>= 1.4.5, < 2.0)
- thor (>= 0.15.2, < 2.0)
- tilt (~> 1.4.1, < 2.0)
+ sass (>= 3.4)
+ servolux
+ tilt (~> 1.4.1)
+ uglifier (~> 3.0)
middleman-livereload (3.4.6)
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
- middleman-sprockets (3.4.2)
- middleman-core (>= 3.3)
- sprockets (~> 2.12.1)
- sprockets-helpers (~> 1.1.0)
- sprockets-sass (~> 1.3.0)
- middleman-syntax (2.1.0)
+ middleman-sprockets (4.0.0)
+ middleman-core (~> 4.0)
+ sprockets (>= 3.0)
+ middleman-syntax (3.0.0)
middleman-core (>= 3.2)
- rouge (~> 1.0)
- mime-types (3.1)
- mime-types-data (~> 3.2015)
- mime-types-data (3.2016.0521)
+ rouge (~> 2.0)
mini_portile2 (2.0.0)
- minitest (5.9.0)
+ minitest (5.9.1)
multi_json (1.12.1)
multipart-post (2.0.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
- padrino-helpers (0.12.8)
+ padrino-helpers (0.13.3.2)
i18n (~> 0.6, >= 0.6.7)
- padrino-support (= 0.12.8)
- tilt (~> 1.4.1)
- padrino-support (0.12.8)
+ padrino-support (= 0.13.3.2)
+ tilt (>= 1.4.1, < 3)
+ padrino-support (0.13.3.2)
activesupport (>= 3.1)
+ parallel (1.9.0)
puma (3.6.0)
rack (1.6.4)
rack-livereload (0.3.16)
rack
rack-rewrite (1.5.1)
- rack-test (0.6.3)
- rack (>= 1.0)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
redcarpet (3.2.3)
ref (2.0.0)
- rouge (1.11.1)
+ rouge (2.0.6)
sass (3.4.22)
- sprockets (2.12.4)
- hike (~> 1.2)
- multi_json (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
- sprockets-helpers (1.1.0)
- sprockets (~> 2.0)
- sprockets-sass (1.3.1)
- sprockets (~> 2.0)
- tilt (~> 1.1)
+ servolux (0.12.0)
+ sprockets (3.7.0)
+ concurrent-ruby (~> 1.0)
+ rack (> 1, < 3)
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
@@ -185,12 +190,8 @@ GEM
tilt (1.4.1)
tzinfo (1.2.2)
thread_safe (~> 0.1)
- uber (0.0.15)
- uglifier (2.7.2)
- execjs (>= 0.3.0)
- json (>= 1.8.0)
- xpath (2.0.0)
- nokogiri (~> 1.3)
+ uglifier (3.0.2)
+ execjs (>= 0.3.0, < 3)
PLATFORMS
ruby
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/README.md
----------------------------------------------------------------------
diff --git a/geode-book/README.md b/geode-book/README.md
index 198becc..15ed0eb 100644
--- a/geode-book/README.md
+++ b/geode-book/README.md
@@ -1,14 +1,18 @@
-# Apache Geode End-User Documentation
+# Apache Geode User Guide
-Apache Geode provides the full source for end-user documentation in markdown format (see `../geode-docs/CONTRIBUTE.md`). The latest check-ins to `incubator-geode/geode-docs` are regularly built and published to http://geode.incubator.apache.org/docs/. Users can build the markdown into an HTML user guide using [Bookbinder](https://github.com/pivotal-cf/bookbinder) and the instructions below.
-
-Bookbinder is a Ruby gem that binds a unified documentation web application from markdown, html, and/or DITA source material. The source material for bookbinder must be stored either in local directories or in GitHub repositories. Bookbinder runs [middleman](http://middlemanapp.com/) to produce a Rackup app that can be deployed locally or as a Web application.
-
-This document contains instructions for building and viewing the Geode documentation locally.
+This document contains instructions for building and viewing the Apache Geode User Guide locally.
+- [About](#about)
- [Prerequisites](#prerequisites)
- [Bookbinder Usage](#bookbinder-usage)
- [Building the Documentation](#building-the-documentation)
+- [Embedding the User Guide in the Geode Website](#embedding-the-user-guide-in-the-geode-website)
+
+## About
+
+Apache Geode provides the full source for the Apache Geode User Guide in markdown format (see `{geode-project-dir}/geode-docs/CONTRIBUTE.md`). The latest check-ins to `{geode-project-dir}/geode-docs` on the `develop` branch are regularly built and published to http://geode.incubator.apache.org/docs/. Users can build the markdown into an HTML user guide using [Bookbinder](https://github.com/pivotal-cf/bookbinder) and the instructions below.
+
+Bookbinder is a Ruby gem that binds a unified documentation web application from markdown, html, and/or DITA source material. The source material for bookbinder must be stored either in local directories or in GitHub repositories. Bookbinder runs [Middleman](http://middlemanapp.com/) to produce a Rackup app that can be deployed locally or as a web application.
## Prerequisites
@@ -23,38 +27,66 @@ Follow the instructions below to install Bookbinder:
Bookbinder is meant to be used from within a project called a **book**. The book includes a configuration file that describes which documentation repositories to use as source materials. Bookbinder provides a set of scripts to aggregate those repositories and publish them to various locations.
-For Geode, a preconfigured **book** is provided in the directory `geode-book`, which gathers content from the directory `geode-docs`. You can use this configuration to build HTML for Geode on your local system.
-
-The installed `config.yml` file configures the Geode book for building locally. The file configures the local directory for the markdown source files.
+For Geode, a preconfigured **book** is provided in the directory `{geode-project-dir}/geode-book`, which gathers content from the directory `{geode-project-dir}/geode-docs`. You can use this configuration to build an HTML version of the Apache Geode User Guide on your local system.
## Building the Documentation
-1. The GemFile in the `geode-book` directory already defines the `gem "bookbindery"` dependency. Make sure you are in the `geode-book` directory and enter:
+1. The GemFile in the `geode-book` directory already defines the `gem "bookbindery"` dependency. Make sure you are in the `{geode-project-dir}/geode-book` directory and enter:
-```
- $ bundle install
-```
+ ```
+ $ bundle install
+ ```
Note: You will not have to run `bundle install` on subsequent builds.
2. To build the documentation locally using the installed `config.yml` file, enter:
-```
- $ bundle exec bookbinder bind local
-```
+ ```
+ $ bundle exec bookbinder bind local
+ ```
+
Bookbinder converts the markdown source into HTML, which it puts in the `final_app` directory.
-3. Navigate to the `geode-book/final_app/` and enter:
+3. Navigate to `{geode-project-dir}/geode-book/final_app/` and enter:
+
+ ```
+ $ bundle install
+ ```
- ```
- $ bundle install
- ```
Note: You will not have to run `bundle install` on subsequent builds.
-4. To start the website locally, enter:
+4. To start a local website of the Apache Geode User Guide, enter:
+
+ ```
+ $ rackup
+ ```
+
+ You can now view the local documentation at <http://localhost:9292>.
+
+## Embedding the User Guide in the Geode Website
+
+Once you have reviewed your local build of the User Guide, you can embed it in the Apache Geode website by doing the following:
+
+1. Compile the website source *before adding the User Guide files*. In the `{geode-project-dir}/geode-site/website` directory, enter:
+
+ ```
+ $ nanoc compile
+ ```
+
+2. Move the built User Guide files to the Geode website. Navigate to: `{geode-project-dir}/geode-book/final_app/public/` and enter:
+
+ ```
+ $ tar cvf ~/Desktop/new-guide-content.tar .
+ $ cd ../../../geode-site/content
+ $ tar xvf ~/Desktop/new-guide-content.tar
+ ```
+
+3. In the `{geode-project-dir}/geode-site/website` directory, enter:
+
+ ```
+ $ nanoc view
+ ```
- ```
- $ rackup
- ```
+ You can now view the local website at http://localhost:3000.
- You can now view the local documentation at <http://localhost:9292>.
\ No newline at end of file
+4. Once you have reviewed your changes, follow the instructions at `{geode-project-dir}/geode-site/website/README.md` for propagating changes to the `asf-site` branch.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/config.yml
----------------------------------------------------------------------
diff --git a/geode-book/config.yml b/geode-book/config.yml
index b2f999a..eee0909 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -21,7 +21,7 @@ public_host: localhost
sections:
- repository:
name: geode-docs
- directory: docs
+ directory: docs/guide
subnav_template: geode-subnav
template_variables:
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/master_middleman/source/index.html.erb
----------------------------------------------------------------------
diff --git a/geode-book/master_middleman/source/index.html.erb b/geode-book/master_middleman/source/index.html.erb
deleted file mode 100644
index 3d273d3..0000000
--- a/geode-book/master_middleman/source/index.html.erb
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<!--
-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.
--->
-<head>
-
-<script type="text/javascript">
- window.location="/docs/about_geode.html";
- </script>
-<body></body></html>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/master_middleman/source/stylesheets/book-styles.css.scss
----------------------------------------------------------------------
diff --git a/geode-book/master_middleman/source/stylesheets/book-styles.css.scss b/geode-book/master_middleman/source/stylesheets/book-styles.css.scss
deleted file mode 100644
index a7ab274..0000000
--- a/geode-book/master_middleman/source/stylesheets/book-styles.css.scss
+++ /dev/null
@@ -1,18 +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.
-
-* {
- box-sizing: border-box;
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/master_middleman/source/stylesheets/book-styles.scss
----------------------------------------------------------------------
diff --git a/geode-book/master_middleman/source/stylesheets/book-styles.scss b/geode-book/master_middleman/source/stylesheets/book-styles.scss
new file mode 100644
index 0000000..a7ab274
--- /dev/null
+++ b/geode-book/master_middleman/source/stylesheets/book-styles.scss
@@ -0,0 +1,18 @@
+//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.
+
+* {
+ box-sizing: border-box;
+}
[66/98] [abbrv] incubator-geode git commit: adding spotless line
terminator setting for Unix
Posted by ds...@apache.org.
adding spotless line terminator setting for Unix
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/bd6f9e6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/bd6f9e6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/bd6f9e6f
Branch: refs/heads/feature/GEM-983
Commit: bd6f9e6f3fe4d4485b578dc56f048390980f1f92
Parents: a78d491
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Mon Oct 24 15:46:39 2016 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Mon Oct 24 15:47:43 2016 -0700
----------------------------------------------------------------------
build.gradle | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd6f9e6f/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index a734e05..6e82433 100755
--- a/build.gradle
+++ b/build.gradle
@@ -88,6 +88,7 @@ subprojects {
apply plugin: "com.diffplug.gradle.spotless"
spotless {
+ lineEndings = 'unix';
java {
eclipseFormatFile "${rootProject.projectDir}/etc/eclipse-java-google-style.xml"
}
[11/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
index 474f8dd..e799279 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -32,129 +30,107 @@ import java.util.Properties;
/**
* Creates <code>ServerSockets</code> for JMX adaptors.
* <p>
- * The interface {@link mx4j.tools.adaptor.AdaptorServerSocketFactory} is
- * implemented in order to support securing of {@link
- * mx4j.tools.adaptor.http.HttpAdaptor}.
+ * The interface {@link mx4j.tools.adaptor.AdaptorServerSocketFactory} is implemented in order to
+ * support securing of {@link mx4j.tools.adaptor.http.HttpAdaptor}.
* <p>
- * The interface {@link java.rmi.server.RMIServerSocketFactory} is implemented
- * to support the securing of {@link
- * javax.management.remote.JMXConnectorServer}. See {@link
- * javax.management.remote.rmi.RMIConnectorServer} for the actual subclass that
- * is used for the JMX RMI adaptor.
+ * The interface {@link java.rmi.server.RMIServerSocketFactory} is implemented to support the
+ * securing of {@link javax.management.remote.JMXConnectorServer}. See
+ * {@link javax.management.remote.rmi.RMIConnectorServer} for the actual subclass that is used for
+ * the JMX RMI adaptor.
* <p>
* Complete info on JSSE, including debugging, can be found at
* <a href="http://java.sun.com/j2se/1.4.2/docs/guide/security/jsse/JSSERefGuide.html">
* http://java.sun.com/j2se/1.4.2/docs/guide/security/jsse/JSSERefGuide.html</a>
*
- * @since GemFire 3.5 (old name was SSLAdaptorServerSocketFactory)
+ * @since GemFire 3.5 (old name was SSLAdaptorServerSocketFactory)
*/
-public class MX4JServerSocketFactory
-implements mx4j.tools.adaptor.AdaptorServerSocketFactory,
- java.rmi.server.RMIServerSocketFactory {
+public class MX4JServerSocketFactory implements mx4j.tools.adaptor.AdaptorServerSocketFactory,
+ java.rmi.server.RMIServerSocketFactory {
private static final Logger logger = LogService.getLogger();
-
+
private static final int DEFAULT_BACKLOG = 50;
-
+
private final SocketCreator socketCreator;
private String bindAddress = DistributedSystemConfig.DEFAULT_BIND_ADDRESS;
private int backlog = DEFAULT_BACKLOG;
-
+
/**
* Constructs new instance of MX4JServerSocketFactory.
*
- * @param useSSL
- * true if ssl is to be enabled
- * @param needClientAuth
- * true if client authentication is required
- * @param protocols
- * space-delimited list of ssl protocols to use
- * @param ciphers
- * space-delimited list of ssl ciphers to use
- * @param gfsecurityProps
- * vendor properties passed in through gfsecurity.properties
+ * @param useSSL true if ssl is to be enabled
+ * @param needClientAuth true if client authentication is required
+ * @param protocols space-delimited list of ssl protocols to use
+ * @param ciphers space-delimited list of ssl ciphers to use
+ * @param gfsecurityProps vendor properties passed in through gfsecurity.properties
*/
- public MX4JServerSocketFactory(boolean useSSL,
- boolean needClientAuth,
- String protocols,
- String ciphers,
- Properties gfsecurityProps) {
+ public MX4JServerSocketFactory(boolean useSSL, boolean needClientAuth, String protocols,
+ String ciphers, Properties gfsecurityProps) {
if (protocols == null || protocols.length() == 0) {
protocols = DistributionConfig.DEFAULT_SSL_PROTOCOLS;
}
if (ciphers == null || ciphers.length() == 0) {
ciphers = DistributionConfig.DEFAULT_SSL_CIPHERS;
}
- this.socketCreator = SocketCreatorFactory.createNonDefaultInstance(
- useSSL, needClientAuth, protocols, ciphers, gfsecurityProps);
+ this.socketCreator = SocketCreatorFactory.createNonDefaultInstance(useSSL, needClientAuth,
+ protocols, ciphers, gfsecurityProps);
}
/**
* Constructs new instance of MX4JServerSocketFactory.
*
- * @param useSSL
- * true if ssl is to be enabled
- * @param needClientAuth
- * true if client authentication is required
- * @param protocols
- * space-delimited list of ssl protocols to use
- * @param ciphers
- * space-delimited list of ssl ciphers to use
- * @param bindAddress
- * host or address to bind to (bind-address)
- * @param backlog
- * how many connections are queued
- * @param gfsecurityProps
- * vendor properties passed in through gfsecurity.properties
+ * @param useSSL true if ssl is to be enabled
+ * @param needClientAuth true if client authentication is required
+ * @param protocols space-delimited list of ssl protocols to use
+ * @param ciphers space-delimited list of ssl ciphers to use
+ * @param bindAddress host or address to bind to (bind-address)
+ * @param backlog how many connections are queued
+ * @param gfsecurityProps vendor properties passed in through gfsecurity.properties
*/
- public MX4JServerSocketFactory(boolean useSSL,
- boolean needClientAuth,
- String protocols,
- String ciphers,
- String bindAddress, // optional for RMI impl
- int backlog, // optional for RMI impl
- Properties gfsecurityProps) {
+ public MX4JServerSocketFactory(boolean useSSL, boolean needClientAuth, String protocols,
+ String ciphers, String bindAddress, // optional for RMI impl
+ int backlog, // optional for RMI impl
+ Properties gfsecurityProps) {
this(useSSL, needClientAuth, protocols, ciphers, gfsecurityProps);
this.bindAddress = bindAddress;
this.backlog = backlog;
}
// -------------------------------------------------------------------------
- // mx4j.tools.adaptor.AdaptorServerSocketFactory impl...
+ // mx4j.tools.adaptor.AdaptorServerSocketFactory impl...
// -------------------------------------------------------------------------
-
- public ServerSocket createServerSocket(int port,
- int backlog,
- String bindAddress) throws IOException {
- if ("".equals(bindAddress)) {
- return socketCreator.createServerSocket(
- port, backlog);
-
- } else {
- return socketCreator.createServerSocket(
- port, backlog, InetAddressUtil.toInetAddress(bindAddress));
- }
+
+ public ServerSocket createServerSocket(int port, int backlog, String bindAddress)
+ throws IOException {
+ if ("".equals(bindAddress)) {
+ return socketCreator.createServerSocket(port, backlog);
+
+ } else {
+ return socketCreator.createServerSocket(port, backlog,
+ InetAddressUtil.toInetAddress(bindAddress));
+ }
}
-
+
// -------------------------------------------------------------------------
- // java.rmi.server.RMIServerSocketFactory impl...
+ // java.rmi.server.RMIServerSocketFactory impl...
// -------------------------------------------------------------------------
-
- public ServerSocket createServerSocket(int port) throws IOException {
- ServerSocket sock = null;
- if ("".equals(bindAddress)) {
- sock = socketCreator.createServerSocket(port, this.backlog);
- } else {
- sock = socketCreator.createServerSocket(
- port, this.backlog, InetAddressUtil.toInetAddress(this.bindAddress));
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("MX4JServerSocketFactory RMIServerSocketFactory, INetAddress {}, LocalPort {}, LocalSocketAddress {}",
+
+ public ServerSocket createServerSocket(int port) throws IOException {
+ ServerSocket sock = null;
+ if ("".equals(bindAddress)) {
+ sock = socketCreator.createServerSocket(port, this.backlog);
+ } else {
+ sock = socketCreator.createServerSocket(port, this.backlog,
+ InetAddressUtil.toInetAddress(this.bindAddress));
+ }
+
+ if (logger.isDebugEnabled()) {
+ logger.debug(
+ "MX4JServerSocketFactory RMIServerSocketFactory, INetAddress {}, LocalPort {}, LocalSocketAddress {}",
sock.getInetAddress(), sock.getLocalPort(), sock.getLocalSocketAddress());
- }
- return sock;
- }
-
+ }
+ return sock;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
index 1786406..a86d082 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MailManager.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -36,18 +34,17 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- * Provides the ways to send emails to all the registered email id It also
- * provides the way to add/remove email ids. Can be used to send email in case
- * of any alerts raised / warning / failure in gemfire.
+ * Provides the ways to send emails to all the registered email id It also provides the way to
+ * add/remove email ids. Can be used to send email in case of any alerts raised / warning / failure
+ * in gemfire.
*
* @since GemFire 5.1
*/
public class MailManager {
private static final Logger logger = LogService.getLogger();
-
- public MailManager() {
- }
+
+ public MailManager() {}
public MailManager(Properties mailProperties) {
setMailProperties(mailProperties);
@@ -58,8 +55,7 @@ public class MailManager {
FileInputStream fio = new FileInputStream(mailPropertiesFile);
try {
prop.load(fio);
- }
- finally {
+ } finally {
fio.close();
}
setMailProperties(prop);
@@ -80,18 +76,18 @@ public class MailManager {
/**
* Send Emails to all the registered email id
*
- * @param emailData
- * Instance of EmailData
+ * @param emailData Instance of EmailData
*/
- // Why a separate method & class EmailData needed???
+ // Why a separate method & class EmailData needed???
private void processEmail(EmailData emailData) {
if (logger.isTraceEnabled()) {
logger.trace("Entered MailManager:processEmail");
}
- if (mailHost == null || mailHost.length() == 0
- || emailData == null || mailToAddresses.length == 0) {
- logger.error(LocalizedMessage.create(LocalizedStrings.MailManager_REQUIRED_MAILSERVER_CONFIGURATION_NOT_SPECIFIED));
+ if (mailHost == null || mailHost.length() == 0 || emailData == null
+ || mailToAddresses.length == 0) {
+ logger.error(LocalizedMessage
+ .create(LocalizedStrings.MailManager_REQUIRED_MAILSERVER_CONFIGURATION_NOT_SPECIFIED));
if (logger.isDebugEnabled()) {
logger.debug("Exited MailManager:processEmail: Not sending email as conditions not met");
}
@@ -106,8 +102,7 @@ public class MailManager {
try {
for (int i = 0; i < mailToAddresses.length; i++) {
- mimeMessage.addRecipient(Message.RecipientType.TO, new InternetAddress(
- mailToAddresses[i]));
+ mimeMessage.addRecipient(Message.RecipientType.TO, new InternetAddress(mailToAddresses[i]));
}
if (subject == null) {
@@ -121,27 +116,33 @@ public class MailManager {
mimeMessage.setText(message);
Transport.send(mimeMessage);
- logger.info(LocalizedMessage.create(
- LocalizedStrings.MailManager_EMAIL_ALERT_HAS_BEEN_SENT_0_1_2,
- new Object[] { mailToList, subject, message }));
+ logger.info(
+ LocalizedMessage.create(LocalizedStrings.MailManager_EMAIL_ALERT_HAS_BEEN_SENT_0_1_2,
+ new Object[] {mailToList, subject, message}));
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (Throwable ex) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
StringBuilder buf = new StringBuilder();
- buf.append(LocalizedStrings.MailManager_AN_EXCEPTION_OCCURRED_WHILE_SENDING_EMAIL.toLocalizedString());
- buf.append(LocalizedStrings.MailManager_UNABLE_TO_SEND_EMAIL_PLEASE_CHECK_YOUR_EMAIL_SETTINGS_AND_LOG_FILE.toLocalizedString());
- buf.append("\n\n").append(LocalizedStrings.MailManager_EXCEPTION_MESSAGE_0.toLocalizedString(ex.getMessage()));
- buf.append("\n\n").append(LocalizedStrings.MailManager_FOLLOWING_EMAIL_WAS_NOT_DELIVERED.toLocalizedString());
- buf.append("\n\t").append(LocalizedStrings.MailManager_MAIL_HOST_0.toLocalizedString(mailHost));
+ buf.append(LocalizedStrings.MailManager_AN_EXCEPTION_OCCURRED_WHILE_SENDING_EMAIL
+ .toLocalizedString());
+ buf.append(
+ LocalizedStrings.MailManager_UNABLE_TO_SEND_EMAIL_PLEASE_CHECK_YOUR_EMAIL_SETTINGS_AND_LOG_FILE
+ .toLocalizedString());
+ buf.append("\n\n").append(
+ LocalizedStrings.MailManager_EXCEPTION_MESSAGE_0.toLocalizedString(ex.getMessage()));
+ buf.append("\n\n").append(
+ LocalizedStrings.MailManager_FOLLOWING_EMAIL_WAS_NOT_DELIVERED.toLocalizedString());
+ buf.append("\n\t")
+ .append(LocalizedStrings.MailManager_MAIL_HOST_0.toLocalizedString(mailHost));
buf.append("\n\t").append(LocalizedStrings.MailManager_FROM_0.toLocalizedString(mailFrom));
buf.append("\n\t").append(LocalizedStrings.MailManager_TO_0.toLocalizedString(mailToList));
buf.append("\n\t").append(LocalizedStrings.MailManager_SUBJECT_0.toLocalizedString(subject));
@@ -157,8 +158,7 @@ public class MailManager {
/**
* Not yet implemented
*/
- public void close() {
- }
+ public void close() {}
/**
* @return All the registered email id as string
@@ -191,8 +191,7 @@ public class MailManager {
/**
*
- * @param host
- * mail host server name
+ * @param host mail host server name
*/
public void setMailHost(String host) {
this.mailHost = host;
@@ -208,8 +207,7 @@ public class MailManager {
/**
*
- * @param fromAddress
- * mailFrom email id
+ * @param fromAddress mailFrom email id
*/
public void setMailFromAddress(String fromAddress) {
mailFrom = fromAddress;
@@ -243,7 +241,7 @@ public class MailManager {
* @return list all the registered email id
*/
public String[] getAllToAddresses() {
- return (String[])mailToSet.toArray(new String[0]);
+ return (String[]) mailToSet.toArray(new String[0]);
}
/**
@@ -285,8 +283,7 @@ public class MailManager {
buffer.append(", ");
}
buffer.replace(buffer.length() - 2, buffer.length(), "");
- }
- else {
+ } else {
buffer.append(" Undefined");
}
buffer.append("]");
@@ -324,8 +321,7 @@ public class MailManager {
}
public static void main(String args[]) {
- MailManager mailManager = new MailManager("mailsrv1.gemstone.com",
- "hkhanna@gemstone.com");
+ MailManager mailManager = new MailManager("mailsrv1.gemstone.com", "hkhanna@gemstone.com");
mailManager.sendEmail("Alert!", "Test");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
index 2496013..5c2a81f 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResource.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -20,25 +18,24 @@ import javax.management.ObjectName;
import javax.management.modelmbean.ModelMBean;
/**
- * Represents a component or resource that is managed by a
+ * Represents a component or resource that is managed by a
* {@link javax.management.modelmbean.ModelMBean}.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
public interface ManagedResource {
-
- /**
- * The prefix of MBean names. Note: this is NOT used by Members, Stats, or
- * any other MBean that has it's own domain.
+
+ /**
+ * The prefix of MBean names. Note: this is NOT used by Members, Stats, or any other MBean that
+ * has it's own domain.
*
- * @see #getMBeanName
+ * @see #getMBeanName
*/
public static final String MBEAN_NAME_PREFIX = "GemFire:type=";
- /**
- * Returns the name of the ModelMBean that will manage this
- * resource. They [some] are of the form
+ /**
+ * Returns the name of the ModelMBean that will manage this resource. They [some] are of the form
*
* <PRE>
* MBEAN_NAME_PREFIX + typeName + ",id=" + id
@@ -47,14 +44,14 @@ public interface ManagedResource {
* @see #MBEAN_NAME_PREFIX
*/
public String getMBeanName();
-
+
/** Returns the ModelMBean that is configured to manage this resource */
public ModelMBean getModelMBean();
/** Sets the ModelMBean that is configured to manage this resource */
public void setModelMBean(ModelMBean modelMBean);
-
- /**
+
+ /**
* Returns the enumerated ManagedResourceType of this resource.
*
* @see ManagedResourceType
@@ -67,11 +64,11 @@ public interface ManagedResource {
* @see #getMBeanName
*/
public ObjectName getObjectName();
-
+
/**
* Perform any cleanup necessary before stopping management of this resource.
*/
public void cleanupResource();
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
index cf9b792..3b5747f 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/ManagedResourceType.java
@@ -1,113 +1,109 @@
/*
- * 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
+ * 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.admin.jmx.internal;
import org.apache.commons.lang.StringUtils;
/**
- * Type-safe definition for ModelMBean managed resources. The class type
- * ({@link #getClassTypeName}) must match the fully qualified class name listed
- * in the type descriptor in mbeans-descriptors.xml.
+ * Type-safe definition for ModelMBean managed resources. The class type ({@link #getClassTypeName})
+ * must match the fully qualified class name listed in the type descriptor in
+ * mbeans-descriptors.xml.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
public class ManagedResourceType implements java.io.Serializable {
private static final long serialVersionUID = 3752874768667480449L;
-
+
/** Agent managed resource type */
- public static final ManagedResourceType AGENT =
+ public static final ManagedResourceType AGENT =
new ManagedResourceType("Agent", org.apache.geode.admin.jmx.Agent.class);
/** DistributedSystem managed resource type */
- public static final ManagedResourceType DISTRIBUTED_SYSTEM =
- new ManagedResourceType("AdminDistributedSystem", org.apache.geode.admin.AdminDistributedSystem.class);
+ public static final ManagedResourceType DISTRIBUTED_SYSTEM = new ManagedResourceType(
+ "AdminDistributedSystem", org.apache.geode.admin.AdminDistributedSystem.class);
/** SystemMember managed resource type */
- public static final ManagedResourceType SYSTEM_MEMBER =
+ public static final ManagedResourceType SYSTEM_MEMBER =
new ManagedResourceType("SystemMember", org.apache.geode.admin.SystemMember.class);
/** SystemMemberCache managed resource type */
- public static final ManagedResourceType SYSTEM_MEMBER_CACHE =
+ public static final ManagedResourceType SYSTEM_MEMBER_CACHE =
new ManagedResourceType("SystemMemberCache", org.apache.geode.admin.SystemMemberCache.class);
/** SystemMemberCache managed resource type */
- public static final ManagedResourceType SYSTEM_MEMBER_REGION =
- new ManagedResourceType("SystemMemberRegion", org.apache.geode.admin.SystemMemberRegion.class);
+ public static final ManagedResourceType SYSTEM_MEMBER_REGION = new ManagedResourceType(
+ "SystemMemberRegion", org.apache.geode.admin.SystemMemberRegion.class);
/** SystemMemberCacheServer managed resource type */
- public static final ManagedResourceType SYSTEM_MEMBER_CACHE_SERVER =
- new ManagedResourceType("SystemMemberCacheServer", org.apache.geode.admin.SystemMemberCacheServer.class);
+ public static final ManagedResourceType SYSTEM_MEMBER_CACHE_SERVER = new ManagedResourceType(
+ "SystemMemberCacheServer", org.apache.geode.admin.SystemMemberCacheServer.class);
/** CacheVm managed resource type */
- public static final ManagedResourceType CACHE_VM =
+ public static final ManagedResourceType CACHE_VM =
new ManagedResourceType("CacheVm", org.apache.geode.admin.CacheVm.class);
/** StatisticResource managed resource type */
- public static final ManagedResourceType STATISTIC_RESOURCE =
+ public static final ManagedResourceType STATISTIC_RESOURCE =
new ManagedResourceType("StatisticResource", org.apache.geode.admin.StatisticResource.class);
- public static final ManagedResourceType GEMFIRE_HEALTH =
+ public static final ManagedResourceType GEMFIRE_HEALTH =
new ManagedResourceType("GemFireHealth", org.apache.geode.admin.GemFireHealth.class);
- public static final ManagedResourceType DISTRIBUTED_SYSTEM_HEALTH_CONFIG =
- new ManagedResourceType("DistributedSystemHealthConfig", org.apache.geode.admin.DistributedSystemHealthConfig.class);
+ public static final ManagedResourceType DISTRIBUTED_SYSTEM_HEALTH_CONFIG =
+ new ManagedResourceType("DistributedSystemHealthConfig",
+ org.apache.geode.admin.DistributedSystemHealthConfig.class);
- public static final ManagedResourceType GEMFIRE_HEALTH_CONFIG =
- new ManagedResourceType("GemFireHealthConfig", org.apache.geode.admin.GemFireHealthConfig.class);
+ public static final ManagedResourceType GEMFIRE_HEALTH_CONFIG = new ManagedResourceType(
+ "GemFireHealthConfig", org.apache.geode.admin.GemFireHealthConfig.class);
- public static final ManagedResourceType DISTRIBUTION_LOCATOR =
- new ManagedResourceType("DistributionLocator", org.apache.geode.admin.DistributionLocator.class);
+ public static final ManagedResourceType DISTRIBUTION_LOCATOR = new ManagedResourceType(
+ "DistributionLocator", org.apache.geode.admin.DistributionLocator.class);
- //////////////////// Instance Fields ////////////////////
+ //////////////////// Instance Fields ////////////////////
/** The display-friendly name of this managed resource type. */
private final transient String name;
-
- /**
- * The interface/class used to externally represent this type. Note: this must
- * match the mbean type descriptor in mbeans-descriptors.xml.
+
+ /**
+ * The interface/class used to externally represent this type. Note: this must match the mbean
+ * type descriptor in mbeans-descriptors.xml.
*/
private final transient Class clazz;
-
+
// The 4 declarations below are necessary for serialization
/** int used as ordinal to represent this Scope */
public final int ordinal = nextOrdinal++;
private static int nextOrdinal = 0;
-
+
private static final ManagedResourceType[] VALUES =
- { AGENT, DISTRIBUTED_SYSTEM, SYSTEM_MEMBER,
- SYSTEM_MEMBER_CACHE, SYSTEM_MEMBER_REGION,
- SYSTEM_MEMBER_CACHE_SERVER, CACHE_VM,
- STATISTIC_RESOURCE, GEMFIRE_HEALTH, DISTRIBUTED_SYSTEM_HEALTH_CONFIG,
- GEMFIRE_HEALTH_CONFIG, DISTRIBUTION_LOCATOR
- };
+ {AGENT, DISTRIBUTED_SYSTEM, SYSTEM_MEMBER, SYSTEM_MEMBER_CACHE, SYSTEM_MEMBER_REGION,
+ SYSTEM_MEMBER_CACHE_SERVER, CACHE_VM, STATISTIC_RESOURCE, GEMFIRE_HEALTH,
+ DISTRIBUTED_SYSTEM_HEALTH_CONFIG, GEMFIRE_HEALTH_CONFIG, DISTRIBUTION_LOCATOR};
private Object readResolve() throws java.io.ObjectStreamException {
- return VALUES[ordinal]; // Canonicalize
+ return VALUES[ordinal]; // Canonicalize
}
-
+
/** Creates a new instance of ManagedResourceType. */
private ManagedResourceType(String name, Class clazz) {
this.name = name;
this.clazz = clazz;
}
-
+
/** Returns the ManagedResourceType represented by specified ordinal */
public static ManagedResourceType fromOrdinal(int ordinal) {
return VALUES[ordinal];
@@ -117,93 +113,92 @@ public class ManagedResourceType implements java.io.Serializable {
public String getName() {
return this.name;
}
-
+
/** Returns the interface/class used to externally represent this type */
public Class getClassType() {
return this.clazz;
}
-
- /**
- * Returns the fully qualified name of the interface/class used to externally
- * represent this type
+
+ /**
+ * Returns the fully qualified name of the interface/class used to externally represent this type
*/
public String getClassTypeName() {
return this.clazz.getName();
}
-
+
/** Returns true if this is <code>AGENT</code>. */
public boolean isAgent() {
return this.equals(AGENT);
}
-
+
/** Returns true if this is <code>DISTRIBUTED_SYSTEM</code>. */
public boolean isDistributedSystem() {
return this.equals(DISTRIBUTED_SYSTEM);
}
-
+
/** Returns true if this is <code>SYSTEM_MEMBER</code>. */
public boolean isSystemMember() {
return this.equals(SYSTEM_MEMBER);
}
-
+
/** Returns whether this is <code>STATISTIC_RESOURCE</code>. */
public boolean isStatisticResource() {
return this.equals(STATISTIC_RESOURCE);
}
-
+
/** Return whether this is <code>GEMFIRE_HEALTH</code>. */
public boolean isGemFireHealth() {
return this.equals(GEMFIRE_HEALTH);
}
- /**
+ /**
* Returns a string representation for this type.
*/
@Override
public String toString() {
- return this.name;
+ return this.name;
}
-
- /**
- * Indicates whether some other object is "equal to" this one.
- *
- * @param other the reference object with which to compare.
- * @return true if this object is the same as the obj argument;
- * false otherwise.
- */
+
+ /**
+ * Indicates whether some other object is "equal to" this one.
+ *
+ * @param other the reference object with which to compare.
+ * @return true if this object is the same as the obj argument; false otherwise.
+ */
@Override
- public boolean equals(Object other) {
- if (other == this) return true;
- if (other == null) return false;
- if (!(other instanceof ManagedResourceType)) return false;
- final ManagedResourceType that = (ManagedResourceType) other;
-
- if (!StringUtils.equals(this.name, that.name)) return false;
- if (this.clazz != that.clazz &&
- !(this.clazz != null &&
- this.clazz.equals(that.clazz))) return false;
-
- return true;
- }
-
- /**
- * Returns a hash code for the object. This method is supported for the
- * benefit of hashtables such as those provided by java.util.Hashtable.
- *
- * @return the integer 0 if description is null; otherwise a unique integer.
- */
+ public boolean equals(Object other) {
+ if (other == this)
+ return true;
+ if (other == null)
+ return false;
+ if (!(other instanceof ManagedResourceType))
+ return false;
+ final ManagedResourceType that = (ManagedResourceType) other;
+
+ if (!StringUtils.equals(this.name, that.name))
+ return false;
+ if (this.clazz != that.clazz && !(this.clazz != null && this.clazz.equals(that.clazz)))
+ return false;
+
+ return true;
+ }
+
+ /**
+ * Returns a hash code for the object. This method is supported for the benefit of hashtables such
+ * as those provided by java.util.Hashtable.
+ *
+ * @return the integer 0 if description is null; otherwise a unique integer.
+ */
@Override
- public int hashCode() {
- int result = 17;
- final int mult = 37;
+ public int hashCode() {
+ int result = 17;
+ final int mult = 37;
- result = mult * result +
- (this.name == null ? 0 : this.name.hashCode());
- result = mult * result +
- (this.clazz == null ? 0 : this.clazz.hashCode());
+ result = mult * result + (this.name == null ? 0 : this.name.hashCode());
+ result = mult * result + (this.clazz == null ? 0 : this.clazz.hashCode());
- return result;
- }
+ return result;
+ }
}
[48/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
index f6378be..20cfeca 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -52,8 +50,8 @@ import java.util.Map;
import java.util.UUID;
/**
- * This class implements the session management using a Gemfire distributedCache
- * as a persistent store for the session objects
+ * This class implements the session management using a Gemfire distributedCache as a persistent
+ * store for the session objects
*/
public class GemfireSessionManager implements SessionManager {
@@ -89,16 +87,15 @@ public class GemfireSessionManager implements SessionManager {
private boolean isStopping = false;
/**
- * Boolean indicating whether this manager is defined in the same context (war
- * / classloader) as the filter.
+ * Boolean indicating whether this manager is defined in the same context (war / classloader) as
+ * the filter.
*/
private boolean isolated = false;
/**
* Map of wrapping GemFire session id to native session id
*/
- private Map<String, String> nativeSessionMap =
- new HashMap<String, String>();
+ private Map<String, String> nativeSessionMap = new HashMap<String, String>();
/**
* MBean for statistics
@@ -106,9 +103,8 @@ public class GemfireSessionManager implements SessionManager {
private SessionStatistics mbean;
/**
- * This CL is used to compare against the class loader of attributes getting
- * pulled out of the cache. This variable should be set to the CL of the
- * filter running everything.
+ * This CL is used to compare against the class loader of attributes getting pulled out of the
+ * cache. This variable should be set to the CL of the filter running everything.
*/
private ClassLoader referenceClassLoader;
@@ -123,21 +119,22 @@ public class GemfireSessionManager implements SessionManager {
* Set up properties with default values
*/
private TypeAwareMap<CacheProperty, Object> properties =
- new TypeAwareMap<CacheProperty, Object>(CacheProperty.class) {{
- put(CacheProperty.REGION_NAME, RegionHelper.NAME + "_sessions");
- put(CacheProperty.ENABLE_GATEWAY_DELTA_REPLICATION, Boolean.FALSE);
- put(CacheProperty.ENABLE_GATEWAY_REPLICATION, Boolean.FALSE);
- put(CacheProperty.ENABLE_DEBUG_LISTENER, Boolean.FALSE);
- put(CacheProperty.STATISTICS_NAME, "gemfire_statistics");
- put(CacheProperty.SESSION_DELTA_POLICY, "delta_queued");
- put(CacheProperty.REPLICATION_TRIGGER, "set");
- /**
- * For REGION_ATTRIBUTES_ID and ENABLE_LOCAL_CACHE the default
- * is different for ClientServerCache and PeerToPeerCache
- * so those values are set in the relevant constructors when
- * these properties are passed in to them.
- */
- }};
+ new TypeAwareMap<CacheProperty, Object>(CacheProperty.class) {
+ {
+ put(CacheProperty.REGION_NAME, RegionHelper.NAME + "_sessions");
+ put(CacheProperty.ENABLE_GATEWAY_DELTA_REPLICATION, Boolean.FALSE);
+ put(CacheProperty.ENABLE_GATEWAY_REPLICATION, Boolean.FALSE);
+ put(CacheProperty.ENABLE_DEBUG_LISTENER, Boolean.FALSE);
+ put(CacheProperty.STATISTICS_NAME, "gemfire_statistics");
+ put(CacheProperty.SESSION_DELTA_POLICY, "delta_queued");
+ put(CacheProperty.REPLICATION_TRIGGER, "set");
+ /**
+ * For REGION_ATTRIBUTES_ID and ENABLE_LOCAL_CACHE the default is different for
+ * ClientServerCache and PeerToPeerCache so those values are set in the relevant
+ * constructors when these properties are passed in to them.
+ */
+ }
+ };
public GemfireSessionManager() {
LOG = LoggerFactory.getLogger(GemfireSessionManager.class.getName());
@@ -161,8 +158,7 @@ public class GemfireSessionManager implements SessionManager {
isolated = true;
}
- String sessionCookieName = config.getInitParameter(
- INIT_PARAM_SESSION_COOKIE_NAME);
+ String sessionCookieName = config.getInitParameter(INIT_PARAM_SESSION_COOKIE_NAME);
if (sessionCookieName != null && !sessionCookieName.isEmpty()) {
this.sessionCookieName = sessionCookieName;
LOG.info("Session cookie name set to: {}", this.sessionCookieName);
@@ -173,8 +169,7 @@ public class GemfireSessionManager implements SessionManager {
jvmId = DEFAULT_JVM_ID;
}
- LOG.info("Started GemfireSessionManager (isolated={}, jvmId={})",
- isolated, jvmId);
+ LOG.info("Started GemfireSessionManager (isolated={}, jvmId={})", isolated, jvmId);
}
/**
@@ -199,14 +194,12 @@ public class GemfireSessionManager implements SessionManager {
*/
@Override
public HttpSession getSession(String id) {
- GemfireHttpSession session = (GemfireHttpSession) sessionCache.getOperatingRegion().get(
- id);
+ GemfireHttpSession session = (GemfireHttpSession) sessionCache.getOperatingRegion().get(id);
if (session != null) {
if (session.justSerialized()) {
session.setManager(this);
- LOG.debug("Recovered serialized session {} (jvmId={})", id,
- session.getJvmOwnerId());
+ LOG.debug("Recovered serialized session {} (jvmId={})", id, session.getJvmOwnerId());
}
LOG.debug("Retrieved session id {}", id);
} else {
@@ -221,28 +214,23 @@ public class GemfireSessionManager implements SessionManager {
@Override
public HttpSession wrapSession(HttpSession nativeSession) {
String id = generateId();
- GemfireHttpSession session =
- new GemfireHttpSession(id, nativeSession);
+ GemfireHttpSession session = new GemfireHttpSession(id, nativeSession);
/**
* Set up the attribute container depending on how things are configured
*/
AbstractSessionAttributes attributes;
- if ("delta_queued".equals(
- properties.get(CacheProperty.SESSION_DELTA_POLICY))) {
+ if ("delta_queued".equals(properties.get(CacheProperty.SESSION_DELTA_POLICY))) {
attributes = new DeltaQueuedSessionAttributes();
- ((DeltaQueuedSessionAttributes) attributes).setReplicationTrigger(
- (String) properties.get(CacheProperty.REPLICATION_TRIGGER));
- } else if ("delta_immediate".equals(
- properties.get(CacheProperty.SESSION_DELTA_POLICY))) {
+ ((DeltaQueuedSessionAttributes) attributes)
+ .setReplicationTrigger((String) properties.get(CacheProperty.REPLICATION_TRIGGER));
+ } else if ("delta_immediate".equals(properties.get(CacheProperty.SESSION_DELTA_POLICY))) {
attributes = new DeltaSessionAttributes();
- } else if ("immediate".equals(
- properties.get(CacheProperty.SESSION_DELTA_POLICY))) {
+ } else if ("immediate".equals(properties.get(CacheProperty.SESSION_DELTA_POLICY))) {
attributes = new ImmediateSessionAttributes();
} else {
attributes = new DeltaSessionAttributes();
- LOG.warn(
- "No session delta policy specified - using default of 'delta_immediate'");
+ LOG.warn("No session delta policy specified - using default of 'delta_immediate'");
}
attributes.setSession(session);
@@ -279,8 +267,7 @@ public class GemfireSessionManager implements SessionManager {
public void destroySession(String id) {
if (!isStopping) {
try {
- GemfireHttpSession session = (GemfireHttpSession) sessionCache.getOperatingRegion().get(
- id);
+ GemfireHttpSession session = (GemfireHttpSession) sessionCache.getOperatingRegion().get(id);
if (session != null && session.getJvmOwnerId().equals(jvmId)) {
LOG.debug("Destroying session {}", id);
sessionCache.getOperatingRegion().destroy(id);
@@ -299,8 +286,7 @@ public class GemfireSessionManager implements SessionManager {
// Ignored
}
} else {
- GemfireHttpSession session = (GemfireHttpSession) sessionCache.getOperatingRegion().get(
- id);
+ GemfireHttpSession session = (GemfireHttpSession) sessionCache.getOperatingRegion().get(id);
if (session != null) {
session.setNativeSession(null);
}
@@ -338,13 +324,12 @@ public class GemfireSessionManager implements SessionManager {
}
/**
- * This method is called when a native session gets destroyed. It will check
- * if the GemFire session is actually still valid/not expired and will then
- * attach a new, native session.
+ * This method is called when a native session gets destroyed. It will check if the GemFire
+ * session is actually still valid/not expired and will then attach a new, native session.
*
* @param nativeId the id of the native session
- * @return the id of the newly attached native session or null if the GemFire
- * session was already invalid
+ * @return the id of the newly attached native session or null if the GemFire session was already
+ * invalid
*/
public String refreshSession(String nativeId) {
String gemfireId = getGemfireSessionIdFromNativeId(nativeId);
@@ -352,8 +337,8 @@ public class GemfireSessionManager implements SessionManager {
return null;
}
- GemfireHttpSession session = (GemfireHttpSession) sessionCache.getOperatingRegion().get(
- gemfireId);
+ GemfireHttpSession session =
+ (GemfireHttpSession) sessionCache.getOperatingRegion().get(gemfireId);
if (session.isValid()) {
}
@@ -399,27 +384,24 @@ public class GemfireSessionManager implements SessionManager {
} else if (CACHE_TYPE_PEER_TO_PEER.equals(cacheType)) {
distributedCache = PeerToPeerCache.getInstance();
} else {
- LOG.error("No 'cache-type' initialization param set. "
- + "Cache will not be started");
+ LOG.error("No 'cache-type' initialization param set. " + "Cache will not be started");
return;
}
if (!distributedCache.isStarted()) {
/**
- * Process all the init params and see if any apply to the
- * distributed system.
+ * Process all the init params and see if any apply to the distributed system.
*/
- for (Enumeration<String> e = config.getInitParameterNames(); e.hasMoreElements(); ) {
+ for (Enumeration<String> e = config.getInitParameterNames(); e.hasMoreElements();) {
String param = e.nextElement();
if (!param.startsWith(GEMFIRE_PROPERTY)) {
continue;
}
String gemfireProperty = param.substring(GEMFIRE_PROPERTY.length());
- LOG.info("Setting gemfire property: {} = {}",
- gemfireProperty, config.getInitParameter(param));
- distributedCache.setProperty(gemfireProperty,
+ LOG.info("Setting gemfire property: {} = {}", gemfireProperty,
config.getInitParameter(param));
+ distributedCache.setProperty(gemfireProperty, config.getInitParameter(param));
}
distributedCache.lifecycleEvent(LifecycleTypeAdapter.START);
@@ -433,17 +415,16 @@ public class GemfireSessionManager implements SessionManager {
// Retrieve the distributedCache
GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
if (cache == null) {
- throw new IllegalStateException("No cache exists. Please configure "
- + "either a PeerToPeerCacheLifecycleListener or "
- + "ClientServerCacheLifecycleListener in the "
- + "server.xml file.");
+ throw new IllegalStateException(
+ "No cache exists. Please configure " + "either a PeerToPeerCacheLifecycleListener or "
+ + "ClientServerCacheLifecycleListener in the " + "server.xml file.");
}
/**
* Process all the init params and see if any apply to the distributedCache
*/
ResourceManager rm = cache.getResourceManager();
- for (Enumeration<String> e = config.getInitParameterNames(); e.hasMoreElements(); ) {
+ for (Enumeration<String> e = config.getInitParameterNames(); e.hasMoreElements();) {
String param = e.nextElement();
// Uggh - don't like this non-generic stuff
@@ -463,15 +444,13 @@ public class GemfireSessionManager implements SessionManager {
}
String gemfireWebParam = param.substring(GEMFIRE_CACHE.length());
- LOG.info("Setting cache parameter: {} = {}",
- gemfireWebParam, config.getInitParameter(param));
+ LOG.info("Setting cache parameter: {} = {}", gemfireWebParam, config.getInitParameter(param));
properties.put(CacheProperty.valueOf(gemfireWebParam.toUpperCase()),
config.getInitParameter(param));
}
// Create the appropriate session distributedCache
- sessionCache = cache.isClient()
- ? new ClientServerSessionCache(cache, properties)
+ sessionCache = cache.isClient() ? new ClientServerSessionCache(cache, properties)
: new PeerToPeerSessionCache(cache, properties);
// Initialize the session distributedCache
@@ -486,15 +465,12 @@ public class GemfireSessionManager implements SessionManager {
try {
InitialContext ctx = new InitialContext();
- MBeanServer mbs = MBeanServer.class.cast(
- ctx.lookup("java:comp/env/jmx/runtime"));
- ObjectName oname = new ObjectName(
- Constants.SESSION_STATISTICS_MBEAN_NAME);
+ MBeanServer mbs = MBeanServer.class.cast(ctx.lookup("java:comp/env/jmx/runtime"));
+ ObjectName oname = new ObjectName(Constants.SESSION_STATISTICS_MBEAN_NAME);
mbs.registerMBean(mbean, oname);
} catch (Exception ex) {
- LOG.warn("Unable to register statistics MBean. Error: {}",
- ex.getMessage());
+ LOG.warn("Unable to register statistics MBean. Error: {}", ex.getMessage());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/ListenerEventType.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/ListenerEventType.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/ListenerEventType.java
index cfb2d49..2e4337d 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/ListenerEventType.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/ListenerEventType.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
@@ -25,51 +23,40 @@ public enum ListenerEventType {
/**
* HttpSessionAttributeListener
*/
- SESSION_ATTRIBUTE_ADDED,
- SESSION_ATTRIBUTE_REMOVED,
- SESSION_ATTRIBUTE_REPLACED,
+ SESSION_ATTRIBUTE_ADDED, SESSION_ATTRIBUTE_REMOVED, SESSION_ATTRIBUTE_REPLACED,
/**
* HttpSessionBindingListener
*/
- SESSION_VALUE_BOUND,
- SESSION_VALUE_UNBOUND,
+ SESSION_VALUE_BOUND, SESSION_VALUE_UNBOUND,
/**
* HttpSessionListener
*/
- SESSION_CREATED,
- SESSION_DESTROYED,
+ SESSION_CREATED, SESSION_DESTROYED,
/**
* HttpSessionActivationListener
*/
- SESSION_WILL_ACTIVATE,
- SESSION_DID_PASSIVATE,
+ SESSION_WILL_ACTIVATE, SESSION_DID_PASSIVATE,
/**
* ServletContextListener
*/
- SERVLET_CONTEXT_INITIALIZED,
- SERVLET_CONTEXT_DESTROYED,
+ SERVLET_CONTEXT_INITIALIZED, SERVLET_CONTEXT_DESTROYED,
/**
* ServletContextAttributeListener
*/
- SERVLET_CONTEXT_ATTRIBUTE_ADDED,
- SERVLET_CONTEXT_ATTRIBUTE_REMOVED,
- SERVLET_CONTEXT_ATTRIBUTE_REPLACED,
+ SERVLET_CONTEXT_ATTRIBUTE_ADDED, SERVLET_CONTEXT_ATTRIBUTE_REMOVED, SERVLET_CONTEXT_ATTRIBUTE_REPLACED,
/**
* ServletRequestListener
*/
- SERVLET_REQUEST_DESTROYED,
- SERVLET_REQUEST_INITIALIZED,
+ SERVLET_REQUEST_DESTROYED, SERVLET_REQUEST_INITIALIZED,
/**
* ServletRequestAttributeListener
*/
- SERVLET_REQUEST_ATTRIBUTE_ADDED,
- SERVLET_REQUEST_ATTRIBUTE_REMOVED,
- SERVLET_REQUEST_ATTRIBUTE_REPLACED;
+ SERVLET_REQUEST_ATTRIBUTE_ADDED, SERVLET_REQUEST_ATTRIBUTE_REMOVED, SERVLET_REQUEST_ATTRIBUTE_REPLACED;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/SessionManager.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/SessionManager.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/SessionManager.java
index c59624c..642c287 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/SessionManager.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/SessionManager.java
@@ -1,27 +1,24 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter;
import javax.servlet.http.HttpSession;
/**
- * Interface to session management. This class would be responsible for creating
- * new sessions.
+ * Interface to session management. This class would be responsible for creating new sessions.
*/
public interface SessionManager {
@@ -29,12 +26,10 @@ public interface SessionManager {
* Start the manager possibly using the config passed in.
*
* @param config Config object specific to individual implementations.
- * @param loader This is a hack. When the manager is started it wants to be
- * able to determine if the cache, which it would create, and
- * the filter which starts everything, are defined by the same
- * classloader. This is so that during shutdown, the manager can
- * decide whether or not to also stop the cache. This option
- * allows the filter's classloader to be passed in.
+ * @param loader This is a hack. When the manager is started it wants to be able to determine if
+ * the cache, which it would create, and the filter which starts everything, are defined by
+ * the same classloader. This is so that during shutdown, the manager can decide whether or
+ * not to also stop the cache. This option allows the filter's classloader to be passed in.
*/
public void start(Object config, ClassLoader loader);
@@ -67,9 +62,8 @@ public interface SessionManager {
public HttpSession wrapSession(HttpSession nativeSession);
/**
- * Get the wrapped (GemFire) session from a native session id. This method
- * would typically be used from within session/http event listeners which
- * receive the original session id.
+ * Get the wrapped (GemFire) session from a native session id. This method would typically be used
+ * from within session/http event listeners which receive the original session id.
*
* @param nativeId
* @return the wrapped GemFire session which maps the native session
@@ -87,22 +81,20 @@ public interface SessionManager {
* Destroy the session associated with a given native session
*
* @param id the id of the native session
- * @return the corresponding Gemfire session which wrapped the native session
- * and was destroyed.
+ * @return the corresponding Gemfire session which wrapped the native session and was destroyed.
*/
public String destroyNativeSession(String id);
/**
- * Returns the cookie name used to hold the session id. By default this is
- * JSESSIONID.
+ * Returns the cookie name used to hold the session id. By default this is JSESSIONID.
*
* @return the name of the cookie which contains the session id
*/
public String getSessionCookieName();
/**
- * Get the JVM Id - this is a unique string used internally to identify who
- * last touched a session.
+ * Get the JVM Id - this is a unique string used internally to identify who last touched a
+ * session.
*
* @return the jvm id
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractDeltaSessionAttributes.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractDeltaSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractDeltaSessionAttributes.java
index 0d36932..4d1f108 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractDeltaSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractDeltaSessionAttributes.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.attributes;
@@ -32,11 +30,10 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This abstract class contains the structures and methods to handle delta
- * updates to attributes.
+ * This abstract class contains the structures and methods to handle delta updates to attributes.
*/
-public abstract class AbstractDeltaSessionAttributes
- extends AbstractSessionAttributes implements Delta {
+public abstract class AbstractDeltaSessionAttributes extends AbstractSessionAttributes
+ implements Delta {
private static final Logger LOG =
LoggerFactory.getLogger(AbstractDeltaSessionAttributes.class.getName());
@@ -70,8 +67,7 @@ public abstract class AbstractDeltaSessionAttributes
}
@Override
- public void fromDelta(DataInput in)
- throws IOException, InvalidDeltaException {
+ public void fromDelta(DataInput in) throws IOException, InvalidDeltaException {
maxInactiveInterval = in.readInt();
lastAccessedTime = in.readLong();
Map<String, DeltaEvent> localDeltas = new HashMap<String, DeltaEvent>();
@@ -87,8 +83,7 @@ public abstract class AbstractDeltaSessionAttributes
return;
}
- LOG.debug("Processing {} delta events for {}",
- localDeltas.size(), session);
+ LOG.debug("Processing {} delta events for {}", localDeltas.size(), session);
for (DeltaEvent e : localDeltas.values()) {
if (e.isUpdate()) {
attributes.put(e.getName(), e.getValue());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
index 4c4564c..6e0cbc4 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/AbstractSessionAttributes.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.attributes;
@@ -33,9 +31,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Abstract implementation for attributes. Should be sub-classed to provide
- * differing implementations for synchronous or delta propagation. The backing
- * store used is defined by the session manager.
+ * Abstract implementation for attributes. Should be sub-classed to provide differing
+ * implementations for synchronous or delta propagation. The backing store used is defined by the
+ * session manager.
*/
public abstract class AbstractSessionAttributes implements SessionAttributes {
@@ -77,9 +75,8 @@ public abstract class AbstractSessionAttributes implements SessionAttributes {
}
/**
- * {@inheritDoc} The actual de-serialization of any domain objects is deferred
- * until the point at which they are actually retrieved by the application
- * layer.
+ * {@inheritDoc} The actual de-serialization of any domain objects is deferred until the point at
+ * which they are actually retrieved by the application layer.
*/
@Override
public Object getAttribute(String name) {
@@ -92,8 +89,7 @@ public abstract class AbstractSessionAttributes implements SessionAttributes {
value = BlobHelper.deserializeBlob((byte[]) value);
attributes.put(name, value);
} catch (Exception iox) {
- LOG.error("Attribute '" + name +
- " contains a byte[] that cannot be deserialized due "
+ LOG.error("Attribute '" + name + " contains a byte[] that cannot be deserialized due "
+ "to the following exception", iox);
}
}
@@ -133,8 +129,8 @@ public abstract class AbstractSessionAttributes implements SessionAttributes {
}
/**
- * {@inheritDoc} This method calls back into the session to flush the whole
- * session including its attributes.
+ * {@inheritDoc} This method calls back into the session to flush the whole session including its
+ * attributes.
*/
@Override
public void flush() {
@@ -142,9 +138,8 @@ public abstract class AbstractSessionAttributes implements SessionAttributes {
}
/**
- * Use DeltaEvents to propagate the actual attribute data - DeltaEvents turn
- * the values into byte arrays which means that the actual domain classes are
- * not required on the server.
+ * Use DeltaEvents to propagate the actual attribute data - DeltaEvents turn the values into byte
+ * arrays which means that the actual domain classes are not required on the server.
*/
@Override
public void toData(DataOutput out) throws IOException {
@@ -154,8 +149,7 @@ public abstract class AbstractSessionAttributes implements SessionAttributes {
synchronized (attributes) {
out.writeInt(attributes.size());
for (Map.Entry<String, Object> entry : attributes.entrySet()) {
- DeltaEvent delta = new DeltaEvent(true, entry.getKey(),
- entry.getValue());
+ DeltaEvent delta = new DeltaEvent(true, entry.getKey(), entry.getValue());
DataSerializer.writeObject(delta, out);
}
}
@@ -164,8 +158,7 @@ public abstract class AbstractSessionAttributes implements SessionAttributes {
}
@Override
- public void fromData(
- DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
maxInactiveInterval = in.readInt();
lastAccessedTime = in.readLong();
int size = in.readInt();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaEvent.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaEvent.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaEvent.java
index 2bffadc..68c6995 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaEvent.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaEvent.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.attributes;
@@ -33,8 +31,7 @@ import java.io.IOException;
*/
public class DeltaEvent implements DataSerializable {
- private static final Logger LOG =
- LoggerFactory.getLogger(DeltaEvent.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(DeltaEvent.class.getName());
/**
* The event is either an update (true) or a remove (false)
*/
@@ -49,15 +46,13 @@ public class DeltaEvent implements DataSerializable {
/**
* Constructor for de-serialization only
*/
- public DeltaEvent() {
- }
+ public DeltaEvent() {}
/**
- * Constructor which creates a 'deferred' event. This is used when the value
- * should only be applied when the object is serialized.
+ * Constructor which creates a 'deferred' event. This is used when the value should only be
+ * applied when the object is serialized.
*
- * @param session the session from which the value ultimately will be
- * retrieved
+ * @param session the session from which the value ultimately will be retrieved
* @param attribute the name of the attribute
*/
public DeltaEvent(GemfireHttpSession session, String attribute) {
@@ -110,8 +105,7 @@ public class DeltaEvent implements DataSerializable {
}
@Override
- public void fromData(
- DataInput in) throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
update = in.readBoolean();
name = DataSerializer.readString(in);
value = DataSerializer.readObject(in);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaQueuedSessionAttributes.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaQueuedSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaQueuedSessionAttributes.java
index faa849d..a806515 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaQueuedSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaQueuedSessionAttributes.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.attributes;
@@ -23,9 +21,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This class implements delayed attribute delta propagation. Updates to
- * attributes are only propagated once the session goes out of scope - i.e. as
- * the request is done being processed.
+ * This class implements delayed attribute delta propagation. Updates to attributes are only
+ * propagated once the session goes out of scope - i.e. as the request is done being processed.
*/
public class DeltaQueuedSessionAttributes extends AbstractDeltaSessionAttributes {
@@ -35,28 +32,25 @@ public class DeltaQueuedSessionAttributes extends AbstractDeltaSessionAttributes
private Trigger trigger = Trigger.SET;
private enum Trigger {
- SET,
- SET_AND_GET;
+ SET, SET_AND_GET;
}
/**
* Register ourselves for de-serialization
*/
static {
- Instantiator.register(
- new Instantiator(DeltaQueuedSessionAttributes.class, 3479) {
- @Override
- public DataSerializable newInstance() {
- return new DeltaQueuedSessionAttributes();
- }
- });
+ Instantiator.register(new Instantiator(DeltaQueuedSessionAttributes.class, 3479) {
+ @Override
+ public DataSerializable newInstance() {
+ return new DeltaQueuedSessionAttributes();
+ }
+ });
}
/**
* Default constructor
*/
- public DeltaQueuedSessionAttributes() {
- }
+ public DeltaQueuedSessionAttributes() {}
public void setReplicationTrigger(String trigger) {
this.trigger = Trigger.valueOf(trigger.toUpperCase());
@@ -71,8 +65,8 @@ public class DeltaQueuedSessionAttributes extends AbstractDeltaSessionAttributes
}
/**
- * {@inheritDoc} Put an attribute, setting the dirty flag. The changes are
- * flushed at the end of filter processing.
+ * {@inheritDoc} Put an attribute, setting the dirty flag. The changes are flushed at the end of
+ * filter processing.
*/
@Override
public Object putAttribute(String attr, Object value) {
@@ -82,8 +76,8 @@ public class DeltaQueuedSessionAttributes extends AbstractDeltaSessionAttributes
}
/**
- * {@inheritDoc} Remove an attribute, setting the dirty flag. The changes are
- * flushed at the end of filter processing.
+ * {@inheritDoc} Remove an attribute, setting the dirty flag. The changes are flushed at the end
+ * of filter processing.
*/
@Override
public Object removeAttribute(String attr) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java
index 85723ec..010d4e3 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/DeltaSessionAttributes.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.attributes;
@@ -23,13 +21,12 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This class implements synchronous attribute delta propagation. Updates to
- * attributes are immediately propagated.
+ * This class implements synchronous attribute delta propagation. Updates to attributes are
+ * immediately propagated.
*/
public class DeltaSessionAttributes extends AbstractDeltaSessionAttributes {
- private static final Logger LOG =
- LoggerFactory.getLogger(DeltaSessionAttributes.class.getName());
+ private static final Logger LOG = LoggerFactory.getLogger(DeltaSessionAttributes.class.getName());
/**
* Register ourselves for de-serialization
@@ -46,12 +43,11 @@ public class DeltaSessionAttributes extends AbstractDeltaSessionAttributes {
/**
* Default constructor
*/
- public DeltaSessionAttributes() {
- }
+ public DeltaSessionAttributes() {}
/**
- * {@inheritDoc} Put an attribute, setting the dirty flag and immediately
- * flushing the delta queue.
+ * {@inheritDoc} Put an attribute, setting the dirty flag and immediately flushing the delta
+ * queue.
*/
@Override
public Object putAttribute(String attr, Object value) {
@@ -62,8 +58,8 @@ public class DeltaSessionAttributes extends AbstractDeltaSessionAttributes {
}
/**
- * {@inheritDoc} Remove an attribute, setting the dirty flag and immediately
- * flushing the delta queue.
+ * {@inheritDoc} Remove an attribute, setting the dirty flag and immediately flushing the delta
+ * queue.
*/
@Override
public Object removeAttribute(String attr) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java
index 15dd522..084be45 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/ImmediateSessionAttributes.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.attributes;
@@ -24,9 +22,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This class implements immediately transmitted attributes. All attributes are
- * transmitted for every attribute update. This is bound to be a performance hit
- * in some cases but ensures much higher data availability.
+ * This class implements immediately transmitted attributes. All attributes are transmitted for
+ * every attribute update. This is bound to be a performance hit in some cases but ensures much
+ * higher data availability.
*/
public class ImmediateSessionAttributes extends AbstractSessionAttributes {
@@ -37,20 +35,18 @@ public class ImmediateSessionAttributes extends AbstractSessionAttributes {
* Register ourselves for de-serialization
*/
static {
- Instantiator.register(
- new Instantiator(ImmediateSessionAttributes.class, 347) {
- @Override
- public DataSerializable newInstance() {
- return new ImmediateSessionAttributes();
- }
- });
+ Instantiator.register(new Instantiator(ImmediateSessionAttributes.class, 347) {
+ @Override
+ public DataSerializable newInstance() {
+ return new ImmediateSessionAttributes();
+ }
+ });
}
/**
* Default constructor
*/
- public ImmediateSessionAttributes() {
- }
+ public ImmediateSessionAttributes() {}
@Override
public Object putAttribute(String attr, Object value) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java
index e1aeb0b..374e81e 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/QueuedSessionAttributes.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.attributes;
@@ -24,9 +22,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This class implements an attribute container which delays sending updates
- * until the session goes out of scope. All attributes are transmitted during
- * the update.
+ * This class implements an attribute container which delays sending updates until the session goes
+ * out of scope. All attributes are transmitted during the update.
*/
public class QueuedSessionAttributes extends AbstractSessionAttributes {
@@ -48,8 +45,7 @@ public class QueuedSessionAttributes extends AbstractSessionAttributes {
/**
* Default constructor
*/
- public QueuedSessionAttributes() {
- }
+ public QueuedSessionAttributes() {}
@Override
public Object putAttribute(String attr, Object value) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
index a882712..4f4a2f8 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/attributes/SessionAttributes.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.attributes;
@@ -23,10 +21,9 @@ import org.apache.geode.modules.session.internal.filter.GemfireHttpSession;
import java.util.Set;
/**
- * Interface for session attribute storage. In reality, this interface is
- * responsible for anything, in the session which needs to be propagated for
- * caching - as such it also includes other 'attributes' such as
- * maxInactiveInterval and lastAccessedTime
+ * Interface for session attribute storage. In reality, this interface is responsible for anything,
+ * in the session which needs to be propagated for caching - as such it also includes other
+ * 'attributes' such as maxInactiveInterval and lastAccessedTime
*/
public interface SessionAttributes extends DataSerializable {
@@ -40,7 +37,7 @@ public interface SessionAttributes extends DataSerializable {
/**
* Set an attribute value.
*
- * @param attr the name of the attribute to set
+ * @param attr the name of the attribute to set
* @param value the value for the attribute
* @return the value object
*/
@@ -58,8 +55,7 @@ public interface SessionAttributes extends DataSerializable {
* Remove the named attribute.
*
* @param attr the name of the attribute to remove
- * @return the value of the attribute removed or null if the named attribute
- * did not exist.
+ * @return the value of the attribute removed or null if the named attribute did not exist.
*/
public Object removeAttribute(String attr);
@@ -111,8 +107,7 @@ public interface SessionAttributes extends DataSerializable {
public String getJvmOwnerId();
/**
- * Set the jvmId. This is set every time the attributes are flushed to the
- * cache.
+ * Set the jvmId. This is set every time the attributes are flushed to the cache.
*
* @param jvmId
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/NamedThreadFactory.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/NamedThreadFactory.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/NamedThreadFactory.java
index dbd5894..9fe9e27 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/NamedThreadFactory.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/NamedThreadFactory.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.util;
@@ -28,16 +26,14 @@ import java.util.logging.Logger;
*/
public class NamedThreadFactory implements ThreadFactory {
- private static final Logger LOG = Logger.getLogger(
- NamedThreadFactory.class.getName());
+ private static final Logger LOG = Logger.getLogger(NamedThreadFactory.class.getName());
private final String id;
private final AtomicLong serial = new AtomicLong();
/**
- * Create a new thread factory, using the specified pool ID as a basis for
- * naming each thread.
+ * Create a new thread factory, using the specified pool ID as a basis for naming each thread.
*
* @param poolID pool name/ID
*/
@@ -48,8 +44,8 @@ public class NamedThreadFactory implements ThreadFactory {
/**
* {@inheritDoc}
* <p/>
- * This implementation sets the name of the thread, sets the thread to be a
- * daemon thread, and adds an uncaught exception handler.
+ * This implementation sets the name of the thread, sets the thread to be a daemon thread, and
+ * adds an uncaught exception handler.
*/
@Override
public Thread newThread(Runnable r) {
@@ -59,8 +55,7 @@ public class NamedThreadFactory implements ThreadFactory {
thr.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
@Override
public void uncaughtException(Thread t, Throwable e) {
- LOG.log(Level.WARNING,
- "Uncaught Exception in thread: " + t.getName(), e);
+ LOG.log(Level.WARNING, "Uncaught Exception in thread: " + t.getName(), e);
}
});
return thr;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/ThreadLocalSession.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/ThreadLocalSession.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/ThreadLocalSession.java
index 13af79c..31dd134 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/ThreadLocalSession.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/ThreadLocalSession.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.util;
@@ -22,8 +20,7 @@ import javax.servlet.http.HttpSession;
/**
*/
public class ThreadLocalSession {
- private static ThreadLocal<HttpSession> threadLocal =
- new ThreadLocal<HttpSession>();
+ private static ThreadLocal<HttpSession> threadLocal = new ThreadLocal<HttpSession>();
public static HttpSession get() {
return threadLocal.get();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/TypeAwareMap.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/TypeAwareMap.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/TypeAwareMap.java
index 7000033..2a86a06 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/TypeAwareMap.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/util/TypeAwareMap.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.filter.util;
@@ -40,8 +38,7 @@ public class TypeAwareMap<K extends CacheProperty, Object> extends HashMap {
} else if (key.getClazz() == Integer.class) {
return (Object) super.put(key, Integer.valueOf((String) value));
} else {
- throw new IllegalArgumentException("Value is not of type " +
- key.getClazz().getName());
+ throw new IllegalArgumentException("Value is not of type " + key.getClazz().getName());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatistics.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatistics.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatistics.java
index 5fba0a5..678b53e 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatistics.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatistics.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.internal.jmx;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatisticsMXBean.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatisticsMXBean.java b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatisticsMXBean.java
index c219e3a..1821f62 100644
--- a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatisticsMXBean.java
+++ b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/jmx/SessionStatisticsMXBean.java
@@ -1,18 +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
+ * 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.modules.session.internal.jmx;
[20/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
index 6a183c5..83aa440 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -23,20 +21,19 @@ import org.apache.geode.internal.admin.ApplicationVM;
import org.apache.geode.internal.logging.MergeLogFiles;
import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.util.ArrayList;
import java.util.List;
public class LogCollator {
-
+
private GfManagerAgent system;
private List logTails;
-
- public LogCollator() {
- }
-
+
+ public LogCollator() {}
+
public String collateLogs(GfManagerAgent system) {
try {
if (system == null) {
@@ -47,15 +44,14 @@ public class LogCollator {
gatherActiveLogs();
gatherInactiveLogs();
return mergeLogs();
- }
- finally {
+ } finally {
this.system = null;
this.logTails = null;
}
}
// -------------------------------------------------------------------------
-
+
private String mergeLogs() {
// combine logs...
InputStream[] logFiles = new InputStream[this.logTails.size()];
@@ -65,14 +61,13 @@ public class LogCollator {
logFiles[i] = new ByteArrayInputStream(loglet.tail.getBytes());
logFileNames[i] = loglet.name;
}
-
+
// delegate to MergeLogFiles...
StringWriter writer = new StringWriter();
PrintWriter mergedLog = new PrintWriter(writer);
if (!MergeLogFiles.mergeLogFiles(logFiles, logFileNames, mergedLog)) {
return writer.toString();
- }
- else {
+ } else {
return "";
}
}
@@ -83,27 +78,17 @@ public class LogCollator {
addLogFrom(runningsApps[i]);
}
}
-
+
private void gatherInactiveLogs() {
- /* not yet supported....
- if (useStopped) {
- LogViewHelper helper = new LogViewHelper();
- for (Iterator iter = stoppedNodes.iterator(); iter.hasNext(); ) {
- Object adminEntity = iter.next();
- helper.setAdminEntity(adminEntity);
- try {
- if (helper.logViewAvailable()) {
- String[] logs = helper.getSystemLogs();
- addTail(allTails, logs, adminEntity.toString());
- }
- } catch (Exception e) {
- Service.getService().reportSystemError(e);
- }
- }
- }
- */
+ /*
+ * not yet supported.... if (useStopped) { LogViewHelper helper = new LogViewHelper(); for
+ * (Iterator iter = stoppedNodes.iterator(); iter.hasNext(); ) { Object adminEntity =
+ * iter.next(); helper.setAdminEntity(adminEntity); try { if (helper.logViewAvailable()) {
+ * String[] logs = helper.getSystemLogs(); addTail(allTails, logs, adminEntity.toString()); } }
+ * catch (Exception e) { Service.getService().reportSystemError(e); } } }
+ */
}
-
+
private void addLogFrom(GemFireVM vm) {
String name = null;
name = vm.toString();
@@ -113,25 +98,24 @@ public class LogCollator {
private void addTail(String logName, String[] logs) {
if (logs.length > 0) {
- String tail = (logs.length > 1) ? logs[1] : logs[0];
+ String tail = (logs.length > 1) ? logs[1] : logs[0];
this.logTails.add(new Loglet(logName, tail));
}
}
/*
- public void setUseStoppedManagers(boolean useStopped) {
- this.useStopped = useStopped;
- }
- */
+ * public void setUseStoppedManagers(boolean useStopped) { this.useStopped = useStopped; }
+ */
private static class Loglet {
String name;
String tail;
+
Loglet(String name, String tail) {
this.name = name;
this.tail = tail;
}
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
index 3f1e0d3..fc41e5f 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigImpl.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
+ * 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.admin.internal;
-//import org.apache.geode.admin.DistributedSystemConfig;
-//import org.apache.geode.admin.ManagedEntity;
+// import org.apache.geode.admin.DistributedSystemConfig;
+// import org.apache.geode.admin.ManagedEntity;
import org.apache.geode.admin.ManagedEntityConfig;
import org.apache.geode.internal.admin.GemFireVM;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -28,15 +26,13 @@ import java.io.File;
import java.net.*;
/**
- * The abstract superclass of objects that configure a managed entity
- * such as a GemFire cache server or a distribution locator.
- * It contains configuration state and behavior common to all managed
+ * The abstract superclass of objects that configure a managed entity such as a GemFire cache server
+ * or a distribution locator. It contains configuration state and behavior common to all managed
* entities.
*
* @since GemFire 4.0
*/
-public abstract class ManagedEntityConfigImpl
- implements ManagedEntityConfig {
+public abstract class ManagedEntityConfigImpl implements ManagedEntityConfig {
/** The name of the host on which the managed entity runs */
private String host;
@@ -50,23 +46,26 @@ public abstract class ManagedEntityConfigImpl
/** Command used to launch locator on remote machine */
private String remoteCommand;
- /** The managed entity configured by this object.
+ /**
+ * The managed entity configured by this object.
*
- * @see #isReadOnly */
+ * @see #isReadOnly
+ */
private InternalManagedEntity entity = null;
- ///////////////////// Static Methods /////////////////////
+ ///////////////////// Static Methods /////////////////////
/**
- * Returns the {@linkplain InetAddress#getCanonicalHostName
- * canonical name} of the local machine.
+ * Returns the {@linkplain InetAddress#getCanonicalHostName canonical name} of the local machine.
*/
protected static String getLocalHostName() {
try {
return SocketCreator.getLocalHost().getCanonicalHostName();
} catch (UnknownHostException ex) {
- IllegalStateException ex2 = new IllegalStateException(LocalizedStrings.ManagedEntityConfigImpl_COULD_NOT_DETERMINE_LOCALHOST.toLocalizedString());
+ IllegalStateException ex2 = new IllegalStateException(
+ LocalizedStrings.ManagedEntityConfigImpl_COULD_NOT_DETERMINE_LOCALHOST
+ .toLocalizedString());
ex2.initCause(ex);
throw ex2;
}
@@ -81,14 +80,14 @@ public abstract class ManagedEntityConfigImpl
}
/**
- * Returns the location of the GemFire product installation. This
- * is determined by finding the location of the gemfire jar
- * and working backwards.
+ * Returns the location of the GemFire product installation. This is determined by finding the
+ * location of the gemfire jar and working backwards.
*/
private static File getGemFireInstallation() {
URL url = GemFireVersion.getJarURL();
if (url == null) {
- throw new IllegalStateException(LocalizedStrings.ManagedEntityConfigImpl_COULD_NOT_FIND_GEMFIREJAR.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.ManagedEntityConfigImpl_COULD_NOT_FIND_GEMFIREJAR.toLocalizedString());
}
File gemfireJar = new File(url.getPath());
@@ -98,24 +97,21 @@ public abstract class ManagedEntityConfigImpl
return product;
}
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
- * Creates a <code>ManagedEntityConfigImpl</code> with the default
- * configuration.
+ * Creates a <code>ManagedEntityConfigImpl</code> with the default configuration.
*/
protected ManagedEntityConfigImpl() {
this.host = getLocalHostName();
- this.workingDirectory =
- getCurrentWorkingDirectory().getAbsolutePath();
- this.productDirectory =
- getGemFireInstallation().getAbsolutePath();
- this.remoteCommand = null; // Delegate to AdminDistributedSystem
+ this.workingDirectory = getCurrentWorkingDirectory().getAbsolutePath();
+ this.productDirectory = getGemFireInstallation().getAbsolutePath();
+ this.remoteCommand = null; // Delegate to AdminDistributedSystem
}
/**
- * Creates a new <code>ManagedEntityConfigImpl</code> based on the
- * configuration of a running <code>GemFireVM</code>
+ * Creates a new <code>ManagedEntityConfigImpl</code> based on the configuration of a running
+ * <code>GemFireVM</code>
*/
protected ManagedEntityConfigImpl(GemFireVM vm) {
this.host = SocketCreator.getHostName(vm.getHost());
@@ -125,9 +121,8 @@ public abstract class ManagedEntityConfigImpl
}
/**
- * A copy constructor that creates a new
- * <code>ManagedEntityConfigImpl</code> with the same configuration
- * as another <code>ManagedEntityConfig</code>.
+ * A copy constructor that creates a new <code>ManagedEntityConfigImpl</code> with the same
+ * configuration as another <code>ManagedEntityConfig</code>.
*/
protected ManagedEntityConfigImpl(ManagedEntityConfig other) {
this.host = other.getHost();
@@ -136,32 +131,33 @@ public abstract class ManagedEntityConfigImpl
this.remoteCommand = other.getRemoteCommand();
}
- //////////////////// Instance Methods ////////////////////
+ //////////////////// Instance Methods ////////////////////
/**
- * Checks to see if this config object is "read only". If it is,
- * then an {@link IllegalStateException} is thrown. It should be
- * called by every setter method.
+ * Checks to see if this config object is "read only". If it is, then an
+ * {@link IllegalStateException} is thrown. It should be called by every setter method.
*
* @see #isReadOnly
*/
public void checkReadOnly() {
if (this.isReadOnly()) {
- throw new IllegalStateException(LocalizedStrings.ManagedEntityConfigImpl_THIS_CONFIGURATION_CANNOT_BE_MODIFIED_WHILE_ITS_MANAGED_ENTITY_IS_RUNNING.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.ManagedEntityConfigImpl_THIS_CONFIGURATION_CANNOT_BE_MODIFIED_WHILE_ITS_MANAGED_ENTITY_IS_RUNNING
+ .toLocalizedString());
}
}
/**
- * Returns whether or not this <code>ManagedEntityConfigImpl</code>
- * is read-only (can be modified).
+ * Returns whether or not this <code>ManagedEntityConfigImpl</code> is read-only (can be
+ * modified).
*/
protected boolean isReadOnly() {
return this.entity != null && this.entity.isRunning();
}
/**
- * Sets the entity that is configured by this config object. Once
- * the entity is running, the config object cannot be modified.
+ * Sets the entity that is configured by this config object. Once the entity is running, the
+ * config object cannot be modified.
*
* @see #checkReadOnly
*/
@@ -170,8 +166,7 @@ public abstract class ManagedEntityConfigImpl
}
/**
- * Notifies any configuration listeners that this configuration has
- * changed.
+ * Notifies any configuration listeners that this configuration has changed.
*/
protected abstract void configChanged();
@@ -219,12 +214,12 @@ public abstract class ManagedEntityConfigImpl
/**
* Validates this configuration.
*
- * @throws IllegalStateException
- * If this config is not valid
+ * @throws IllegalStateException If this config is not valid
*/
public void validate() {
if (InetAddressUtil.validateHost(this.host) == null) {
- throw new IllegalStateException(LocalizedStrings.ManagedEntityConfigImpl_INVALID_HOST_0.toLocalizedString(this.host));
+ throw new IllegalStateException(
+ LocalizedStrings.ManagedEntityConfigImpl_INVALID_HOST_0.toLocalizedString(this.host));
}
}
@@ -232,8 +227,7 @@ public abstract class ManagedEntityConfigImpl
public Object clone() throws CloneNotSupportedException {
// Since all fields are immutable objects, no deep cloning is
// necessary.
- ManagedEntityConfigImpl clone =
- (ManagedEntityConfigImpl) super.clone();
+ ManagedEntityConfigImpl clone = (ManagedEntityConfigImpl) super.clone();
clone.entity = null;
return clone;
}
@@ -246,7 +240,7 @@ public abstract class ManagedEntityConfigImpl
StringBuffer sb = new StringBuffer();
sb.append(className);
-
+
sb.append(" host=");
sb.append(this.getHost());
sb.append(" workingDirectory=");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
index 6313e21..4e5198e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXml.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -24,29 +22,26 @@ import org.xml.sax.*;
import java.io.InputStream;
/**
- * The abstract superclass of classes that convert XML into a {@link
- * org.apache.geode.admin.DistributedSystemConfig} and vice versa.
- * It provides helper methods and constants.
+ * The abstract superclass of classes that convert XML into a
+ * {@link org.apache.geode.admin.DistributedSystemConfig} and vice versa. It provides helper methods
+ * and constants.
*
* @since GemFire 4.0
*/
abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
/** The location of the DTD file */
- protected static final String DTD_LOCATION =
- "/org/apache/geode/admin/doc-files/ds5_0.dtd";
+ protected static final String DTD_LOCATION = "/org/apache/geode/admin/doc-files/ds5_0.dtd";
/** The URL for the DTD */
- protected static final String SYSTEM_ID =
- "http://www.gemstone.com/dtd/ds5_0.dtd";
+ protected static final String SYSTEM_ID = "http://www.gemstone.com/dtd/ds5_0.dtd";
/** The public ID for the DTD */
- protected static final String PUBLIC_ID =
- "-//GemStone Systems, Inc.//GemFire Distributed System 5.0//EN";
+ protected static final String PUBLIC_ID =
+ "-//GemStone Systems, Inc.//GemFire Distributed System 5.0//EN";
/** The name of the <code>distributed-system</code> element. */
- public static final String DISTRIBUTED_SYSTEM =
- "distributed-system";
+ public static final String DISTRIBUTED_SYSTEM = "distributed-system";
/** The name of the <code>id</code> attribute. */
public static final String ID = "id";
@@ -97,46 +92,48 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
public static final String PROPERTY = "property";
/** Name of the <code>authentication-required</code> attribute */
- public static final String AUTHENTICATION_REQUIRED =
- "authentication-required";
+ public static final String AUTHENTICATION_REQUIRED = "authentication-required";
/** The name of the <code>key</code> element */
public static final String KEY = "key";
/** The name of the <code>value</code> element */
public static final String VALUE = "value";
-
+
/** The name of the <code>classpath</code> element */
public static final String CLASSPATH = "classpath";
- /////////////////////// Instance Methods ///////////////////////
+ /////////////////////// Instance Methods ///////////////////////
/**
- * Given a public id, attempt to resolve it to a DTD. Returns an
- * <code>InputSoure</code> for the DTD.
+ * Given a public id, attempt to resolve it to a DTD. Returns an <code>InputSoure</code> for the
+ * DTD.
*/
- public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException {
+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
if (publicId == null || systemId == null) {
- throw new SAXException(LocalizedStrings.ManagedEntityConfigXml_PUBLIC_ID_0_SYSTEM_ID_1.toLocalizedString(new Object[] {publicId, systemId}));
+ throw new SAXException(LocalizedStrings.ManagedEntityConfigXml_PUBLIC_ID_0_SYSTEM_ID_1
+ .toLocalizedString(new Object[] {publicId, systemId}));
}
// Figure out the location for the publicId.
String location = DTD_LOCATION;
InputSource result;
-// if (location != null) (cannot be null)
+ // if (location != null) (cannot be null)
{
InputStream stream = ClassPathLoader.getLatest().getResourceAsStream(getClass(), location);
if (stream != null) {
result = new InputSource(stream);
} else {
- throw new SAXNotRecognizedException(LocalizedStrings.ManagedEntityConfigXml_DTD_NOT_FOUND_0.toLocalizedString(location));
+ throw new SAXNotRecognizedException(
+ LocalizedStrings.ManagedEntityConfigXml_DTD_NOT_FOUND_0.toLocalizedString(location));
}
-// } else {
-// throw new SAXNotRecognizedException(LocalizedStrings.ManagedEntityConfigXml_COULD_NOT_FIND_DTD_FOR_0_1.toLocalizedString(new Object[] {publicId, systemId}));
+ // } else {
+ // throw new
+ // SAXNotRecognizedException(LocalizedStrings.ManagedEntityConfigXml_COULD_NOT_FIND_DTD_FOR_0_1.toLocalizedString(new
+ // Object[] {publicId, systemId}));
}
return result;
@@ -145,7 +142,7 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
/**
* Warnings are ignored
*/
- public void warning(SAXParseException ex) throws SAXException {
+ public void warning(SAXParseException ex) throws SAXException {
}
@@ -153,16 +150,18 @@ abstract class ManagedEntityConfigXml implements EntityResolver, ErrorHandler {
* Throws a {@link org.apache.geode.cache.CacheXmlException}
*/
public void error(SAXParseException ex) throws SAXException {
- IllegalArgumentException ex2 = new IllegalArgumentException(LocalizedStrings.ManagedEntityConfigXml_ERROR_WHILE_PARSING_XML.toLocalizedString());
+ IllegalArgumentException ex2 = new IllegalArgumentException(
+ LocalizedStrings.ManagedEntityConfigXml_ERROR_WHILE_PARSING_XML.toLocalizedString());
ex2.initCause(ex);
throw ex2;
}
-
+
/**
* Throws a {@link org.apache.geode.cache.CacheXmlException}
*/
public void fatalError(SAXParseException ex) throws SAXException {
- IllegalArgumentException ex2 = new IllegalArgumentException(LocalizedStrings.ManagedEntityConfigXml_FATAL_ERROR_WHILE_PARSING_XML.toLocalizedString());
+ IllegalArgumentException ex2 = new IllegalArgumentException(
+ LocalizedStrings.ManagedEntityConfigXml_FATAL_ERROR_WHILE_PARSING_XML.toLocalizedString());
ex2.initCause(ex);
throw ex2;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
index 80f183d..80732cc 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlGenerator.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -20,61 +18,57 @@ import org.apache.geode.admin.*;
import org.apache.geode.internal.Assert;
import org.apache.geode.internal.i18n.LocalizedStrings;
-import javax.xml.transform.*;
-//import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.*;
+// import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
import org.xml.sax.*;
-//import org.xml.sax.ext.*;
-import org.xml.sax.helpers.AttributesImpl;
+// import org.xml.sax.ext.*;
+import org.xml.sax.helpers.AttributesImpl;
import java.io.*;
import java.util.*;
/**
* Generates XML data that represents the managed entities in an
- * <code>AdminDistributedSystem</code>. This class is used mainly for
- * testing.
+ * <code>AdminDistributedSystem</code>. This class is used mainly for testing.
*
* @since GemFire 4.0
*/
-public class ManagedEntityConfigXmlGenerator
- extends ManagedEntityConfigXml implements XMLReader {
+public class ManagedEntityConfigXmlGenerator extends ManagedEntityConfigXml implements XMLReader {
/** An empty <code>Attributes</code> */
private static Attributes EMPTY = new AttributesImpl();
- ///////////////////////// Instance Fields ////////////////////////
+ ///////////////////////// Instance Fields ////////////////////////
- /** The <code>AdminDistributedSystem</code> for which we are
- * generating XML */
+ /**
+ * The <code>AdminDistributedSystem</code> for which we are generating XML
+ */
private AdminDistributedSystem system;
/** The content handler to which SAX events are generated */
private ContentHandler handler;
- ///////////////////////// Static Methods ////////////////////////
+ ///////////////////////// Static Methods ////////////////////////
/**
- * Generates an XML representation of all of the managed entities in
- * the given <code>AdminDistributedSystem</code>.
+ * Generates an XML representation of all of the managed entities in the given
+ * <code>AdminDistributedSystem</code>.
*/
- public static void generate(AdminDistributedSystem system,
- PrintWriter pw) {
+ public static void generate(AdminDistributedSystem system, PrintWriter pw) {
(new ManagedEntityConfigXmlGenerator(system)).generate(pw);
}
- ///////////////////////// Constructors //////////////////////////
+ ///////////////////////// Constructors //////////////////////////
/**
- * Creates a new generator for the given
- * <code>AdminDistributedSystem</code>.
+ * Creates a new generator for the given <code>AdminDistributedSystem</code>.
*/
- private ManagedEntityConfigXmlGenerator(AdminDistributedSystem
- system) {
+ private ManagedEntityConfigXmlGenerator(AdminDistributedSystem system) {
this.system = system;
}
- /////////////////////// Instance Methods ///////////////////////
+ /////////////////////// Instance Methods ///////////////////////
/**
* Generates XML and writes it to the given <code>PrintWriter</code>
@@ -97,16 +91,17 @@ public class ManagedEntityConfigXmlGenerator
pw.flush();
} catch (Exception ex) {
- RuntimeException ex2 = new RuntimeException(LocalizedStrings.ManagedEntityConfigXmlGenerator_EXCEPTION_THROWN_WHILE_GENERATING_XML.toLocalizedString());
+ RuntimeException ex2 = new RuntimeException(
+ LocalizedStrings.ManagedEntityConfigXmlGenerator_EXCEPTION_THROWN_WHILE_GENERATING_XML
+ .toLocalizedString());
ex2.initCause(ex);
throw ex2;
}
}
/**
- * Called by the transformer to parse the "input source". We ignore
- * the input source and, instead, generate SAX events to the {@link
- * #setContentHandler ContentHandler}.
+ * Called by the transformer to parse the "input source". We ignore the input source and, instead,
+ * generate SAX events to the {@link #setContentHandler ContentHandler}.
*/
public void parse(InputSource input) throws SAXException {
Assert.assertTrue(this.handler != null);
@@ -115,8 +110,7 @@ public class ManagedEntityConfigXmlGenerator
AttributesImpl atts = new AttributesImpl();
- atts.addAttribute("", "", ID, "",
- String.valueOf(this.system.getConfig().getSystemId()));
+ atts.addAttribute("", "", ID, "", String.valueOf(this.system.getConfig().getSystemId()));
handler.startElement("", DISTRIBUTED_SYSTEM, DISTRIBUTED_SYSTEM, atts);
@@ -128,7 +122,10 @@ public class ManagedEntityConfigXmlGenerator
generateCacheServers();
} catch (AdminException ex) {
- throw new SAXException(LocalizedStrings.ManagedEntityConfigXmlGenerator_AN_ADMINEXCEPTION_WAS_THROWN_WHILE_GENERATING_XML.toLocalizedString(), ex);
+ throw new SAXException(
+ LocalizedStrings.ManagedEntityConfigXmlGenerator_AN_ADMINEXCEPTION_WAS_THROWN_WHILE_GENERATING_XML
+ .toLocalizedString(),
+ ex);
}
handler.endElement("", DISTRIBUTED_SYSTEM, DISTRIBUTED_SYSTEM);
@@ -143,8 +140,7 @@ public class ManagedEntityConfigXmlGenerator
handler.startElement("", REMOTE_COMMAND, REMOTE_COMMAND, EMPTY);
- handler.characters(remoteCommand.toCharArray(), 0,
- remoteCommand.length());
+ handler.characters(remoteCommand.toCharArray(), 0, remoteCommand.length());
handler.endElement("", REMOTE_COMMAND, REMOTE_COMMAND);
}
@@ -156,7 +152,7 @@ public class ManagedEntityConfigXmlGenerator
handler.startElement("", LOCATORS, LOCATORS, EMPTY);
generateLocators();
-
+
handler.endElement("", LOCATORS, LOCATORS);
}
@@ -164,8 +160,7 @@ public class ManagedEntityConfigXmlGenerator
* Generates XML for the distributed system's locators
*/
private void generateLocators() throws SAXException {
- DistributionLocator[] locators =
- this.system.getDistributionLocators();
+ DistributionLocator[] locators = this.system.getDistributionLocators();
for (int i = 0; i < locators.length; i++) {
generateLocator(locators[i].getConfig());
}
@@ -174,12 +169,10 @@ public class ManagedEntityConfigXmlGenerator
/**
* Generates XML for a locator
*/
- private void generateLocator(DistributionLocatorConfig config)
- throws SAXException {
-
+ private void generateLocator(DistributionLocatorConfig config) throws SAXException {
+
AttributesImpl atts = new AttributesImpl();
- atts.addAttribute("", "", PORT, "",
- String.valueOf(config.getPort()));
+ atts.addAttribute("", "", PORT, "", String.valueOf(config.getPort()));
handler.startElement("", LOCATOR, LOCATOR, atts);
@@ -191,8 +184,7 @@ public class ManagedEntityConfigXmlGenerator
/**
* Generates XML for attributes common to all managed entities.
*/
- private void generateEntityConfig(ManagedEntityConfig config)
- throws SAXException {
+ private void generateEntityConfig(ManagedEntityConfig config) throws SAXException {
String host = config.getHost();
if (host != null) {
@@ -204,31 +196,27 @@ public class ManagedEntityConfigXmlGenerator
String remoteCommand = config.getRemoteCommand();
if (remoteCommand != null) {
handler.startElement("", REMOTE_COMMAND, REMOTE_COMMAND, EMPTY);
- handler.characters(remoteCommand.toCharArray(), 0,
- remoteCommand.length());
+ handler.characters(remoteCommand.toCharArray(), 0, remoteCommand.length());
handler.endElement("", REMOTE_COMMAND, REMOTE_COMMAND);
}
String workingDirectory = config.getWorkingDirectory();
if (workingDirectory != null) {
handler.startElement("", WORKING_DIRECTORY, WORKING_DIRECTORY, EMPTY);
- handler.characters(workingDirectory.toCharArray(), 0,
- workingDirectory.length());
+ handler.characters(workingDirectory.toCharArray(), 0, workingDirectory.length());
handler.endElement("", WORKING_DIRECTORY, WORKING_DIRECTORY);
}
String productDirectory = config.getProductDirectory();
if (productDirectory != null) {
handler.startElement("", PRODUCT_DIRECTORY, PRODUCT_DIRECTORY, EMPTY);
- handler.characters(productDirectory.toCharArray(), 0,
- productDirectory.length());
+ handler.characters(productDirectory.toCharArray(), 0, productDirectory.length());
handler.endElement("", PRODUCT_DIRECTORY, PRODUCT_DIRECTORY);
}
}
/**
- * Generates XML for the SSL configuration of the distributed
- * system.
+ * Generates XML for the SSL configuration of the distributed system.
*/
private void generateSSL() throws SAXException {
DistributedSystemConfig config = this.system.getConfig();
@@ -240,33 +228,30 @@ public class ManagedEntityConfigXmlGenerator
AttributesImpl atts = new AttributesImpl();
atts.addAttribute("", "", AUTHENTICATION_REQUIRED, "",
- String.valueOf(config.isSSLAuthenticationRequired()));
+ String.valueOf(config.isSSLAuthenticationRequired()));
handler.startElement("", SSL, SSL, atts);
String protocols = config.getSSLProtocols();
if (protocols != null) {
handler.startElement("", PROTOCOLS, PROTOCOLS, EMPTY);
- handler.characters(protocols.toCharArray(), 0,
- protocols.length());
+ handler.characters(protocols.toCharArray(), 0, protocols.length());
handler.endElement("", PROTOCOLS, PROTOCOLS);
}
String ciphers = config.getSSLCiphers();
if (ciphers != null) {
handler.startElement("", CIPHERS, CIPHERS, EMPTY);
- handler.characters(ciphers.toCharArray(), 0,
- ciphers.length());
+ handler.characters(ciphers.toCharArray(), 0, ciphers.length());
handler.endElement("", CIPHERS, CIPHERS);
}
Properties sslProps = config.getSSLProperties();
- for (Iterator iter = sslProps.entrySet().iterator();
- iter.hasNext(); ) {
+ for (Iterator iter = sslProps.entrySet().iterator(); iter.hasNext();) {
Map.Entry entry = (Map.Entry) iter.next();
String key = (String) entry.getKey();
String value = (String) entry.getValue();
-
+
handler.startElement("", PROPERTY, PROPERTY, EMPTY);
handler.startElement("", KEY, KEY, EMPTY);
@@ -284,11 +269,9 @@ public class ManagedEntityConfigXmlGenerator
}
/**
- * Generates an XML representation of the
- * <code>CacheServer</code>s in the distributed system.
+ * Generates an XML representation of the <code>CacheServer</code>s in the distributed system.
*/
- private void generateCacheServers()
- throws SAXException, AdminException {
+ private void generateCacheServers() throws SAXException, AdminException {
CacheServer[] servers = this.system.getCacheServers();
for (int i = 0; i < servers.length; i++) {
@@ -297,11 +280,9 @@ public class ManagedEntityConfigXmlGenerator
}
/**
- * Generates an XML representation of a
- * <code>CacheServerConfig</code>.
+ * Generates an XML representation of a <code>CacheServerConfig</code>.
*/
- private void generateCacheServer(CacheServerConfig config)
- throws SAXException {
+ private void generateCacheServer(CacheServerConfig config) throws SAXException {
handler.startElement("", CACHE_SERVER, CACHE_SERVER, EMPTY);
@@ -310,8 +291,7 @@ public class ManagedEntityConfigXmlGenerator
String classpath = config.getClassPath();
if (classpath != null) {
handler.startElement("", CLASSPATH, CLASSPATH, EMPTY);
- handler.characters(classpath.toCharArray(), 0,
- classpath.length());
+ handler.characters(classpath.toCharArray(), 0, classpath.length());
handler.endElement("", CLASSPATH, CLASSPATH);
}
@@ -323,36 +303,36 @@ public class ManagedEntityConfigXmlGenerator
*/
public void setContentHandler(ContentHandler handler) {
this.handler = handler;
- }
+ }
public ContentHandler getContentHandler() {
return this.handler;
- }
+ }
public ErrorHandler getErrorHandler() {
return this;
}
- ////////// Inherited methods that don't do anything //////////
+ ////////// Inherited methods that don't do anything //////////
public boolean getFeature(String name)
- throws SAXNotRecognizedException, SAXNotSupportedException {
+ throws SAXNotRecognizedException, SAXNotSupportedException {
return false;
}
public void setFeature(String name, boolean value)
- throws SAXNotRecognizedException, SAXNotSupportedException {
+ throws SAXNotRecognizedException, SAXNotSupportedException {
}
public Object getProperty(String name)
- throws SAXNotRecognizedException, SAXNotSupportedException {
+ throws SAXNotRecognizedException, SAXNotSupportedException {
return null;
}
public void setProperty(String name, Object value)
- throws SAXNotRecognizedException, SAXNotSupportedException {
+ throws SAXNotRecognizedException, SAXNotSupportedException {
}
@@ -363,7 +343,7 @@ public class ManagedEntityConfigXmlGenerator
public EntityResolver getEntityResolver() {
return this;
}
-
+
public void setDTDHandler(DTDHandler handler) {
}
@@ -376,8 +356,7 @@ public class ManagedEntityConfigXmlGenerator
}
- public void parse(String systemId)
- throws IOException, SAXException {
+ public void parse(String systemId) throws IOException, SAXException {
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
index 1065caf..29b81f4 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityConfigXmlParser.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -28,13 +26,11 @@ import java.io.*;
import java.util.*;
/**
- * Parses an XML file and configures a {@link DistributedSystemConfig}
- * from it.
+ * Parses an XML file and configures a {@link DistributedSystemConfig} from it.
*
* @since GemFire 4.0
*/
-public class ManagedEntityConfigXmlParser
- extends ManagedEntityConfigXml implements ContentHandler {
+public class ManagedEntityConfigXmlParser extends ManagedEntityConfigXml implements ContentHandler {
/** The <code>DistributedSystemConfig</code> to be configured */
private DistributedSystemConfig config;
@@ -42,19 +38,15 @@ public class ManagedEntityConfigXmlParser
/** The stack of intermediate values used while parsing */
private Stack stack = new Stack();
- ////////////////////// Static Methods //////////////////////
+ ////////////////////// Static Methods //////////////////////
/**
- * Parses XML data and from it configures a
- * <code>DistributedSystemConfig</code>.
+ * Parses XML data and from it configures a <code>DistributedSystemConfig</code>.
*
- * @throws AdminXmlException
- * If an error is encountered while parsing the XML
+ * @throws AdminXmlException If an error is encountered while parsing the XML
*/
- public static void parse(InputStream is,
- DistributedSystemConfig config) {
- ManagedEntityConfigXmlParser handler =
- new ManagedEntityConfigXmlParser();
+ public static void parse(InputStream is, DistributedSystemConfig config) {
+ ManagedEntityConfigXmlParser handler = new ManagedEntityConfigXmlParser();
handler.config = config;
try {
@@ -72,7 +64,7 @@ public class ManagedEntityConfigXmlParser
} else if (ex instanceof SAXException) {
// Silly JDK 1.4.2 XML parser wraps RunTime exceptions in a
- // SAXException. Pshaw!
+ // SAXException. Pshaw!
SAXException sax = (SAXException) ex;
Exception cause = sax.getException();
@@ -81,34 +73,35 @@ public class ManagedEntityConfigXmlParser
}
}
- throw new AdminXmlException(LocalizedStrings.ManagedEntityConfigXmlParser_WHILE_PARSING_XML.toLocalizedString(), ex);
+ throw new AdminXmlException(
+ LocalizedStrings.ManagedEntityConfigXmlParser_WHILE_PARSING_XML.toLocalizedString(), ex);
}
}
/**
* Helper method for parsing an integer
*
- * @throws org.apache.geode.cache.CacheXmlException
- * If <code>s</code> is a malformed integer
+ * @throws org.apache.geode.cache.CacheXmlException If <code>s</code> is a malformed integer
*/
private static int parseInt(String s) {
try {
return Integer.parseInt(s);
} catch (NumberFormatException ex) {
- throw new AdminXmlException(LocalizedStrings.ManagedEntityConfigXmlParser_MALFORMED_INTEGER_0.toLocalizedString(s), ex);
+ throw new AdminXmlException(
+ LocalizedStrings.ManagedEntityConfigXmlParser_MALFORMED_INTEGER_0.toLocalizedString(s),
+ ex);
}
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
-// if (this.system.isMcastEnabled()) {
-// generateMulticast();
-// }
+ // if (this.system.isMcastEnabled()) {
+ // generateMulticast();
+ // }
- public void startElement(String namespaceURI, String localName,
- String qName, Attributes atts)
- throws SAXException {
+ public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
+ throws SAXException {
if (qName.equals(DISTRIBUTED_SYSTEM)) {
startDistributedSystem(atts);
@@ -118,7 +111,7 @@ public class ManagedEntityConfigXmlParser
} else if (qName.equals(LOCATORS)) {
startLocators(atts);
-
+
} else if (qName.equals(MULTICAST)) {
startMulticast(atts);
@@ -159,13 +152,13 @@ public class ManagedEntityConfigXmlParser
startClassPath(atts);
} else {
- throw new AdminXmlException(LocalizedStrings.ManagedEntityConfigXmlParser_UNKNOWN_XML_ELEMENT_0.toLocalizedString(qName));
+ throw new AdminXmlException(
+ LocalizedStrings.ManagedEntityConfigXmlParser_UNKNOWN_XML_ELEMENT_0
+ .toLocalizedString(qName));
}
}
- public void endElement(String namespaceURI, String localName,
- String qName)
- throws SAXException {
+ public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
if (qName.equals(DISTRIBUTED_SYSTEM)) {
endDistributedSystem();
@@ -216,13 +209,15 @@ public class ManagedEntityConfigXmlParser
endClassPath();
} else {
- throw new AdminXmlException(LocalizedStrings.ManagedEntityConfigXmlParser_UNKNOWN_XML_ELEMENT_0.toLocalizedString(qName));
+ throw new AdminXmlException(
+ LocalizedStrings.ManagedEntityConfigXmlParser_UNKNOWN_XML_ELEMENT_0
+ .toLocalizedString(qName));
}
}
/**
- * When a <code>distributed-system</code> element is encountered, we
- * push the <code>DistributedSystemConfig</code> on the stack.
+ * When a <code>distributed-system</code> element is encountered, we push the
+ * <code>DistributedSystemConfig</code> on the stack.
*/
private void startDistributedSystem(Attributes atts) {
Assert.assertTrue(stack.isEmpty());
@@ -231,7 +226,7 @@ public class ManagedEntityConfigXmlParser
if (id != null) {
this.config.setSystemId(id);
}
-
+
String disable_tcp = atts.getValue(DISABLE_TCP);
if (disable_tcp != null) {
this.config.setDisableTcp(DISABLE_TCP.equalsIgnoreCase("true"));
@@ -244,17 +239,16 @@ public class ManagedEntityConfigXmlParser
* When a <code>distributed-system</code> element is finished
*/
private void endDistributedSystem() {
-
+
}
/**
* When a <code>multicast</code> is first encountered, get the
- * <code>DistributedSystemConfig</code> off of the top of the stack
- * and set its multicast config appropriately.
+ * <code>DistributedSystemConfig</code> off of the top of the stack and set its multicast config
+ * appropriately.
*/
private void startMulticast(Attributes atts) {
- DistributedSystemConfig config =
- (DistributedSystemConfig) stack.peek();
+ DistributedSystemConfig config = (DistributedSystemConfig) stack.peek();
String port = atts.getValue(PORT);
config.setMcastPort(parseInt(port));
@@ -270,19 +264,17 @@ public class ManagedEntityConfigXmlParser
}
/**
- * Starts a <code>remote-command</code> element. The item on top of
- * the stack may be a <code>DistributedSystemConfig</code> or it
- * might be a <code>ManagedEntityConfig</code>.
+ * Starts a <code>remote-command</code> element. The item on top of the stack may be a
+ * <code>DistributedSystemConfig</code> or it might be a <code>ManagedEntityConfig</code>.
*/
private void startRemoteCommand(Attributes atts) {
}
/**
- * Ends a <code>remote-command</code> element. Pop the command off
- * the top of the stack and set it on the
- * <code>DistributedSystemConfig</code> or it might be a
- * <code>ManagedEntityConfig</code> on top of the stack.
+ * Ends a <code>remote-command</code> element. Pop the command off the top of the stack and set it
+ * on the <code>DistributedSystemConfig</code> or it might be a <code>ManagedEntityConfig</code>
+ * on top of the stack.
*/
private void endRemoteCommand() {
String remoteCommand = popString();
@@ -296,8 +288,7 @@ public class ManagedEntityConfigXmlParser
((ManagedEntityConfig) top).setRemoteCommand(remoteCommand);
} else {
- String s = "Did not expect a " + top.getClass().getName() +
- " on top of the stack";
+ String s = "Did not expect a " + top.getClass().getName() + " on top of the stack";
Assert.assertTrue(false, s);
}
}
@@ -313,13 +304,11 @@ public class ManagedEntityConfigXmlParser
private void startLocator(Attributes atts) {
String port = atts.getValue(PORT);
- DistributedSystemConfig system =
- (DistributedSystemConfig) stack.peek();
+ DistributedSystemConfig system = (DistributedSystemConfig) stack.peek();
system.setMcastPort(0);
- DistributionLocatorConfig config =
- system.createDistributionLocatorConfig();
-
+ DistributionLocatorConfig config = system.createDistributionLocatorConfig();
+
config.setPort(parseInt(port));
stack.push(config);
@@ -335,8 +324,7 @@ public class ManagedEntityConfigXmlParser
}
/**
- * We assume that there is a <code>ManagedEntityConfig</code> on top
- * of the stack.
+ * We assume that there is a <code>ManagedEntityConfig</code> on top of the stack.
*/
private void endHost() {
String host = popString();
@@ -365,12 +353,10 @@ public class ManagedEntityConfigXmlParser
}
private void startSSL(Attributes atts) {
- DistributedSystemConfig config =
- (DistributedSystemConfig) stack.peek();
+ DistributedSystemConfig config = (DistributedSystemConfig) stack.peek();
config.setSSLEnabled(true);
- String authenticationRequired =
- atts.getValue(AUTHENTICATION_REQUIRED);
+ String authenticationRequired = atts.getValue(AUTHENTICATION_REQUIRED);
config.setSSLAuthenticationRequired(Boolean.valueOf(authenticationRequired).booleanValue());
}
@@ -384,8 +370,7 @@ public class ManagedEntityConfigXmlParser
private void endProtocols() {
String protocols = popString();
- DistributedSystemConfig config =
- (DistributedSystemConfig) stack.peek();
+ DistributedSystemConfig config = (DistributedSystemConfig) stack.peek();
config.setSSLProtocols(protocols);
}
@@ -395,8 +380,7 @@ public class ManagedEntityConfigXmlParser
private void endCiphers() {
String ciphers = popString();
- DistributedSystemConfig config =
- (DistributedSystemConfig) stack.peek();
+ DistributedSystemConfig config = (DistributedSystemConfig) stack.peek();
config.setSSLCiphers(ciphers);
}
@@ -407,8 +391,7 @@ public class ManagedEntityConfigXmlParser
private void endProperty() {
String value = popString();
String key = popString();
- DistributedSystemConfig config =
- (DistributedSystemConfig) stack.peek();
+ DistributedSystemConfig config = (DistributedSystemConfig) stack.peek();
config.addSSLProperty(key, value);
}
@@ -431,10 +414,8 @@ public class ManagedEntityConfigXmlParser
}
private void startCacheServer(Attributes atts) {
- DistributedSystemConfig config =
- (DistributedSystemConfig) stack.peek();
- CacheServerConfig server =
- config.createCacheServerConfig();
+ DistributedSystemConfig config = (DistributedSystemConfig) stack.peek();
+ CacheServerConfig server = config.createCacheServerConfig();
stack.push(server);
}
@@ -468,13 +449,10 @@ public class ManagedEntityConfigXmlParser
}
/**
- * Long strings in XML files may generate multiple
- * <code>characters</code> callbacks. Coalesce multiple callbacks
- * into one big string by using a <code>StringBuffer</code>. See
- * bug 32122.
+ * Long strings in XML files may generate multiple <code>characters</code> callbacks. Coalesce
+ * multiple callbacks into one big string by using a <code>StringBuffer</code>. See bug 32122.
*/
- public void characters(char[] ch, int start, int length)
- throws SAXException {
+ public void characters(char[] ch, int start, int length) throws SAXException {
Object top = stack.peek();
@@ -490,44 +468,39 @@ public class ManagedEntityConfigXmlParser
sb.append(ch, start, length);
}
- ////////// Inherited methods that don't do anything //////////
+ ////////// Inherited methods that don't do anything //////////
- public void setDocumentLocator(Locator locator) { }
+ public void setDocumentLocator(Locator locator) {}
- public void startDocument() throws SAXException { }
+ public void startDocument() throws SAXException {}
- public void endDocument() throws SAXException { }
+ public void endDocument() throws SAXException {}
- public void startPrefixMapping(String prefix, String uri)
- throws SAXException { }
+ public void startPrefixMapping(String prefix, String uri) throws SAXException {}
- public void endPrefixMapping(String prefix)
- throws SAXException { }
+ public void endPrefixMapping(String prefix) throws SAXException {}
- public void ignorableWhitespace(char[] ch, int start, int length)
- throws SAXException { }
+ public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {}
- public void processingInstruction(String target, String data)
- throws SAXException { }
+ public void processingInstruction(String target, String data) throws SAXException {}
- public void skippedEntity(String name) throws SAXException { }
+ public void skippedEntity(String name) throws SAXException {}
- /////////////////////// Inner Classes ///////////////////////
+ /////////////////////// Inner Classes ///////////////////////
/**
- * Class that delegates all of the methods of a {@link
- * DefaultHandler} to a {@link ManagedEntityConfigXmlParser} that
- * implements all of the methods of <code>DefaultHandler</code>, but
- * <B>is not</B> a <code>DefaultHandler</code>.
+ * Class that delegates all of the methods of a {@link DefaultHandler} to a
+ * {@link ManagedEntityConfigXmlParser} that implements all of the methods of
+ * <code>DefaultHandler</code>, but <B>is not</B> a <code>DefaultHandler</code>.
*/
static class DefaultHandlerDelegate extends DefaultHandler {
- /** The <code>ManagedEntityConfigXmlParser</code> that does the
- * real work */
+ /**
+ * The <code>ManagedEntityConfigXmlParser</code> that does the real work
+ */
private ManagedEntityConfigXmlParser handler;
/**
- * Creates a new <code>DefaultHandlerDelegate</code> that
- * delegates to the given
+ * Creates a new <code>DefaultHandlerDelegate</code> that delegates to the given
* <code>ManagedEntityConfigXmlParser</code>.
*/
public DefaultHandlerDelegate(ManagedEntityConfigXmlParser handler) {
@@ -535,9 +508,7 @@ public class ManagedEntityConfigXmlParser
}
@Override
- public InputSource resolveEntity(String publicId,
- String systemId)
- throws SAXException {
+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
return handler.resolveEntity(publicId, systemId);
}
@@ -557,8 +528,7 @@ public class ManagedEntityConfigXmlParser
}
@Override
- public void startPrefixMapping(String prefix, String uri)
- throws SAXException {
+ public void startPrefixMapping(String prefix, String uri) throws SAXException {
handler.startPrefixMapping(prefix, uri);
}
@@ -568,33 +538,28 @@ public class ManagedEntityConfigXmlParser
}
@Override
- public void startElement(String uri, String localName,
- String qName, Attributes attributes)
- throws SAXException {
+ public void startElement(String uri, String localName, String qName, Attributes attributes)
+ throws SAXException {
handler.startElement(uri, localName, qName, attributes);
}
@Override
- public void endElement(String uri, String localName, String qName)
- throws SAXException {
+ public void endElement(String uri, String localName, String qName) throws SAXException {
handler.endElement(uri, localName, qName);
}
@Override
- public void characters(char[] ch, int start, int length)
- throws SAXException {
+ public void characters(char[] ch, int start, int length) throws SAXException {
handler.characters(ch, start, length);
}
@Override
- public void ignorableWhitespace(char[] ch, int start, int length)
- throws SAXException {
+ public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
handler.ignorableWhitespace(ch, start, length);
}
@Override
- public void processingInstruction(String target, String data)
- throws SAXException {
+ public void processingInstruction(String target, String data) throws SAXException {
handler.processingInstruction(target, data);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
index c1a3fd1..77a3998 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityController.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -21,8 +19,7 @@ import org.apache.geode.admin.ManagedEntity;
import org.apache.geode.admin.ManagedEntityConfig;
/**
- * Defines the actual administration (starting, stopping, etc.) of
- * GemFire {@link ManagedEntity}s.
+ * Defines the actual administration (starting, stopping, etc.) of GemFire {@link ManagedEntity}s.
*
*/
interface ManagedEntityController {
@@ -40,34 +37,30 @@ interface ManagedEntityController {
* Returns whether or not a managed entity is running
*/
public boolean isRunning(InternalManagedEntity entity);
-
+
/**
- * Returns the contents of a locator's log file. Other APIs are
- * used to get the log file of managed entities that are also system
- * members.
+ * Returns the contents of a locator's log file. Other APIs are used to get the log file of
+ * managed entities that are also system members.
*/
public String getLog(DistributionLocatorImpl locator);
-
+
/**
- * Returns the full path to the executable in
- * <code>$GEMFIRE/bin</code> taking into account the {@linkplain
- * ManagedEntityConfig#getProductDirectory product directory} and the
- * platform's file separator.
+ * Returns the full path to the executable in <code>$GEMFIRE/bin</code> taking into account the
+ * {@linkplain ManagedEntityConfig#getProductDirectory product directory} and the platform's file
+ * separator.
*
* <P>
*
- * Note: we should probably do a better job of determine whether or
- * not the machine on which the entity runs is Windows or Linux.
+ * Note: we should probably do a better job of determine whether or not the machine on which the
+ * entity runs is Windows or Linux.
*
- * @param executable
- * The name of the executable that resides in
- * <code>$GEMFIRE/bin</code>.
+ * @param executable The name of the executable that resides in <code>$GEMFIRE/bin</code>.
*/
public String getProductExecutable(InternalManagedEntity entity, String executable);
-
+
/**
- * Builds optional SSL command-line arguments. Returns null if SSL is not
- * enabled for the distributed system.
+ * Builds optional SSL command-line arguments. Returns null if SSL is not enabled for the
+ * distributed system.
*/
public String buildSSLArguments(DistributedSystemConfig config);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityControllerFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityControllerFactory.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityControllerFactory.java
index 372b2ed..faa67c5 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityControllerFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedEntityControllerFactory.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -25,22 +23,26 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogMarker;
/**
- * Creates ManagedEntityController for administration (starting, stopping, etc.)
- * of GemFire {@link ManagedEntity}s.
+ * Creates ManagedEntityController for administration (starting, stopping, etc.) of GemFire
+ * {@link ManagedEntity}s.
*
*/
public class ManagedEntityControllerFactory {
private static final Logger logger = LogService.getLogger();
-
- private static final String ENABLED_MANAGED_ENTITY_CONTROLLER_CLASS_NAME = "org.apache.geode.admin.internal.EnabledManagedEntityController";
-
- static ManagedEntityController createManagedEntityController(final AdminDistributedSystem system) {
+
+ private static final String ENABLED_MANAGED_ENTITY_CONTROLLER_CLASS_NAME =
+ "org.apache.geode.admin.internal.EnabledManagedEntityController";
+
+ static ManagedEntityController createManagedEntityController(
+ final AdminDistributedSystem system) {
if (isEnabledManagedEntityController()) {
- logger.info(LogMarker.CONFIG, "Local and remote OS command invocations are enabled for the Admin API.");
+ logger.info(LogMarker.CONFIG,
+ "Local and remote OS command invocations are enabled for the Admin API.");
return createEnabledManagedEntityController(system);
} else {
- logger.info(LogMarker.CONFIG, "Local and remote OS command invocations are disabled for the Admin API.");
+ logger.info(LogMarker.CONFIG,
+ "Local and remote OS command invocations are disabled for the Admin API.");
return new DisabledManagedEntityController();
}
}
@@ -53,8 +55,9 @@ public class ManagedEntityControllerFactory {
return false;
}
}
-
- private static ManagedEntityController createEnabledManagedEntityController(final AdminDistributedSystem system) {
+
+ private static ManagedEntityController createEnabledManagedEntityController(
+ final AdminDistributedSystem system) {
return new EnabledManagedEntityController(system);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedSystemMemberImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedSystemMemberImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedSystemMemberImpl.java
index f6ca2cc..02e7ae4 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedSystemMemberImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/ManagedSystemMemberImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -24,50 +22,44 @@ import org.apache.geode.internal.admin.GemFireVM;
import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
/**
- * A <code>SystemMember</code> that is also managed (or manageable) by
- * the admin API.
+ * A <code>SystemMember</code> that is also managed (or manageable) by the admin API.
*
- * This class must be public so that its methods can be invoked
- * reflectively (for MBean operations) on instances of its
- * subclasses.
+ * This class must be public so that its methods can be invoked reflectively (for MBean operations)
+ * on instances of its subclasses.
*
* @since GemFire 4.0
*/
public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
- implements InternalManagedEntity {
+ implements InternalManagedEntity {
/** Controller for starting and stopping local or remote managers */
protected ManagedEntityController controller;
-
+
/** The state of this managed entity (see bug 32455) */
private int state = UNKNOWN;
/** A lock that is obtained while this entity's state changes */
private final Object stateChange = new Object();
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
- * Creates a new <code>ManagedSystemMemberImpl</code> that
- * represents an existing member of an
+ * Creates a new <code>ManagedSystemMemberImpl</code> that represents an existing member of an
* <code>AdminDistributedSystem</code>.
*/
- protected ManagedSystemMemberImpl(AdminDistributedSystemImpl system,
- GemFireVM vm)
- throws AdminException {
+ protected ManagedSystemMemberImpl(AdminDistributedSystemImpl system, GemFireVM vm)
+ throws AdminException {
super(system, vm);
this.controller = system.getEntityController();
}
/**
- * Creates a new <code>ManagedSystemMemberImpl</code> that
- * represents a non-existing member with the given
- * <code>ManagedEntityConfig</code> that has not yet been started.
+ * Creates a new <code>ManagedSystemMemberImpl</code> that represents a non-existing member with
+ * the given <code>ManagedEntityConfig</code> that has not yet been started.
*/
- protected ManagedSystemMemberImpl(AdminDistributedSystemImpl system,
- ManagedEntityConfig config)
- throws AdminException {
+ protected ManagedSystemMemberImpl(AdminDistributedSystemImpl system, ManagedEntityConfig config)
+ throws AdminException {
super(system);
this.internalId = null;
@@ -77,7 +69,7 @@ public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
this.controller = system.getEntityController();
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
public String getWorkingDirectory() {
return this.getEntityConfig().getWorkingDirectory();
@@ -107,24 +99,23 @@ public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
int oldState = this.state;
this.state = state;
return oldState;
-
+
} else {
synchronized (this.stateChange) {
int oldState = this.state;
this.state = state;
this.stateChange.notifyAll();
-
+
return oldState;
}
}
}
/**
- * Returns whether or not this managed system member needs to be
- * stopped. If this member is stopped or is stopping, then it does
- * not need to be stopped. Otherwise, it will atomically place this
- * member in the {@link #STOPPING} state. See bug 32455.
+ * Returns whether or not this managed system member needs to be stopped. If this member is
+ * stopped or is stopping, then it does not need to be stopped. Otherwise, it will atomically
+ * place this member in the {@link #STOPPING} state. See bug 32455.
*/
protected boolean needToStop() {
synchronized (this.stateChange) {
@@ -139,11 +130,9 @@ public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
}
/**
- * Returns whether or not this managed system member needs to be
- * started. If this member is started or is starting, then it
- * does not need to be started. Otherwise, it will atomically
- * place this member in the {@link #STARTING} state. See bug
- * 32455.
+ * Returns whether or not this managed system member needs to be started. If this member is
+ * started or is starting, then it does not need to be started. Otherwise, it will atomically
+ * place this member in the {@link #STARTING} state. See bug 32455.
*/
protected boolean needToStart() {
synchronized (this.stateChange) {
@@ -158,8 +147,8 @@ public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
}
/**
- * Sets the state of this managed system member depending on whether
- * or not <code>vm</code> is <code>null</code>.
+ * Sets the state of this managed system member depending on whether or not <code>vm</code> is
+ * <code>null</code>.
*/
@Override
void setGemFireVM(GemFireVM vm) throws AdminException {
@@ -175,11 +164,11 @@ public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
/**
* Waits until this system member's "state" is {@link #RUNNING}.
*/
- public boolean waitToStart(long timeout)
- throws InterruptedException {
+ public boolean waitToStart(long timeout) throws InterruptedException {
+
+ if (Thread.interrupted())
+ throw new InterruptedException();
- if (Thread.interrupted()) throw new InterruptedException();
-
long start = System.currentTimeMillis();
while (System.currentTimeMillis() - start < timeout) {
synchronized (this.stateChange) {
@@ -200,10 +189,10 @@ public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
/**
* Waits until this system member's "state" is {@link #STOPPED}.
*/
- public boolean waitToStop(long timeout)
- throws InterruptedException {
+ public boolean waitToStop(long timeout) throws InterruptedException {
- if (Thread.interrupted()) throw new InterruptedException();
+ if (Thread.interrupted())
+ throw new InterruptedException();
long start = System.currentTimeMillis();
while (System.currentTimeMillis() - start < timeout) {
synchronized (this.stateChange) {
@@ -222,9 +211,8 @@ public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
}
/**
- * Appends configuration information to a <code>StringBuffer</code>
- * that contains a command line. Handles certain configuration
- * parameters specially.
+ * Appends configuration information to a <code>StringBuffer</code> that contains a command line.
+ * Handles certain configuration parameters specially.
*/
protected void appendConfiguration(StringBuffer sb) {
ConfigurationParameter[] params = this.getConfiguration();
@@ -241,15 +229,14 @@ public abstract class ManagedSystemMemberImpl extends SystemMemberImpl
if (value != null && !value.equals("")) {
if (name.equals(LOCATORS)) {
// Use the new locator syntax so that is plays nicely with
- // rsh. See bug 32306.
+ // rsh. See bug 32306.
String locator = value;
int firstBracket = locator.indexOf('[');
int lastBracket = locator.indexOf(']');
if (firstBracket > -1 && lastBracket > -1) {
String host = locator.substring(0, firstBracket);
- String port =
- locator.substring(firstBracket + 1, lastBracket);
+ String port = locator.substring(firstBracket + 1, lastBracket);
locator = host + ":" + port;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthConfigImpl.java
index e58e975..f250fee 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthConfigImpl.java
@@ -1,65 +1,65 @@
/*
- * 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
+ * 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.admin.internal;
import org.apache.geode.admin.*;
// @todo Make this class (and all of its subclasses) {@link java.io.Externalizable} or
-// {@link org.apache.geode.DataSerializable}.
+// {@link org.apache.geode.DataSerializable}.
/**
* The implementation of <code>MemberHealthConfig</code>
*
*
* @since GemFire 3.5
*/
-public abstract class MemberHealthConfigImpl
- implements MemberHealthConfig, java.io.Serializable {
+public abstract class MemberHealthConfigImpl implements MemberHealthConfig, java.io.Serializable {
private static final long serialVersionUID = 3966032573073580490L;
-
- /** The maximum process size (in megabytes) of a healthy member of
- * the distributed system. */
+
+ /**
+ * The maximum process size (in megabytes) of a healthy member of the distributed system.
+ */
private long maxVMProcessSize = DEFAULT_MAX_VM_PROCESS_SIZE;
- /** The maximum number of enqueued incoming or outgoing
- * messages that a healthy member of a distributed system can
- * have. */
+ /**
+ * The maximum number of enqueued incoming or outgoing messages that a healthy member of a
+ * distributed system can have.
+ */
private long maxMessageQueueSize = DEFAULT_MAX_MESSAGE_QUEUE_SIZE;
- /** The maximum number message replies that can timeout in a healthy
- * member. */
+ /**
+ * The maximum number message replies that can timeout in a healthy member.
+ */
private long maxReplyTimeouts = DEFAULT_MAX_REPLY_TIMEOUTS;
- /** The maximum multicast retransmit / multicast message count ratio
+ /**
+ * The maximum multicast retransmit / multicast message count ratio
*/
private double maxRetransmissionRatio = DEFAULT_MAX_RETRANSMISSION_RATIO;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>MemberHealthConfigImpl</code> with the
- * default configuration.
+ * Creates a new <code>MemberHealthConfigImpl</code> with the default configuration.
*/
MemberHealthConfigImpl() {
}
- ///////////////////// Instance Methods //////////////////////
+ ///////////////////// Instance Methods //////////////////////
public long getMaxVMProcessSize() {
return this.maxVMProcessSize;
[24/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
index aba79d2..59fce55 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -54,22 +52,21 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
/**
* Represents a GemFire distributed system for remote administration/management.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
-public class AdminDistributedSystemImpl
-implements org.apache.geode.admin.AdminDistributedSystem,
- org.apache.geode.internal.admin.JoinLeaveListener,
- org.apache.geode.internal.admin.AlertListener,
- org.apache.geode.distributed.internal.InternalDistributedSystem.DisconnectListener {
+public class AdminDistributedSystemImpl implements org.apache.geode.admin.AdminDistributedSystem,
+ org.apache.geode.internal.admin.JoinLeaveListener,
+ org.apache.geode.internal.admin.AlertListener,
+ org.apache.geode.distributed.internal.InternalDistributedSystem.DisconnectListener {
private static final Logger logger = LogService.getLogger();
-
+
/** String identity of this distributed system */
private String id;
-
+
/** Latest alert broadcast by any system members */
private Alert latestAlert;
-
+
// -------------------------------------------------------------------------
/** Internal admin agent to delegate low-level work to */
@@ -80,7 +77,7 @@ implements org.apache.geode.admin.AdminDistributedSystem,
/** Set of non-Manager members in this system */
private final Set applicationSet = new HashSet();
-
+
/** Set of DistributionLocators for this system */
private final Set locatorSet = new HashSet();
@@ -89,70 +86,69 @@ implements org.apache.geode.admin.AdminDistributedSystem,
/** Configuration defining this distributed system */
private final DistributedSystemConfigImpl config;
-
+
/** Controller for starting and stopping managed entities */
private ManagedEntityController controller;
-
+
/** Log file collator for gathering and merging system member logs */
private LogCollator logCollator = new LogCollator();
-
- /** The level above which alerts will be delivered to the alert
- * listeners */
+
+ /**
+ * The level above which alerts will be delivered to the alert listeners
+ */
private AlertLevel alertLevel = AlertLevel.WARNING;
/** The alert listeners registered on this distributed system. */
private volatile Set<AlertListener> alertListeners = Collections.emptySet();
private final Object alertLock = new Object();
-
+
private LogWriterAppender logWriterAppender;
-
+
private InternalLogWriter logWriter;
-
+
/** The membership listeners registered on this distributed system */
private volatile Set membershipListeners = Collections.EMPTY_SET;
private final Object membershipLock = new Object();
-
+
/* The region listeners registered on this distributed system */
- //for feature requests #32887
+ // for feature requests #32887
private volatile List cacheListeners = Collections.EMPTY_LIST;
private final Object cacheListLock = new Object();
-
- /**
- * reference to AdminDistributedSystemImpl instance
- * for feature requests #32887.
+
+ /**
+ * reference to AdminDistributedSystemImpl instance for feature requests #32887.
* <p>
* Guarded by {@link #CONNECTION_SYNC}.
* <p>
- * TODO: reimplement this change and SystemMemberCacheEventProcessor to avoid
- * using this static. SystemMemberCacheEvents should only be sent to Admin
- * VMs that express interest.
+ * TODO: reimplement this change and SystemMemberCacheEventProcessor to avoid using this static.
+ * SystemMemberCacheEvents should only be sent to Admin VMs that express interest.
* <p>
- * This is volatile to allow SystemFailure to deliver fatal poison-pill
- * to thisAdminDS without waiting on synchronization.
+ * This is volatile to allow SystemFailure to deliver fatal poison-pill to thisAdminDS without
+ * waiting on synchronization.
*
* @guarded.By CONNECTION_SYNC
*/
private static volatile AdminDistributedSystemImpl thisAdminDS;
/**
- * Provides synchronization for {@link #connect()} and {@link #disconnect()}.
- * {@link #thisAdminDS} is also now protected by CONNECTION_SYNC and has its
- * lifecycle properly tied to connect/disconnect.
+ * Provides synchronization for {@link #connect()} and {@link #disconnect()}. {@link #thisAdminDS}
+ * is also now protected by CONNECTION_SYNC and has its lifecycle properly tied to
+ * connect/disconnect.
*/
private static final Object CONNECTION_SYNC = new Object();
-
-
+
+
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
-
- /**
+
+ /**
* Constructs new DistributedSystemImpl with the given configuration.
*
- * @param config configuration defining this distributed system
+ * @param config configuration defining this distributed system
*/
public AdminDistributedSystemImpl(DistributedSystemConfigImpl config) {
-
+
// init from config...
this.config = config;
@@ -160,24 +156,27 @@ implements org.apache.geode.admin.AdminDistributedSystem,
if (systemId != null && systemId.length() > 0) {
this.id = systemId;
- } if (this.getLocators() != null && this.getLocators().length() > 0) {
+ }
+ if (this.getLocators() != null && this.getLocators().length() > 0) {
this.id = this.getLocators();
} else {
- this.id = new StringBuffer(this.getMcastAddress()).append("[").append(
- this.getMcastPort()).append("]").toString();
+ this.id = new StringBuffer(this.getMcastAddress()).append("[").append(this.getMcastPort())
+ .append("]").toString();
}
// LOG: create LogWriterAppender unless one already exists
- this.logWriterAppender = LogWriterAppenders.getOrCreateAppender(LogWriterAppenders.Identifier.MAIN, false, this.config.createLogConfig(), false);
-
+ this.logWriterAppender = LogWriterAppenders.getOrCreateAppender(
+ LogWriterAppenders.Identifier.MAIN, false, this.config.createLogConfig(), false);
+
// LOG: look in DistributedSystemConfigImpl for existing LogWriter to use
InternalLogWriter existingLogWriter = this.config.getInternalLogWriter();
if (existingLogWriter != null) {
this.logWriter = existingLogWriter;
- } else {
+ } else {
// LOG: create LogWriterLogger
- this.logWriter = LogWriterFactory.createLogWriterLogger(false, false, this.config.createLogConfig(), false);
+ this.logWriter = LogWriterFactory.createLogWriterLogger(false, false,
+ this.config.createLogConfig(), false);
if (!Boolean.getBoolean(InternalLocator.INHIBIT_DM_BANNER)) {
// LOG: changed statement from config to info
this.logWriter.info(Banner.getString(null));
@@ -187,24 +186,23 @@ implements org.apache.geode.admin.AdminDistributedSystem,
// Set this log writer in DistributedSystemConfigImpl
this.config.setInternalLogWriter(this.logWriter);
}
-
+
// set up other details that depend on config attrs...
this.controller = ManagedEntityControllerFactory.createManagedEntityController(this);
initializeDistributionLocators();
initializeCacheServers();
}
-
+
// -------------------------------------------------------------------------
- // Initialization
+ // Initialization
// -------------------------------------------------------------------------
-
+
/**
* Creates DistributionLocator instances for every locator entry in the
* {@link org.apache.geode.admin.DistributedSystemConfig}
*/
private void initializeDistributionLocators() {
- DistributionLocatorConfig[] configs =
- this.config.getDistributionLocatorConfigs();
+ DistributionLocatorConfig[] configs = this.config.getDistributionLocatorConfigs();
if (configs.length == 0) {
// No work to do
return;
@@ -213,39 +211,35 @@ implements org.apache.geode.admin.AdminDistributedSystem,
for (int i = 0; i < configs.length; i++) {
// the Locator impl may vary in this class from the config...
DistributionLocatorConfig conf = configs[i];
- DistributionLocator locator =
- createDistributionLocatorImpl(conf);
+ DistributionLocator locator = createDistributionLocatorImpl(conf);
this.locatorSet.add(new FutureResult(locator));
}
// update locators string...
setLocators(parseLocatorSet());
}
-
+
/**
- * Creates <code>CacheServer</code> instances for every cache server
- * entry in the {@link
- * org.apache.geode.admin.DistributedSystemConfig}
+ * Creates <code>CacheServer</code> instances for every cache server entry in the
+ * {@link org.apache.geode.admin.DistributedSystemConfig}
*/
private void initializeCacheServers() {
- CacheServerConfig[] cacheServerConfigs =
- this.config.getCacheServerConfigs();
+ CacheServerConfig[] cacheServerConfigs = this.config.getCacheServerConfigs();
for (int i = 0; i < cacheServerConfigs.length; i++) {
try {
CacheServerConfig conf = cacheServerConfigs[i];
- CacheServerConfigImpl copy =
- new CacheServerConfigImpl(conf);
+ CacheServerConfigImpl copy = new CacheServerConfigImpl(conf);
this.cacheServerSet.add(new FutureResult(createCacheServer(copy)));
} catch (java.lang.Exception e) {
logger.warn(e.getMessage(), e);
continue;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -259,23 +253,24 @@ implements org.apache.geode.admin.AdminDistributedSystem,
/**
* Checks to make sure that {@link #connect()} has been called.
*
- * @throws IllegalStateException
- * If {@link #connect()} has not been called.
+ * @throws IllegalStateException If {@link #connect()} has not been called.
*/
private void checkConnectCalled() {
if (this.gfManagerAgent == null) {
- throw new IllegalStateException(LocalizedStrings.AdminDistributedSystemImpl_CONNECT_HAS_NOT_BEEN_INVOKED_ON_THIS_ADMINDISTRIBUTEDSYSTEM.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.AdminDistributedSystemImpl_CONNECT_HAS_NOT_BEEN_INVOKED_ON_THIS_ADMINDISTRIBUTEDSYSTEM
+ .toLocalizedString());
}
}
// -------------------------------------------------------------------------
- // Attributes of this DistributedSystem
+ // Attributes of this DistributedSystem
// -------------------------------------------------------------------------
-
+
public GfManagerAgent getGfManagerAgent() {
return this.gfManagerAgent;
}
-
+
public boolean isConnected() {
return this.gfManagerAgent != null && this.gfManagerAgent.isConnected();
}
@@ -283,11 +278,11 @@ implements org.apache.geode.admin.AdminDistributedSystem,
public String getId() {
return this.id;
}
-
+
public String getName() {
String name = this.config.getSystemName();
if (name != null && name.length() > 0) {
- return name;
+ return name;
} else {
return getId();
@@ -334,7 +329,7 @@ implements org.apache.geode.admin.AdminDistributedSystem,
return this.alertListeners.size();
}
}
-
+
public void removeAlertListener(AlertListener listener) {
synchronized (this.alertLock) {
Set<AlertListener> oldListeners = this.alertListeners;
@@ -377,11 +372,11 @@ implements org.apache.geode.admin.AdminDistributedSystem,
public int getMcastPort() {
return this.config.getMcastPort();
}
-
+
public boolean getDisableTcp() {
return this.config.getDisableTcp();
}
-
+
public boolean getDisableAutoReconnect() {
return this.config.getDisableAutoReconnect();
}
@@ -389,20 +384,20 @@ implements org.apache.geode.admin.AdminDistributedSystem,
public String getLocators() {
return this.config.getLocators();
}
-
+
protected void setLocators(String locators) {
this.config.setLocators(locators);
}
-
+
public String getMembershipPortRange() {
return this.getConfig().getMembershipPortRange();
}
-
+
/** get the direct-channel port to use, or zero if not set */
public int getTcpPort() {
return this.getConfig().getTcpPort();
}
-
+
public void setTcpPort(int port) {
this.getConfig().setTcpPort(port);
}
@@ -414,39 +409,40 @@ implements org.apache.geode.admin.AdminDistributedSystem,
public DistributedSystemConfig getConfig() {
return this.config;
}
-
+
/**
* Returns true if any members of this system are currently running.
*/
public boolean isRunning() {
- if (this.gfManagerAgent == null) return false;
+ if (this.gfManagerAgent == null)
+ return false;
// is there a better way??
// this.gfManagerAgent.isConnected() ... this.gfManagerAgent.isListening()
-
- if (isAnyMemberRunning()) return true;
+
+ if (isAnyMemberRunning())
+ return true;
return false;
}
-
+
/** Returns true if this system can use multicast for communications */
public boolean isMcastEnabled() {
- return this.getMcastPort() > 0 ;
+ return this.getMcastPort() > 0;
}
-
+
ManagedEntityController getEntityController() {
return this.controller;
}
-
- static private final String TIMEOUT_MS_NAME
- = "AdminDistributedSystemImpl.TIMEOUT_MS";
+
+ static private final String TIMEOUT_MS_NAME = "AdminDistributedSystemImpl.TIMEOUT_MS";
static private final int TIMEOUT_MS_DEFAULT = 60000; // 30000 -- see bug36470
- static private final int TIMEOUT_MS
- = Integer.getInteger(TIMEOUT_MS_NAME, TIMEOUT_MS_DEFAULT).intValue();
-
+ static private final int TIMEOUT_MS =
+ Integer.getInteger(TIMEOUT_MS_NAME, TIMEOUT_MS_DEFAULT).intValue();
+
// -------------------------------------------------------------------------
- // Operations of this DistributedSystem
+ // Operations of this DistributedSystem
// -------------------------------------------------------------------------
-
+
/**
* Starts all managed entities in this system.
*/
@@ -459,12 +455,17 @@ implements org.apache.geode.admin.AdminDistributedSystem,
for (int i = 0; i < locs.length; i++) {
try {
if (!locs[i].waitToStart(TIMEOUT_MS)) {
- throw new AdminException(LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_START_AFTER_1_MS.toLocalizedString(new Object[] {locs[i], Integer.valueOf(TIMEOUT_MS)}));
+ throw new AdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_START_AFTER_1_MS
+ .toLocalizedString(new Object[] {locs[i], Integer.valueOf(TIMEOUT_MS)}));
}
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
- throw new AdminException(LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_START.toLocalizedString(locs[i]), ex);
+ throw new AdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_START
+ .toLocalizedString(locs[i]),
+ ex);
}
}
@@ -475,23 +476,28 @@ implements org.apache.geode.admin.AdminDistributedSystem,
for (int i = 0; i < servers.length; i++) {
try {
if (!servers[i].waitToStart(TIMEOUT_MS)) {
- throw new AdminException(LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_START_AFTER_1_MS.toLocalizedString(new Object[] {servers[i], Integer.valueOf(TIMEOUT_MS)}));
+ throw new AdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_START_AFTER_1_MS
+ .toLocalizedString(new Object[] {servers[i], Integer.valueOf(TIMEOUT_MS)}));
}
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
- throw new AdminException(LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_START.toLocalizedString(servers[i]), ex);
+ throw new AdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_START
+ .toLocalizedString(servers[i]),
+ ex);
}
}
}
-
+
/**
* Stops all GemFire managers that are members of this system.
*/
public void stop() throws AdminException {
// Stop cache server before GemFire managers because the cache
// server might host a cache proxy that is dependent on the
- // manager. See bug 32569.
+ // manager. See bug 32569.
// Wait for each managed entity to stop (see bug 32569)
long timeout = 30;
@@ -503,12 +509,17 @@ implements org.apache.geode.admin.AdminDistributedSystem,
for (int i = 0; i < servers.length; i++) {
try {
if (!servers[i].waitToStop(timeout * 1000)) {
- throw new AdminException(LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_STOP_AFTER_1_SECONDS.toLocalizedString(new Object[] {servers[i], Long.valueOf(timeout)}));
+ throw new AdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_STOP_AFTER_1_SECONDS
+ .toLocalizedString(new Object[] {servers[i], Long.valueOf(timeout)}));
}
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
- throw new AdminException(LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_STOP.toLocalizedString(servers[i]), ex);
+ throw new AdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_STOP
+ .toLocalizedString(servers[i]),
+ ex);
}
}
@@ -519,24 +530,29 @@ implements org.apache.geode.admin.AdminDistributedSystem,
for (int i = 0; i < locs.length; i++) {
try {
if (!locs[i].waitToStop(timeout * 1000)) {
- throw new AdminException(LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_STOP_AFTER_1_SECONDS.toLocalizedString(new Object[] {locs[i], Long.valueOf(timeout)}));
+ throw new AdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_0_DID_NOT_STOP_AFTER_1_SECONDS
+ .toLocalizedString(new Object[] {locs[i], Long.valueOf(timeout)}));
}
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
- throw new AdminException(LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_STOP.toLocalizedString(locs[i]), ex);
+ throw new AdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED_WHILE_WAITING_FOR_0_TO_STOP
+ .toLocalizedString(locs[i]),
+ ex);
}
}
}
-
+
/** Display merged system member logs */
public String displayMergedLogs() {
return this.logCollator.collateLogs(this.gfManagerAgent);
}
- /**
- * Returns the license for this GemFire product; else null if unable to
- * retrieve license information
+ /**
+ * Returns the license for this GemFire product; else null if unable to retrieve license
+ * information
*
* @return license for this GemFire product
*/
@@ -550,38 +566,28 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
/**
- * Sets the distribution-related portion of the given managed entity's
- * configuration so that the entity is part of this distributed system.
+ * Sets the distribution-related portion of the given managed entity's configuration so that the
+ * entity is part of this distributed system.
*
- * @throws AdminException
- * TODO-javadocs
+ * @throws AdminException TODO-javadocs
*/
- private void setDistributionParameters(SystemMember member)
- throws AdminException {
+ private void setDistributionParameters(SystemMember member) throws AdminException {
Assert.assertTrue(member instanceof ManagedSystemMemberImpl);
// set some config parms to match this system...
ConfigurationParameter[] configParms = new ConfigurationParameter[] {
- new ConfigurationParameterImpl(
- MCAST_PORT,
- Integer.valueOf(this.config.getMcastPort())),
- new ConfigurationParameterImpl(
- LOCATORS,
- this.config.getLocators()),
- new ConfigurationParameterImpl(
- MCAST_ADDRESS,
+ new ConfigurationParameterImpl(MCAST_PORT, Integer.valueOf(this.config.getMcastPort())),
+ new ConfigurationParameterImpl(LOCATORS, this.config.getLocators()),
+ new ConfigurationParameterImpl(MCAST_ADDRESS,
InetAddressUtil.toInetAddress(this.config.getMcastAddress())),
- new ConfigurationParameterImpl(
- DISABLE_TCP,
- Boolean.valueOf(this.config.getDisableTcp()) ),
- };
+ new ConfigurationParameterImpl(DISABLE_TCP, Boolean.valueOf(this.config.getDisableTcp())),};
member.setConfiguration(configParms);
}
/**
- * Handles an <code>ExecutionException</code> by examining its cause
- * and throwing an appropriate runtime exception.
+ * Handles an <code>ExecutionException</code> by examining its cause and throwing an appropriate
+ * runtime exception.
*/
private static void handle(ExecutionException ex) {
Throwable cause = ex.getCause();
@@ -592,16 +598,21 @@ implements org.apache.geode.admin.AdminDistributedSystem,
return;
}
if (cause instanceof CancelException) { // bug 37285
- throw new FutureCancelledException(LocalizedStrings.AdminDistributedSystemImpl_FUTURE_CANCELLED_DUE_TO_SHUTDOWN.toLocalizedString(), ex);
+ throw new FutureCancelledException(
+ LocalizedStrings.AdminDistributedSystemImpl_FUTURE_CANCELLED_DUE_TO_SHUTDOWN
+ .toLocalizedString(),
+ ex);
}
// Don't just throw the cause because the stack trace can be
- // misleading. For instance, the cause might have occurred in a
- // different thread. In addition to the cause, we also want to
+ // misleading. For instance, the cause might have occurred in a
+ // different thread. In addition to the cause, we also want to
// know which code was waiting for the Future.
- throw new RuntimeAdminException(LocalizedStrings.AdminDistributedSystemImpl_WHILE_WAITING_FOR_FUTURE.toLocalizedString(), ex);
+ throw new RuntimeAdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_WHILE_WAITING_FOR_FUTURE.toLocalizedString(),
+ ex);
}
-
+
protected void checkCancellation() {
DM dm = this.getDistributionManager();
// TODO does dm == null mean we're dead?
@@ -609,41 +620,35 @@ implements org.apache.geode.admin.AdminDistributedSystem,
dm.getCancelCriterion().checkCancelInProgress(null);
}
}
+
/**
- * Returns a list of manageable SystemMember instances for each
- * member of this distributed system.
+ * Returns a list of manageable SystemMember instances for each member of this distributed system.
*
* @return array of system members for each non-manager member
*/
- public SystemMember[] getSystemMemberApplications()
- throws org.apache.geode.admin.AdminException {
- synchronized(this.applicationSet) {
+ public SystemMember[] getSystemMemberApplications() throws org.apache.geode.admin.AdminException {
+ synchronized (this.applicationSet) {
Collection coll = new ArrayList(this.applicationSet.size());
- APPS: for (Iterator iter = this.applicationSet.iterator();
- iter.hasNext(); ) {
+ APPS: for (Iterator iter = this.applicationSet.iterator(); iter.hasNext();) {
Future future = (Future) iter.next();
-// this.logger.info("DEBUG: getSystemMemberApplications: " + future);
+ // this.logger.info("DEBUG: getSystemMemberApplications: " + future);
for (;;) {
checkCancellation();
boolean interrupted = Thread.interrupted();
try {
coll.add(future.get());
break;
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
interrupted = true;
continue; // keep trying
- }
- catch (CancellationException ex) {
-// this.logger.info("DEBUG: cancelled: " + future, ex);
+ } catch (CancellationException ex) {
+ // this.logger.info("DEBUG: cancelled: " + future, ex);
continue APPS;
- }
- catch (ExecutionException ex) {
-// this.logger.info("DEBUG: executed: " + future);
+ } catch (ExecutionException ex) {
+ // this.logger.info("DEBUG: executed: " + future);
handle(ex);
continue APPS;
- }
- finally {
+ } finally {
if (interrupted) {
Thread.currentThread().interrupt();
}
@@ -667,7 +672,7 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
return this.latestAlert.toString();
}
-
+
/**
* Connects to the currently configured system.
*/
@@ -676,59 +681,62 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
/**
- * Connects to the currently configured system. This method is
- * public for internal use only (testing, for example).
+ * Connects to the currently configured system. This method is public for internal use only
+ * (testing, for example).
*
* <p>
*
- * See {@link
- * org.apache.geode.distributed.DistributedSystem#connect} for a
- * list of exceptions that may be thrown.
+ * See {@link org.apache.geode.distributed.DistributedSystem#connect} for a list of exceptions
+ * that may be thrown.
*
* @param logWriter the InternalLogWriter to use for any logging
*/
public void connect(InternalLogWriter logWriter) {
synchronized (CONNECTION_SYNC) {
- //Check if the gfManagerAgent is NOT null.
- //If it is already listening, then just return since the connection is already established OR in process.
- //Otherwise cleanup the state of AdminDistributedSystemImpl. This needs to happen automatically.
- if(this.gfManagerAgent != null) {
- if(this.gfManagerAgent.isListening()) {
- if (logger.isDebugEnabled()) {
- logger.debug("The RemoteGfManagerAgent is already listening for this AdminDistributedSystem.");
- }
- return;
- }
- this.disconnect();
+ // Check if the gfManagerAgent is NOT null.
+ // If it is already listening, then just return since the connection is already established OR
+ // in process.
+ // Otherwise cleanup the state of AdminDistributedSystemImpl. This needs to happen
+ // automatically.
+ if (this.gfManagerAgent != null) {
+ if (this.gfManagerAgent.isListening()) {
+ if (logger.isDebugEnabled()) {
+ logger.debug(
+ "The RemoteGfManagerAgent is already listening for this AdminDistributedSystem.");
+ }
+ return;
+ }
+ this.disconnect();
}
-
+
if (thisAdminDS != null) { // TODO: beef up toString and add thisAdminDS
- throw new IllegalStateException(LocalizedStrings.AdminDistributedSystemImpl_ONLY_ONE_ADMINDISTRIBUTEDSYSTEM_CONNECTION_CAN_BE_MADE_AT_ONCE.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.AdminDistributedSystemImpl_ONLY_ONE_ADMINDISTRIBUTEDSYSTEM_CONNECTION_CAN_BE_MADE_AT_ONCE
+ .toLocalizedString());
}
-
- thisAdminDS = this; //added for feature requests #32887
-
+
+ thisAdminDS = this; // added for feature requests #32887
+
if (this.getLocators().length() == 0) {
- this.id =
- this.getMcastAddress() + "[" + this.getMcastPort() + "]";
-
+ this.id = this.getMcastAddress() + "[" + this.getMcastPort() + "]";
+
} else {
this.id = this.getLocators();
}
-
+
if (this.config instanceof DistributedSystemConfigImpl) {
((DistributedSystemConfigImpl) this.config).validate();
((DistributedSystemConfigImpl) this.config).setDistributedSystem(this);
}
-
- // LOG: passes the AdminDistributedSystemImpl LogWriterLogger into GfManagerAgentConfig for RemoteGfManagerAgent
- GfManagerAgent agent =
- GfManagerAgentFactory.getManagerAgent(buildAgentConfig(logWriter));
+
+ // LOG: passes the AdminDistributedSystemImpl LogWriterLogger into GfManagerAgentConfig for
+ // RemoteGfManagerAgent
+ GfManagerAgent agent = GfManagerAgentFactory.getManagerAgent(buildAgentConfig(logWriter));
this.gfManagerAgent = agent;
-
+
// sync to prevent bug 33341 Admin API can double-represent system members
- synchronized(this.membershipListenerLock) {
- // build the list of applications...
+ synchronized (this.membershipListenerLock) {
+ // build the list of applications...
ApplicationVM[] apps = this.gfManagerAgent.listApplications();
for (int i = 0; i < apps.length; i++) {
try {
@@ -742,8 +750,7 @@ implements org.apache.geode.admin.AdminDistributedSystem,
// Build admin objects for all locators (see bug 31959)
String locators = this.getLocators();
StringTokenizer st = new StringTokenizer(locators, ",");
- NEXT:
- while(st.hasMoreTokens()) {
+ NEXT: while (st.hasMoreTokens()) {
String locator = st.nextToken();
int first = locator.indexOf("[");
int last = locator.indexOf("]");
@@ -753,9 +760,9 @@ implements org.apache.geode.admin.AdminDistributedSystem,
colidx = host.lastIndexOf(':');
}
String bindAddr = null;
- if (colidx > 0 && colidx < (host.length()-1)) {
+ if (colidx > 0 && colidx < (host.length() - 1)) {
String orig = host;
- bindAddr = host.substring(colidx+1, host.length());
+ bindAddr = host.substring(colidx + 1, host.length());
host = host.substring(0, colidx);
// if the host contains a colon and there's no '@', we probably
// parsed an ipv6 address incorrectly - try again
@@ -763,20 +770,17 @@ implements org.apache.geode.admin.AdminDistributedSystem,
int bindidx = orig.lastIndexOf('@');
if (bindidx >= 0) {
host = orig.substring(0, bindidx);
- bindAddr = orig.substring(bindidx+1);
- }
- else {
+ bindAddr = orig.substring(bindidx + 1);
+ } else {
host = orig;
bindAddr = null;
}
}
}
- int port = Integer.parseInt(locator.substring(first+1, last));
+ int port = Integer.parseInt(locator.substring(first + 1, last));
synchronized (this.locatorSet) {
- LOCATORS:
- for (Iterator iter = this.locatorSet.iterator();
- iter.hasNext(); ) {
+ LOCATORS: for (Iterator iter = this.locatorSet.iterator(); iter.hasNext();) {
Future future = (Future) iter.next();
DistributionLocatorImpl impl = null;
for (;;) {
@@ -785,19 +789,15 @@ implements org.apache.geode.admin.AdminDistributedSystem,
try {
impl = (DistributionLocatorImpl) future.get();
break; // success
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
interrupted = true;
continue; // keep trying
- }
- catch (CancellationException ex) {
+ } catch (CancellationException ex) {
continue LOCATORS;
- }
- catch (ExecutionException ex) {
+ } catch (ExecutionException ex) {
handle(ex);
continue LOCATORS;
- }
- finally {
+ } finally {
if (interrupted) {
Thread.currentThread().interrupt();
}
@@ -807,8 +807,7 @@ implements org.apache.geode.admin.AdminDistributedSystem,
DistributionLocatorConfig conf = impl.getConfig();
InetAddress host1 = InetAddressUtil.toInetAddress(host);
- InetAddress host2 =
- InetAddressUtil.toInetAddress(conf.getHost());
+ InetAddress host2 = InetAddressUtil.toInetAddress(conf.getHost());
if (port == conf.getPort() && host1.equals(host2)) {
// Already have an admin object for this locator
continue NEXT;
@@ -817,18 +816,16 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
// None of the existing locators matches the locator in the
- // string. Contact the locator to get information and create
+ // string. Contact the locator to get information and create
// an admin object for it.
InetAddress bindAddress = null;
if (bindAddr != null) {
bindAddress = InetAddressUtil.toInetAddress(bindAddr);
}
DistributionLocatorConfig conf =
- DistributionLocatorConfigImpl.createConfigFor(host, port,
- bindAddress);
+ DistributionLocatorConfigImpl.createConfigFor(host, port, bindAddress);
if (conf != null) {
- DistributionLocator impl =
- createDistributionLocatorImpl(conf);
+ DistributionLocator impl = createDistributionLocatorImpl(conf);
synchronized (this.locatorSet) {
this.locatorSet.add(new FutureResult(impl));
}
@@ -836,16 +833,15 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
}
}
-
+
/**
- * Polls to determine whether or not the connection to the
- * distributed system has been made.
+ * Polls to determine whether or not the connection to the distributed system has been made.
*/
- public boolean waitToBeConnected(long timeout)
- throws InterruptedException {
+ public boolean waitToBeConnected(long timeout) throws InterruptedException {
+
+ if (Thread.interrupted())
+ throw new InterruptedException();
- if (Thread.interrupted()) throw new InterruptedException();
-
checkConnectCalled();
long start = System.currentTimeMillis();
@@ -861,37 +857,37 @@ implements org.apache.geode.admin.AdminDistributedSystem,
return this.isConnected();
}
- /**
+ /**
* Closes all connections and resources to the connected distributed system.
*
* @see org.apache.geode.distributed.DistributedSystem#disconnect()
*/
public void disconnect() {
synchronized (CONNECTION_SYNC) {
-// if (!isConnected()) {
-// throw new IllegalStateException(this + " is not connected");
-// }
-// Assert.assertTrue(thisAdminDS == this);
+ // if (!isConnected()) {
+ // throw new IllegalStateException(this + " is not connected");
+ // }
+ // Assert.assertTrue(thisAdminDS == this);
if (this.logWriterAppender != null) {
LogWriterAppenders.stop(LogWriterAppenders.Identifier.MAIN);
}
try {
- if (thisAdminDS == this) {
- thisAdminDS = null;
- }
- if (this.gfManagerAgent != null && this.gfManagerAgent.isListening()){
- synchronized (this) {
- if (this.health != null) {
- this.health.close();
+ if (thisAdminDS == this) {
+ thisAdminDS = null;
+ }
+ if (this.gfManagerAgent != null && this.gfManagerAgent.isListening()) {
+ synchronized (this) {
+ if (this.health != null) {
+ this.health.close();
+ }
}
+ this.gfManagerAgent.removeJoinLeaveListener(this);
+ this.gfManagerAgent.disconnect();
+ }
+ this.gfManagerAgent = null;
+ if (this.config instanceof DistributedSystemConfigImpl) {
+ ((DistributedSystemConfigImpl) this.config).setDistributedSystem(null);
}
- this.gfManagerAgent.removeJoinLeaveListener(this);
- this.gfManagerAgent.disconnect();
- }
- this.gfManagerAgent = null;
- if (this.config instanceof DistributedSystemConfigImpl) {
- ((DistributedSystemConfigImpl) this.config).setDistributedSystem(null);
- }
} finally {
if (logWriterAppender != null) {
LogWriterAppenders.destroy(LogWriterAppenders.Identifier.MAIN);
@@ -899,38 +895,35 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
}
}
-
+
/**
- * Returns the DistributionManager this implementation is using to
- * connect to the distributed system.
+ * Returns the DistributionManager this implementation is using to connect to the distributed
+ * system.
*/
public DM getDistributionManager() {
if (this.gfManagerAgent == null) {
return null;
}
return this.gfManagerAgent.getDM();
-
+
}
-
+
/**
- * Returns the internal admin API's agent used for administering
- * this <code>AdminDistributedSystem</code>.
+ * Returns the internal admin API's agent used for administering this
+ * <code>AdminDistributedSystem</code>.
*
* @since GemFire 4.0
*/
public GfManagerAgent getAdminAgent() {
return this.gfManagerAgent;
}
-
+
/**
- * Adds a new, unstarted <code>DistributionLocator</code> to this
- * distributed system.
+ * Adds a new, unstarted <code>DistributionLocator</code> to this distributed system.
*/
public DistributionLocator addDistributionLocator() {
- DistributionLocatorConfig conf =
- new DistributionLocatorConfigImpl();
- DistributionLocator locator =
- createDistributionLocatorImpl(conf);
+ DistributionLocatorConfig conf = new DistributionLocatorConfigImpl();
+ DistributionLocator locator = createDistributionLocatorImpl(conf);
synchronized (this.locatorSet) {
this.locatorSet.add(new FutureResult(locator));
}
@@ -939,12 +932,11 @@ implements org.apache.geode.admin.AdminDistributedSystem,
setLocators(parseLocatorSet());
return locator;
}
-
+
public DistributionLocator[] getDistributionLocators() {
- synchronized(this.locatorSet) {
+ synchronized (this.locatorSet) {
Collection coll = new ArrayList(this.locatorSet.size());
- LOCATORS: for (Iterator iter = this.locatorSet.iterator();
- iter.hasNext();) {
+ LOCATORS: for (Iterator iter = this.locatorSet.iterator(); iter.hasNext();) {
Future future = (Future) iter.next();
for (;;) {
checkCancellation();
@@ -952,19 +944,15 @@ implements org.apache.geode.admin.AdminDistributedSystem,
try {
coll.add(future.get());
break; // success
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
interrupted = true;
continue; // keep trying
- }
- catch (CancellationException ex) {
+ } catch (CancellationException ex) {
continue LOCATORS;
- }
- catch (ExecutionException ex) {
+ } catch (ExecutionException ex) {
handle(ex);
continue LOCATORS;
- }
- finally {
+ } finally {
if (interrupted) {
Thread.currentThread().interrupt();
}
@@ -972,16 +960,14 @@ implements org.apache.geode.admin.AdminDistributedSystem,
} // for
}
- DistributionLocator[] array =
- new DistributionLocator[coll.size()];
+ DistributionLocator[] array = new DistributionLocator[coll.size()];
coll.toArray(array);
return array;
}
}
-
+
/**
- * Updates the locator string that is used to discover members of
- * the distributed system.
+ * Updates the locator string that is used to discover members of the distributed system.
*
* @see #getLocators
*/
@@ -1000,19 +986,15 @@ implements org.apache.geode.admin.AdminDistributedSystem,
try {
locator = (DistributionLocator) future.get();
break; // success
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
interrupted = true;
continue; // keep trying
- }
- catch (CancellationException ex) {
+ } catch (CancellationException ex) {
continue LOCATORS;
- }
- catch (ExecutionException ex) {
+ } catch (ExecutionException ex) {
handle(ex);
continue LOCATORS;
- }
- finally {
+ } finally {
if (interrupted) {
Thread.currentThread().interrupt();
}
@@ -1027,192 +1009,183 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
return sb.toString();
}
-
+
// -------------------------------------------------------------------------
- // Listener callback methods
+ // Listener callback methods
// -------------------------------------------------------------------------
-
+
/** sync to prevent bug 33341 Admin API can double-represent system members */
private final Object membershipListenerLock = new Object();
-
+
// --------- org.apache.geode.internal.admin.JoinLeaveListener ---------
- /**
+ /**
* Listener callback for when a member has joined this DistributedSystem.
* <p>
- * React by adding the SystemMember to this system's
- * internal lists, if they are not already there. Notice that we
- * add a {@link Future} into the list so that the admin object is
- * not initialized while locks are held.
+ * React by adding the SystemMember to this system's internal lists, if they are not already
+ * there. Notice that we add a {@link Future} into the list so that the admin object is not
+ * initialized while locks are held.
*
- * @param source the distributed system that fired nodeJoined
- * @param vm the VM that joined
+ * @param source the distributed system that fired nodeJoined
+ * @param vm the VM that joined
* @see org.apache.geode.internal.admin.JoinLeaveListener#nodeJoined
*/
public void nodeJoined(GfManagerAgent source, final GemFireVM vm) {
// sync to prevent bug 33341 Admin API can double-represent system members
- synchronized(this.membershipListenerLock) {
-// this.logger.info("DEBUG: nodeJoined: " + vm.getId(), new RuntimeException("STACK"));
+ synchronized (this.membershipListenerLock) {
+ // this.logger.info("DEBUG: nodeJoined: " + vm.getId(), new RuntimeException("STACK"));
- // does it already exist?
- SystemMember member = findSystemMember(vm);
-
- // if not then create it...
- if (member == null) {
-// this.logger.info("DEBUG: no existing member: " + vm.getId());
- FutureTask future = null;
- //try {
+ // does it already exist?
+ SystemMember member = findSystemMember(vm);
+
+ // if not then create it...
+ if (member == null) {
+ // this.logger.info("DEBUG: no existing member: " + vm.getId());
+ FutureTask future = null;
+ // try {
if (vm instanceof ApplicationVM) {
final ApplicationVM app = (ApplicationVM) vm;
if (app.isDedicatedCacheServer()) {
synchronized (this.cacheServerSet) {
future = new AdminFutureTask(vm.getId(), new Callable() {
- public Object call() throws Exception {
- logger.info(LogMarker.DM, LocalizedMessage.create(LocalizedStrings.AdminDistributedSystemImpl_ADDING_NEW_CACHESERVER_FOR__0, vm));
- return createCacheServer(app);
- }
- });
-
+ public Object call() throws Exception {
+ logger.info(LogMarker.DM,
+ LocalizedMessage.create(
+ LocalizedStrings.AdminDistributedSystemImpl_ADDING_NEW_CACHESERVER_FOR__0,
+ vm));
+ return createCacheServer(app);
+ }
+ });
+
this.cacheServerSet.add(future);
}
} else {
synchronized (this.applicationSet) {
future = new AdminFutureTask(vm.getId(), new Callable() {
- public Object call() throws Exception {
- logger.info(LogMarker.DM, LocalizedMessage.create(LocalizedStrings.AdminDistributedSystemImpl_ADDING_NEW_APPLICATION_FOR__0, vm));
- return createSystemMember(app);
- }
- });
+ public Object call() throws Exception {
+ logger.info(LogMarker.DM,
+ LocalizedMessage.create(
+ LocalizedStrings.AdminDistributedSystemImpl_ADDING_NEW_APPLICATION_FOR__0,
+ vm));
+ return createSystemMember(app);
+ }
+ });
this.applicationSet.add(future);
}
}
} else {
- Assert.assertTrue(false, "Unknown GemFireVM type: " +
- vm.getClass().getName());
- }
-
-// } catch (AdminException ex) {
-// String s = "Could not create a SystemMember for " + vm;
-// this.logger.warning(s, ex);
-// }
-
- // Wait for the SystemMember to be created. We want to do this
- // outside of the "set" locks.
- future.run();
- for (;;) {
- checkCancellation();
- boolean interrupted = Thread.interrupted();
- try {
- member = (SystemMember) future.get();
- break; // success
- }
- catch (InterruptedException ex) {
- interrupted = true;
- continue; // keep trying
- }
- catch (CancellationException ex) {
-// this.logger.info("DEBUG: run cancelled: " + future, ex);
- return;
- }
- catch (ExecutionException ex) {
-// this.logger.info("DEBUG: run executed: " + future, ex);
- handle(ex);
- return;
+ Assert.assertTrue(false, "Unknown GemFireVM type: " + vm.getClass().getName());
}
- finally {
- if (interrupted) {
- Thread.currentThread().interrupt();
+
+ // } catch (AdminException ex) {
+ // String s = "Could not create a SystemMember for " + vm;
+ // this.logger.warning(s, ex);
+ // }
+
+ // Wait for the SystemMember to be created. We want to do this
+ // outside of the "set" locks.
+ future.run();
+ for (;;) {
+ checkCancellation();
+ boolean interrupted = Thread.interrupted();
+ try {
+ member = (SystemMember) future.get();
+ break; // success
+ } catch (InterruptedException ex) {
+ interrupted = true;
+ continue; // keep trying
+ } catch (CancellationException ex) {
+ // this.logger.info("DEBUG: run cancelled: " + future, ex);
+ return;
+ } catch (ExecutionException ex) {
+ // this.logger.info("DEBUG: run executed: " + future, ex);
+ handle(ex);
+ return;
+ } finally {
+ if (interrupted) {
+ Thread.currentThread().interrupt();
+ }
}
- }
- } // for
+ } // for
- Assert.assertTrue(member != null);
+ Assert.assertTrue(member != null);
- // moved this up into the if that creates a new member to fix bug 34517
- SystemMembershipEvent event = new SystemMembershipEventImpl(member.getDistributedMember());
- for (Iterator iter = this.membershipListeners.iterator();
- iter.hasNext(); ) {
- SystemMembershipListener listener =
- (SystemMembershipListener) iter.next();
- listener.memberJoined(event);
+ // moved this up into the if that creates a new member to fix bug 34517
+ SystemMembershipEvent event = new SystemMembershipEventImpl(member.getDistributedMember());
+ for (Iterator iter = this.membershipListeners.iterator(); iter.hasNext();) {
+ SystemMembershipListener listener = (SystemMembershipListener) iter.next();
+ listener.memberJoined(event);
+ }
+ // } else {
+ // this.logger.info("DEBUG: found existing member: " + member);
}
-// } else {
-// this.logger.info("DEBUG: found existing member: " + member);
- }
}
}
-
- /**
+
+ /**
* Listener callback for when a member of this DistributedSystem has left.
* <p>
* Reacts by removing the member.
*
- * @param source the distributed system that fired nodeCrashed
- * @param vm the VM that left
+ * @param source the distributed system that fired nodeCrashed
+ * @param vm the VM that left
* @see org.apache.geode.internal.admin.JoinLeaveListener#nodeLeft
*/
public void nodeLeft(GfManagerAgent source, GemFireVM vm) {
// sync to prevent bug 33341 Admin API can double-represent system members
- synchronized(this.membershipListenerLock) {
+ synchronized (this.membershipListenerLock) {
// member has left...
- SystemMember member =
- AdminDistributedSystemImpl.this.removeSystemMember(vm.getId());
+ SystemMember member = AdminDistributedSystemImpl.this.removeSystemMember(vm.getId());
if (member == null) {
return; // reinstated this early-out because removal does not fix 39429
}
-
+
// Can't call member.getId() because it is nulled-out when the
// SystemMember is removed.
SystemMembershipEvent event = new SystemMembershipEventImpl(vm.getId());
- for (Iterator iter = this.membershipListeners.iterator();
- iter.hasNext(); ) {
- SystemMembershipListener listener =
- (SystemMembershipListener) iter.next();
+ for (Iterator iter = this.membershipListeners.iterator(); iter.hasNext();) {
+ SystemMembershipListener listener = (SystemMembershipListener) iter.next();
listener.memberLeft(event);
}
}
}
-
- /**
+
+ /**
* Listener callback for when a member of this DistributedSystem has crashed.
* <p>
* Reacts by removing the member.
*
- * @param source the distributed system that fired nodeCrashed
+ * @param source the distributed system that fired nodeCrashed
* @param vm the VM that crashed
* @see org.apache.geode.internal.admin.JoinLeaveListener#nodeCrashed
*/
public void nodeCrashed(GfManagerAgent source, GemFireVM vm) {
// sync to prevent bug 33341 Admin API can double-represent system members
- synchronized(this.membershipListenerLock) {
+ synchronized (this.membershipListenerLock) {
// member has crashed...
- SystemMember member =
- AdminDistributedSystemImpl.this.removeSystemMember(vm.getId());
+ SystemMember member = AdminDistributedSystemImpl.this.removeSystemMember(vm.getId());
if (member == null) {
- // Unknown member crashed. Hmm...
+ // Unknown member crashed. Hmm...
return;
}
// Can't call member.getId() because it is nulled-out when the
// SystemMember is removed.
SystemMembershipEvent event = new SystemMembershipEventImpl(vm.getId());
- for (Iterator iter = this.membershipListeners.iterator();
- iter.hasNext(); ) {
- SystemMembershipListener listener =
- (SystemMembershipListener) iter.next();
+ for (Iterator iter = this.membershipListeners.iterator(); iter.hasNext();) {
+ SystemMembershipListener listener = (SystemMembershipListener) iter.next();
listener.memberCrashed(event);
}
}
}
// ----------- org.apache.geode.internal.admin.AlertListener -----------
- /**
- * Listener callback for when a SystemMember of this DistributedSystem has
- * crashed.
+ /**
+ * Listener callback for when a SystemMember of this DistributedSystem has crashed.
*
- * @param alert the latest alert from the system
+ * @param alert the latest alert from the system
* @see org.apache.geode.internal.admin.AlertListener#alert
*/
public void alert(org.apache.geode.internal.admin.Alert alert) {
@@ -1221,77 +1194,71 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
Alert alert2 = new AlertImpl(alert);
this.latestAlert = alert2;
- for (Iterator<AlertListener> iter = this.alertListeners.iterator();
- iter.hasNext(); ) {
+ for (Iterator<AlertListener> iter = this.alertListeners.iterator(); iter.hasNext();) {
AlertListener listener = iter.next();
listener.alert(alert2);
}
}
-
+
public void onDisconnect(InternalDistributedSystem sys) {
- logger.debug("Calling AdminDistributedSystemImpl#onDisconnect");
- disconnect();
- logger.debug("Completed AdminDistributedSystemImpl#onDisconnect");
+ logger.debug("Calling AdminDistributedSystemImpl#onDisconnect");
+ disconnect();
+ logger.debug("Completed AdminDistributedSystemImpl#onDisconnect");
}
-
+
// -------------------------------------------------------------------------
- // Template methods overriden from superclass...
+ // Template methods overriden from superclass...
// -------------------------------------------------------------------------
-
- protected CacheServer createCacheServer(ApplicationVM member)
- throws AdminException {
+
+ protected CacheServer createCacheServer(ApplicationVM member) throws AdminException {
return new CacheServerImpl(this, member);
}
- protected CacheServer createCacheServer(CacheServerConfigImpl conf)
- throws AdminException {
+ protected CacheServer createCacheServer(CacheServerConfigImpl conf) throws AdminException {
return new CacheServerImpl(this, conf);
}
- /** Override createSystemMember by instantiating SystemMemberImpl
+ /**
+ * Override createSystemMember by instantiating SystemMemberImpl
*
- * @throws AdminException TODO-javadocs
+ * @throws AdminException TODO-javadocs
*/
protected SystemMember createSystemMember(ApplicationVM app)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
return new SystemMemberImpl(this, app);
}
/**
- * Constructs & returns a SystemMember instance using the corresponding
- * InternalDistributedMember object.
+ * Constructs & returns a SystemMember instance using the corresponding InternalDistributedMember
+ * object.
*
- * @param member
- * InternalDistributedMember instance for which a SystemMember
- * instance is to be constructed.
+ * @param member InternalDistributedMember instance for which a SystemMember instance is to be
+ * constructed.
* @return constructed SystemMember instance
- * @throws org.apache.geode.admin.AdminException
- * if construction of SystemMember instance fails
+ * @throws org.apache.geode.admin.AdminException if construction of SystemMember instance fails
* @since GemFire 6.5
*/
protected SystemMember createSystemMember(InternalDistributedMember member)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
return new SystemMemberImpl(this, member);
}
- /**
- * Template-method for creating a new
- * <code>DistributionLocatorImpl</code> instance.
+ /**
+ * Template-method for creating a new <code>DistributionLocatorImpl</code> instance.
*/
- protected DistributionLocatorImpl
- createDistributionLocatorImpl(DistributionLocatorConfig conf) {
+ protected DistributionLocatorImpl createDistributionLocatorImpl(DistributionLocatorConfig conf) {
return new DistributionLocatorImpl(conf, this);
}
-
+
// -------------------------------------------------------------------------
- // Non-public implementation methods... TODO: narrow access levels
+ // Non-public implementation methods... TODO: narrow access levels
// -------------------------------------------------------------------------
// TODO: public void connect(...) could stand to have some internals factored out
-
- /**
+
+ /**
* Returns List of Locators including Locators or Multicast.
*
* @return list of locators or multicast values
@@ -1301,9 +1268,8 @@ implements org.apache.geode.admin.AdminDistributedSystem,
// assumes host[port] format, delimited by ","
List locatorIds = new ArrayList();
if (isMcastEnabled()) {
- String mcastId = new StringBuffer(
- this.getMcastAddress()).append("[").append(
- this.getMcastPort()).append("]").toString();
+ String mcastId = new StringBuffer(this.getMcastAddress()).append("[")
+ .append(this.getMcastPort()).append("]").toString();
locatorIds.add(new DistributionLocatorId(mcastId));
}
StringTokenizer st = new StringTokenizer(this.getLocators(), ",");
@@ -1313,7 +1279,7 @@ implements org.apache.geode.admin.AdminDistributedSystem,
if (logger.isDebugEnabled()) {
StringBuffer sb = new StringBuffer("Locator set is: ");
- for (Iterator iter = locatorIds.iterator(); iter.hasNext(); ) {
+ for (Iterator iter = locatorIds.iterator(); iter.hasNext();) {
sb.append(iter.next());
sb.append(" ");
}
@@ -1322,22 +1288,17 @@ implements org.apache.geode.admin.AdminDistributedSystem,
return locatorIds;
}
-
+
/**
- * Returns whether or not a <code>SystemMember</code> corresponds
- * to a <code>GemFireVM</code>.
+ * Returns whether or not a <code>SystemMember</code> corresponds to a <code>GemFireVM</code>.
*
- * @param examineConfig
- * Should we take the configuration of the member into
- * consideration? In general, we want to consider the
- * configuration when a member starts up. But when we are
- * notified that it has shut down, we do not want to examine
- * the configuration because that might involve contacting
- * the member. Which, of course, cannot be done because it
- * has shut down.
+ * @param examineConfig Should we take the configuration of the member into consideration? In
+ * general, we want to consider the configuration when a member starts up. But when we are
+ * notified that it has shut down, we do not want to examine the configuration because that
+ * might involve contacting the member. Which, of course, cannot be done because it has
+ * shut down.
*/
- private boolean isSame(SystemMemberImpl member, GemFireVM vm,
- boolean examineConfig) {
+ private boolean isSame(SystemMemberImpl member, GemFireVM vm, boolean examineConfig) {
if (vm.equals(member.getGemFireVM())) {
return true;
}
@@ -1349,16 +1310,14 @@ implements org.apache.geode.admin.AdminDistributedSystem,
return true;
}
- if ((member instanceof ManagedSystemMemberImpl) &&
- examineConfig) {
+ if ((member instanceof ManagedSystemMemberImpl) && examineConfig) {
// We can't compare information about managers because the
- // member might have already gone away. Attempts to send it
+ // member might have already gone away. Attempts to send it
// messages (to get its product directory, for instance) will
// time out.
- ManagedSystemMemberImpl entity =
- (ManagedSystemMemberImpl) member;
+ ManagedSystemMemberImpl entity = (ManagedSystemMemberImpl) member;
// Make sure that the type of the managed entity matches the
// type of the internal admin object.
@@ -1374,18 +1333,16 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
ManagedEntityConfig conf = entity.getEntityConfig();
- InetAddress managedHost =
- InetAddressUtil.toInetAddress(conf.getHost());
+ InetAddress managedHost = InetAddressUtil.toInetAddress(conf.getHost());
File managedWorkingDir = new File(conf.getWorkingDirectory());
File managedProdDir = new File(conf.getProductDirectory());
-
+
InetAddress vmHost = vm.getHost();
File vmWorkingDir = vm.getWorkingDirectory();
File vmProdDir = vm.getGemFireDir();
- if (vmHost.equals(managedHost) &&
- isSameFile(vmWorkingDir, managedWorkingDir) &&
- isSameFile(vmProdDir, managedProdDir)) {
+ if (vmHost.equals(managedHost) && isSameFile(vmWorkingDir, managedWorkingDir)
+ && isSameFile(vmProdDir, managedProdDir)) {
return true;
}
}
@@ -1394,8 +1351,7 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
/**
- * Returns whether or not the names of the two files represent the
- * same file.
+ * Returns whether or not the names of the two files represent the same file.
*/
private boolean isSameFile(File file1, File file2) {
if (file1.equals(file2)) {
@@ -1411,102 +1367,91 @@ implements org.apache.geode.admin.AdminDistributedSystem,
return true;
}
-// StringBuffer sb = new StringBuffer();
-// sb.append("File 1: ");
-// sb.append(file1);
-// sb.append("\nFile 2: ");
-// sb.append(file2);
-// sb.append("\n Absolute 1: ");
-// sb.append(file1.getAbsoluteFile());
-// sb.append("\n Absolute 2: ");
-// sb.append(file2.getAbsoluteFile());
-// sb.append("\n Canonical 1: ");
-// sb.append(file1.getCanonicalFile());
-// sb.append("\n Canonical 2: ");
-// sb.append(file2.getCanonicalFile());
-// logger.info(sb.toString());
+ // StringBuffer sb = new StringBuffer();
+ // sb.append("File 1: ");
+ // sb.append(file1);
+ // sb.append("\nFile 2: ");
+ // sb.append(file2);
+ // sb.append("\n Absolute 1: ");
+ // sb.append(file1.getAbsoluteFile());
+ // sb.append("\n Absolute 2: ");
+ // sb.append(file2.getAbsoluteFile());
+ // sb.append("\n Canonical 1: ");
+ // sb.append(file1.getCanonicalFile());
+ // sb.append("\n Canonical 2: ");
+ // sb.append(file2.getCanonicalFile());
+ // logger.info(sb.toString());
} catch (IOException ex) {
// oh well...
- logger.info(LocalizedMessage.create(LocalizedStrings.AdminDistributedSystemImpl_WHILE_GETTING_CANONICAL_FILE), ex);
+ logger.info(LocalizedMessage
+ .create(LocalizedStrings.AdminDistributedSystemImpl_WHILE_GETTING_CANONICAL_FILE), ex);
}
return false;
}
/**
- * Finds and returns the <code>SystemMember</code> that corresponds
- * to the given <code>GemFireVM</code> or <code>null</code> if no
- * <code>SystemMember</code> corresponds.
+ * Finds and returns the <code>SystemMember</code> that corresponds to the given
+ * <code>GemFireVM</code> or <code>null</code> if no <code>SystemMember</code> corresponds.
*/
protected SystemMember findSystemMember(GemFireVM vm) {
return findSystemMember(vm, true);
}
/**
- * Finds and returns the <code>SystemMember</code> that corresponds to the
- * given <code>GemFireVM</code> or <code>null</code> if no Finds and returns
- * the <code>SystemMember</code> that corresponds to the given
- * <code>GemFireVM</code> or <code>null</code> if no <code>SystemMember</code>
- * corresponds.
+ * Finds and returns the <code>SystemMember</code> that corresponds to the given
+ * <code>GemFireVM</code> or <code>null</code> if no Finds and returns the
+ * <code>SystemMember</code> that corresponds to the given <code>GemFireVM</code> or
+ * <code>null</code> if no <code>SystemMember</code> corresponds.
*
*
- * @param vm
- * GemFireVM instance
- * @param compareConfig
- * Should the members' configurations be compared? <code>true</code>
- * when the member has joined, <code>false</code> when the member has
- * left Should the members' configurations be compared?
- * <code>true</code> when the member has joined, <code>false</code>
- * when the member has left. Additionally also used to check if system
- * member config is to be synchronized with the VM.
+ * @param vm GemFireVM instance
+ * @param compareConfig Should the members' configurations be compared? <code>true</code> when the
+ * member has joined, <code>false</code> when the member has left Should the members'
+ * configurations be compared? <code>true</code> when the member has joined,
+ * <code>false</code> when the member has left. Additionally also used to check if system
+ * member config is to be synchronized with the VM.
*/
- protected SystemMember findSystemMember(GemFireVM vm,
- boolean compareConfig) {
+ protected SystemMember findSystemMember(GemFireVM vm, boolean compareConfig) {
SystemMemberImpl member = null;
- synchronized (this.cacheServerSet) {
- SERVERS: for (Iterator iter = this.cacheServerSet.iterator();
- iter.hasNext(); ) {
- Future future = (Future) iter.next();
- CacheServerImpl cacheServer = null;
- for (;;) {
- checkCancellation();
- boolean interrupted = Thread.interrupted();
- try {
- cacheServer = (CacheServerImpl) future.get();
- break; // success
- }
- catch (InterruptedException ex) {
- interrupted = true;
- continue; // keep trying
- }
- catch (CancellationException ex) {
- continue SERVERS;
- }
- catch (ExecutionException ex) {
- handle(ex);
- continue SERVERS;
- }
- finally {
- if (interrupted) {
- Thread.currentThread().interrupt();
- }
+ synchronized (this.cacheServerSet) {
+ SERVERS: for (Iterator iter = this.cacheServerSet.iterator(); iter.hasNext();) {
+ Future future = (Future) iter.next();
+ CacheServerImpl cacheServer = null;
+ for (;;) {
+ checkCancellation();
+ boolean interrupted = Thread.interrupted();
+ try {
+ cacheServer = (CacheServerImpl) future.get();
+ break; // success
+ } catch (InterruptedException ex) {
+ interrupted = true;
+ continue; // keep trying
+ } catch (CancellationException ex) {
+ continue SERVERS;
+ } catch (ExecutionException ex) {
+ handle(ex);
+ continue SERVERS;
+ } finally {
+ if (interrupted) {
+ Thread.currentThread().interrupt();
}
- } // for
-
- if (isSame(cacheServer, vm, compareConfig)) {
- member = cacheServer;
- break;
}
- }
+ } // for
+
+ if (isSame(cacheServer, vm, compareConfig)) {
+ member = cacheServer;
+ break;
+ }
}
+ }
if (member == null) {
synchronized (this.applicationSet) {
- APPS: for (Iterator iter = this.applicationSet.iterator();
- iter.hasNext(); ) {
+ APPS: for (Iterator iter = this.applicationSet.iterator(); iter.hasNext();) {
Future future = (Future) iter.next();
SystemMemberImpl application = null;
for (;;) {
@@ -1515,19 +1460,15 @@ implements org.apache.geode.admin.AdminDistributedSystem,
try {
application = (SystemMemberImpl) future.get();
break; // success
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
interrupted = true;
continue; // keep trying
- }
- catch (CancellationException ex) {
+ } catch (CancellationException ex) {
continue APPS;
- }
- catch (ExecutionException ex) {
+ } catch (ExecutionException ex) {
handle(ex);
continue APPS;
- }
- finally {
+ } finally {
if (interrupted) {
Thread.currentThread().interrupt();
}
@@ -1547,48 +1488,47 @@ implements org.apache.geode.admin.AdminDistributedSystem,
member.setGemFireVM(vm);
} catch (AdminException ex) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.AdminDistributedSystem_COULD_NOT_SET_THE_GEMFIRE_VM), ex);
+ logger.warn(LocalizedMessage
+ .create(LocalizedStrings.AdminDistributedSystem_COULD_NOT_SET_THE_GEMFIRE_VM), ex);
}
}
return member;
}
-
- /**
+
+ /**
* Removes a SystemMember from this system's list of known members.
*
- * @param systemMember the member to remove
+ * @param systemMember the member to remove
* @return the system member that was removed; null if no match was found
*/
protected SystemMember removeSystemMember(SystemMember systemMember) {
- return removeSystemMember(
- ((SystemMemberImpl) systemMember).getInternalId());
- }
-
- /**
- * Removes a SystemMember from this system's list of known members. This
- * method is called in response to a member leaving the system.
- * TODO: this method is a mess of defns
+ return removeSystemMember(((SystemMemberImpl) systemMember).getInternalId());
+ }
+
+ /**
+ * Removes a SystemMember from this system's list of known members. This method is called in
+ * response to a member leaving the system. TODO: this method is a mess of defns
*
- * @param internalId the unique id that specifies which member to remove
+ * @param internalId the unique id that specifies which member to remove
* @return the system member that was removed; null if no match was found
*/
protected SystemMember removeSystemMember(InternalDistributedMember internalId) {
- if (internalId == null) return null;
+ if (internalId == null)
+ return null;
-// this.logger.info("DEBUG: removeSystemMember: " + internalId, new RuntimeException("STACK"));
+ // this.logger.info("DEBUG: removeSystemMember: " + internalId, new RuntimeException("STACK"));
boolean found = false;
SystemMemberImpl member = null;
- synchronized(this.cacheServerSet) {
- SERVERS: for (Iterator iter = this.cacheServerSet.iterator();
- iter.hasNext() && !found; ) {
+ synchronized (this.cacheServerSet) {
+ SERVERS: for (Iterator iter = this.cacheServerSet.iterator(); iter.hasNext() && !found;) {
Future future = (Future) iter.next();
if (future instanceof AdminFutureTask) {
AdminFutureTask task = (AdminFutureTask) future;
if (task.getMemberId().equals(internalId)) {
-// this.logger.info("DEBUG: removeSystemMember cs cancelling: " + future);
+ // this.logger.info("DEBUG: removeSystemMember cs cancelling: " + future);
future.cancel(true);
} else {
@@ -1609,7 +1549,7 @@ implements org.apache.geode.admin.AdminDistributedSystem,
continue SERVERS;
} catch (ExecutionException ex) {
handle(ex);
- return null; // Dead code
+ return null; // Dead code
} finally {
if (interrupted) {
Thread.currentThread().interrupt();
@@ -1624,17 +1564,16 @@ implements org.apache.geode.admin.AdminDistributedSystem,
found = true;
}
} // SERVERS
- }
+ }
- synchronized(this.applicationSet) {
- for (Iterator iter = this.applicationSet.iterator();
- iter.hasNext() && !found; ) {
+ synchronized (this.applicationSet) {
+ for (Iterator iter = this.applicationSet.iterator(); iter.hasNext() && !found;) {
Future future = (Future) iter.next();
try {
if (future instanceof AdminFutureTask) {
AdminFutureTask task = (AdminFutureTask) future;
if (task.getMemberId().equals(internalId)) {
- iter.remove(); // Only remove applications
+ iter.remove(); // Only remove applications
found = true;
if (future.isDone()) {
member = (SystemMemberImpl) future.get();
@@ -1643,48 +1582,50 @@ implements org.apache.geode.admin.AdminDistributedSystem,
} else {
// This is not the member we are looking for...
continue;
- }
+ }
}
if (future.isDone()) {
member = (SystemMemberImpl) future.get();
} else {
-// this.logger.info("DEBUG: removeSystemMember as cancelling: " + future);
+ // this.logger.info("DEBUG: removeSystemMember as cancelling: " + future);
future.cancel(true);
}
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
checkCancellation();
- throw new RuntimeException(LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED.toLocalizedString(), ex);
-
+ throw new RuntimeException(
+ LocalizedStrings.AdminDistributedSystemImpl_INTERRUPTED.toLocalizedString(), ex);
+
} catch (CancellationException ex) {
continue;
} catch (ExecutionException ex) {
handle(ex);
- return null; // Dead code
+ return null; // Dead code
}
InternalDistributedMember applicationId = member.getInternalId();
if (internalId.equals(applicationId)) {
// found a match...
- iter.remove(); // Only remove applications
+ iter.remove(); // Only remove applications
found = true;
}
}
- }
+ }
if (found) {
try {
if (member != null) {
member.setGemFireVM(null);
}
-
+
} catch (AdminException ex) {
- logger.fatal(LocalizedMessage.create(LocalizedStrings.AdminDistributedSystem_UNEXPECTED_ADMINEXCEPTION), ex);
+ logger.fatal(LocalizedMessage
+ .create(LocalizedStrings.AdminDistributedSystem_UNEXPECTED_ADMINEXCEPTION), ex);
}
return member;
-
+
} else {
if (logger.isDebugEnabled()) {
logger.debug("Couldn't remove member {}", internalId);
@@ -1692,26 +1633,24 @@ implements org.apache.geode.admin.AdminDistributedSystem,
return null;
}
}
-
- /**
- * Builds the configuration needed to connect to a GfManagerAgent which is the
- * main gateway into the internal.admin api. GfManagerAgent is used to
- * actually connect to the distributed gemfire system.
+
+ /**
+ * Builds the configuration needed to connect to a GfManagerAgent which is the main gateway into
+ * the internal.admin api. GfManagerAgent is used to actually connect to the distributed gemfire
+ * system.
*
* @param logWriter the LogWriterI18n to use for any logging
* @return the configuration needed to connect to a GfManagerAgent
*/
// LOG: saves LogWriterLogger from AdminDistributedSystemImpl for RemoteGfManagerAgentConfig
private GfManagerAgentConfig buildAgentConfig(InternalLogWriter logWriter) {
- RemoteTransportConfig conf = new RemoteTransportConfig(
- isMcastEnabled(), getDisableTcp(),
- getDisableAutoReconnect(),
- getBindAddress(), buildSSLConfig(), parseLocators(),
+ RemoteTransportConfig conf = new RemoteTransportConfig(isMcastEnabled(), getDisableTcp(),
+ getDisableAutoReconnect(), getBindAddress(), buildSSLConfig(), parseLocators(),
getMembershipPortRange(), getTcpPort(), DistributionManager.ADMIN_ONLY_DM_TYPE);
- return new GfManagerAgentConfig(
- getSystemName(), conf, logWriter, this.alertLevel.getSeverity(), this, this);
+ return new GfManagerAgentConfig(getSystemName(), conf, logWriter, this.alertLevel.getSeverity(),
+ this, this);
}
-
+
protected SSLConfig buildSSLConfig() {
SSLConfig conf = new SSLConfig();
if (getConfig() != null) {
@@ -1723,10 +1662,9 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
return conf;
}
-
+
/**
- * Returns the currently configured address to bind to when administering
- * this system.
+ * Returns the currently configured address to bind to when administering this system.
*/
private String getBindAddress() {
return this.config.getBindAddress();
@@ -1738,16 +1676,15 @@ implements org.apache.geode.admin.AdminDistributedSystem,
return ((ManagedEntity) member).isRunning();
} else {
- // member must be an application VM. It is running
+ // member must be an application VM. It is running
return true;
}
}
/** Returns any member manager that is known to be running */
private SystemMember findFirstRunningMember() {
- synchronized(this.cacheServerSet) {
- SERVERS: for (Iterator iter = this.cacheServerSet.iterator();
- iter.hasNext();){
+ synchronized (this.cacheServerSet) {
+ SERVERS: for (Iterator iter = this.cacheServerSet.iterator(); iter.hasNext();) {
Future future = (Future) iter.next();
SystemMember member = null;
for (;;) {
@@ -1756,19 +1693,15 @@ implements org.apache.geode.admin.AdminDistributedSystem,
try {
member = (SystemMember) future.get();
break; // success
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
interrupted = true;
continue; // keep trying
- }
- catch (CancellationException ex) {
+ } catch (CancellationException ex) {
continue SERVERS;
- }
- catch (ExecutionException ex) {
+ } catch (ExecutionException ex) {
handle(ex);
- return null; // Dead code
- }
- finally {
+ return null; // Dead code
+ } finally {
if (interrupted) {
Thread.currentThread().interrupt();
}
@@ -1781,9 +1714,8 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
}
- synchronized(this.applicationSet) {
- APPS: for (Iterator iter = this.applicationSet.iterator();
- iter.hasNext();) {
+ synchronized (this.applicationSet) {
+ APPS: for (Iterator iter = this.applicationSet.iterator(); iter.hasNext();) {
Future future = (Future) iter.next();
SystemMember member = null;
for (;;) {
@@ -1792,24 +1724,20 @@ implements org.apache.geode.admin.AdminDistributedSystem,
try {
member = (SystemMember) future.get();
break; // success
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
interrupted = true;
continue; // keep trying
- }
- catch (CancellationException ex) {
+ } catch (CancellationException ex) {
continue APPS;
- }
- catch (ExecutionException ex) {
+ } catch (ExecutionException ex) {
handle(ex);
- return null; // Dead code
- }
- finally {
+ return null; // Dead code
+ } finally {
if (interrupted) {
Thread.currentThread().interrupt();
}
}
- } // for
+ } // for
if (isRunning(member)) {
return member;
@@ -1821,48 +1749,45 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
/**
- * Returns the instance of system member that is running either as a CacheVm
- * or only ApplicationVm for the given string representation of the id.
+ * Returns the instance of system member that is running either as a CacheVm or only ApplicationVm
+ * for the given string representation of the id.
*
- * @param memberId
- * string representation of the member identifier
- * @return instance of system member which could be either as a CacheVm or
- * Application VM
+ * @param memberId string representation of the member identifier
+ * @return instance of system member which could be either as a CacheVm or Application VM
*/
protected SystemMember findCacheOrAppVmById(String memberId) {
SystemMember found = null;
-
+
if (memberId != null) {
try {
boolean foundSender = false;
CacheVm[] cacheVms = getCacheVms();
-
- /* cacheVms could be null. See
- * AdminDistributedSystemImpl.getCacheVmsCollection() for
- * ExecutionException */
+
+ /*
+ * cacheVms could be null. See AdminDistributedSystemImpl.getCacheVmsCollection() for
+ * ExecutionException
+ */
if (cacheVms != null) {
for (CacheVm cacheVm : cacheVms) {
- if (cacheVm.getId().equals(memberId) &&
- cacheVm instanceof CacheVm) {
- found = (SystemMember) cacheVm;
+ if (cacheVm.getId().equals(memberId) && cacheVm instanceof CacheVm) {
+ found = (SystemMember) cacheVm;
foundSender = true;
break;
}
}
}
-
+
if (!foundSender) {
SystemMember[] appVms = getSystemMemberApplications();
-
+
for (SystemMember appVm : appVms) {
- if (appVm.getId().equals(memberId) &&
- appVm instanceof SystemMember) {
+ if (appVm.getId().equals(memberId) && appVm instanceof SystemMember) {
found = (SystemMember) appVm;
foundSender = true;
break;
}
}
-
+
}
} catch (AdminException e) {
if (logger.isDebugEnabled()) {
@@ -1870,21 +1795,21 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
}
}
-
+
return found;
- }
-
+ }
+
/** Returns true if any member application is known to be running */
protected boolean isAnyMemberRunning() {
return findFirstRunningMember() != null;
}
-
+
// -------------------------------------------------------------------------
- // Health methods
+ // Health methods
// -------------------------------------------------------------------------
-
+
/**
- * Lazily initializes the GemFire health monitor
+ * Lazily initializes the GemFire health monitor
*
* @see #createGemFireHealth
*/
@@ -1895,7 +1820,10 @@ implements org.apache.geode.admin.AdminDistributedSystem,
this.health = createGemFireHealth(this.gfManagerAgent);
} catch (AdminException ex) {
- throw new RuntimeAdminException(LocalizedStrings.AdminDistributedSystemImpl_AN_ADMINEXCEPTION_WAS_THROWN_WHILE_GETTING_THE_GEMFIRE_HEALTH.toLocalizedString(), ex);
+ throw new RuntimeAdminException(
+ LocalizedStrings.AdminDistributedSystemImpl_AN_ADMINEXCEPTION_WAS_THROWN_WHILE_GETTING_THE_GEMFIRE_HEALTH
+ .toLocalizedString(),
+ ex);
}
}
@@ -1904,29 +1832,29 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
/**
- * A "template factory" method for creating an instance of
- * <code>GemFireHealth</code>. It can be overridden by subclasses
- * to produce instances of different <code>GemFireHealth</code>
+ * A "template factory" method for creating an instance of <code>GemFireHealth</code>. It can be
+ * overridden by subclasses to produce instances of different <code>GemFireHealth</code>
* implementations.
*
* @see #getGemFireHealth
*/
- protected GemFireHealth createGemFireHealth(GfManagerAgent agent)
- throws AdminException {
+ protected GemFireHealth createGemFireHealth(GfManagerAgent agent) throws AdminException {
if (agent == null) {
- throw new IllegalStateException(LocalizedStrings.AdminDistributedSystemImpl_GFMANAGERAGENT_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.AdminDistributedSystemImpl_GFMANAGERAGENT_MUST_NOT_BE_NULL
+ .toLocalizedString());
}
return new GemFireHealthImpl(agent, this);
}
-
+
public CacheVm addCacheVm() throws AdminException {
- return (CacheVm)addCacheServer();
+ return (CacheVm) addCacheServer();
}
-
+
public CacheServer addCacheServer() throws AdminException {
CacheServerConfigImpl conf = new CacheServerConfigImpl();
- CacheServer server = createCacheServer(conf);
+ CacheServer server = createCacheServer(conf);
setDistributionParameters(server);
synchronized (this.cacheServerSet) {
@@ -1937,10 +1865,9 @@ implements org.apache.geode.admin.AdminDistributedSystem,
}
private Collection getCacheVmsCollection() throws AdminException {
- synchronized(this.cacheServerSet) {
+ synchronized (this.cacheServerSet) {
Collection coll = new ArrayList(this.cacheServerSet.size());
- SERVERS: for (Iterator iter = this.cacheServerSet.iterator();
- iter.hasNext(); ) {
+ SERVERS: for (Iterator iter = this.cacheServerSet.iterator(); iter.hasNext();) {
Future future = (Future) iter.next();
Object get = null;
for (;;) {
@@ -1949,19 +1876,15 @@ implements org.apache.geode.admin.AdminDistributedSystem,
try {
get = future.get();
break; // success
- }
- catch (InterruptedException ex) {
+ } catch (InterruptedException ex) {
interrupted = true;
continue; // keep trying
-
<TRUNCATED>
Re: [97/98] [abbrv] incubator-geode git commit: GEODE-2043: change
makeTombstone to handle exception
Posted by Anilkumar Gingade <ag...@pivotal.io>.
I am seeing build failures with:
***
FAILURE: Build failed with an exception.
* What went wrong:
Execution failed for task ':geode-core:spotlessJavaCheck'.
> Format violations were found. Run 'gradlew spotlessApply' to fix them.
geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
***
Planning to commit changes after running "spotlessApply" to fix the issue...
-Anil.
On Fri, Oct 28, 2016 at 2:41 PM, <ds...@apache.org> wrote:
> GEODE-2043: change makeTombstone to handle exception
>
> Now if makeTombstone has an exception but had already changed
> the region entry value to a TOMBSTONE, it will now change
> the value to REMOVE_PHASE2 instead of leaving it as a TOMBSTONE.
>
>
> Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
> Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/
> commit/2ef50b24
> Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2ef50b24
> Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2ef50b24
>
> Branch: refs/heads/feature/GEM-983
> Commit: 2ef50b24de1457ab91729f22a3c2ff4a8a07557b
> Parents: 765a55a
> Author: Darrel Schneider <ds...@pivotal.io>
> Authored: Thu Oct 27 16:05:08 2016 -0700
> Committer: Darrel Schneider <ds...@pivotal.io>
> Committed: Fri Oct 28 14:12:59 2016 -0700
>
> ----------------------------------------------------------------------
> .../internal/cache/AbstractRegionEntry.java | 15 ++-
> .../internal/cache/AbstractRegionEntryTest.java | 112 +++++++++++++++++++
> 2 files changed, 125 insertions(+), 2 deletions(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/incubator-geode/
> blob/2ef50b24/geode-core/src/main/java/org/apache/geode/internal/cache/
> AbstractRegionEntry.java
> ----------------------------------------------------------------------
> diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
> b/geode-core/src/main/java/org/apache/geode/internal/
> cache/AbstractRegionEntry.java
> index 4e1f0aa..2138af9 100644
> --- a/geode-core/src/main/java/org/apache/geode/internal/
> cache/AbstractRegionEntry.java
> +++ b/geode-core/src/main/java/org/apache/geode/internal/
> cache/AbstractRegionEntry.java
> @@ -209,7 +209,7 @@ public abstract class AbstractRegionEntry implements
> RegionEntry, HashEntry<Obje
> version.getRegionVersion())) {
> // distributed gc with higher vector version preempts this operation
> if (!isTombstone()) {
> - setValue(r, Token.TOMBSTONE);
> + basicMakeTombstone(r);
> r.incTombstoneCount(1);
> }
> r.getRegionMap().removeTombstone(this, version, false, true);
> @@ -220,7 +220,7 @@ public abstract class AbstractRegionEntry implements
> RegionEntry, HashEntry<Obje
> }
> setRecentlyUsed();
> boolean newEntry = (getValueAsToken() == Token.REMOVED_PHASE1);
> - setValue(r, Token.TOMBSTONE);
> + basicMakeTombstone(r);
> r.scheduleTombstone(this, version);
> if (newEntry) {
> // bug #46631 - entry count is decremented by scheduleTombstone
> but this is a new entry
> @@ -228,6 +228,17 @@ public abstract class AbstractRegionEntry implements
> RegionEntry, HashEntry<Obje
> }
> }
> }
> + private void basicMakeTombstone(LocalRegion r) throws
> RegionClearedException {
> + boolean setValueCompleted = false;
> + try {
> + setValue(r, Token.TOMBSTONE);
> + setValueCompleted = true;
> + } finally {
> + if (!setValueCompleted && isTombstone()) {
> + removePhase2();
> + }
> + }
> + }
>
>
> @Override
>
> http://git-wip-us.apache.org/repos/asf/incubator-geode/
> blob/2ef50b24/geode-core/src/test/java/org/apache/geode/internal/cache/
> AbstractRegionEntryTest.java
> ----------------------------------------------------------------------
> diff --git a/geode-core/src/test/java/org/apache/geode/internal/
> cache/AbstractRegionEntryTest.java b/geode-core/src/test/java/
> org/apache/geode/internal/cache/AbstractRegionEntryTest.java
> new file mode 100644
> index 0000000..36e3e30
> --- /dev/null
> +++ b/geode-core/src/test/java/org/apache/geode/internal/
> cache/AbstractRegionEntryTest.java
> @@ -0,0 +1,112 @@
> +/*
> + * 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.internal.cache;
> +
> +import static org.junit.Assert.*;
> +import static org.mockito.Mockito.*;
> +
> +import org.assertj.core.api.Assertions;
> +import org.junit.Test;
> +import org.junit.experimental.categories.Category;
> +
> +import org.apache.geode.internal.cache.versions.RegionVersionVector;
> +import org.apache.geode.internal.cache.versions.VersionTag;
> +import org.apache.geode.internal.offheap.annotations.Unretained;
> +import org.apache.geode.internal.util.concurrent.
> CustomEntryConcurrentHashMap.HashEntry;
> +import org.apache.geode.test.junit.categories.UnitTest;
> +
> +@Category(UnitTest.class)
> +public class AbstractRegionEntryTest {
> +
> + @Test
> + public void whenMakeTombstoneHasSetValueTh
> atThrowsExceptionDoesNotChangeValueToTombstone() throws
> RegionClearedException {
> + LocalRegion lr = mock(LocalRegion.class);
> + RegionVersionVector<?> rvv = mock(RegionVersionVector.class);
> + when(lr.getVersionVector()).thenReturn(rvv);
> + VersionTag<?> vt = mock(VersionTag.class);
> + Object value = "value";
> + AbstractRegionEntry re = new TestableRegionEntry(lr, value);
> + assertEquals(value, re.getValueField());
> + Assertions.assertThatThrownBy(() -> re.makeTombstone(lr, vt))
> + .isInstanceOf(RuntimeException.class)
> + .hasMessage("throw exception on setValue(TOMBSTONE)");
> + assertEquals(Token.REMOVED_PHASE2, re.getValueField());
> + }
> +
> +
> + public static class TestableRegionEntry extends AbstractRegionEntry {
> +
> + private Object value;
> +
> + protected TestableRegionEntry(RegionEntryContext context, Object
> value) {
> + super(context, value);
> + }
> +
> + @Override
> + protected Object getValueField() {
> + return this.value;
> + }
> +
> + @Override
> + protected void setValueField(Object v) {
> + this.value = v;
> + }
> +
> + @Override
> + public void setValue(RegionEntryContext context, @Unretained Object
> value)
> + throws RegionClearedException {
> + super.setValue(context, value);
> + if (value == Token.TOMBSTONE) {
> + throw new RuntimeException("throw exception on
> setValue(TOMBSTONE)");
> + }
> + }
> +
> + @Override
> + public int getEntryHash() {
> + return 0;
> + }
> +
> + @Override
> + public HashEntry<Object, Object> getNextEntry() {
> + return null;
> + }
> +
> + @Override
> + public void setNextEntry(HashEntry<Object, Object> n) {
> + }
> +
> + @Override
> + public Object getKey() {
> + return null;
> + }
> +
> + @Override
> + protected long getlastModifiedField() {
> + return 0;
> + }
> +
> + @Override
> + protected boolean compareAndSetLastModifiedField(long expectedValue,
> long newValue) {
> + return false;
> + }
> +
> + @Override
> + protected void setEntryHash(int v) {
> + }
> +
> + }
> +}
>
>
[97/98] [abbrv] incubator-geode git commit: GEODE-2043: change
makeTombstone to handle exception
Posted by ds...@apache.org.
GEODE-2043: change makeTombstone to handle exception
Now if makeTombstone has an exception but had already changed
the region entry value to a TOMBSTONE, it will now change
the value to REMOVE_PHASE2 instead of leaving it as a TOMBSTONE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2ef50b24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2ef50b24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2ef50b24
Branch: refs/heads/feature/GEM-983
Commit: 2ef50b24de1457ab91729f22a3c2ff4a8a07557b
Parents: 765a55a
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Thu Oct 27 16:05:08 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Fri Oct 28 14:12:59 2016 -0700
----------------------------------------------------------------------
.../internal/cache/AbstractRegionEntry.java | 15 ++-
.../internal/cache/AbstractRegionEntryTest.java | 112 +++++++++++++++++++
2 files changed, 125 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2ef50b24/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
index 4e1f0aa..2138af9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
@@ -209,7 +209,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
version.getRegionVersion())) {
// distributed gc with higher vector version preempts this operation
if (!isTombstone()) {
- setValue(r, Token.TOMBSTONE);
+ basicMakeTombstone(r);
r.incTombstoneCount(1);
}
r.getRegionMap().removeTombstone(this, version, false, true);
@@ -220,7 +220,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
}
setRecentlyUsed();
boolean newEntry = (getValueAsToken() == Token.REMOVED_PHASE1);
- setValue(r, Token.TOMBSTONE);
+ basicMakeTombstone(r);
r.scheduleTombstone(this, version);
if (newEntry) {
// bug #46631 - entry count is decremented by scheduleTombstone but this is a new entry
@@ -228,6 +228,17 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
}
}
}
+ private void basicMakeTombstone(LocalRegion r) throws RegionClearedException {
+ boolean setValueCompleted = false;
+ try {
+ setValue(r, Token.TOMBSTONE);
+ setValueCompleted = true;
+ } finally {
+ if (!setValueCompleted && isTombstone()) {
+ removePhase2();
+ }
+ }
+ }
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2ef50b24/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
new file mode 100644
index 0000000..36e3e30
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
@@ -0,0 +1,112 @@
+/*
+ * 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.internal.cache;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.internal.cache.versions.VersionTag;
+import org.apache.geode.internal.offheap.annotations.Unretained;
+import org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
+import org.apache.geode.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class AbstractRegionEntryTest {
+
+ @Test
+ public void whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone() throws RegionClearedException {
+ LocalRegion lr = mock(LocalRegion.class);
+ RegionVersionVector<?> rvv = mock(RegionVersionVector.class);
+ when(lr.getVersionVector()).thenReturn(rvv);
+ VersionTag<?> vt = mock(VersionTag.class);
+ Object value = "value";
+ AbstractRegionEntry re = new TestableRegionEntry(lr, value);
+ assertEquals(value, re.getValueField());
+ Assertions.assertThatThrownBy(() -> re.makeTombstone(lr, vt))
+ .isInstanceOf(RuntimeException.class)
+ .hasMessage("throw exception on setValue(TOMBSTONE)");
+ assertEquals(Token.REMOVED_PHASE2, re.getValueField());
+ }
+
+
+ public static class TestableRegionEntry extends AbstractRegionEntry {
+
+ private Object value;
+
+ protected TestableRegionEntry(RegionEntryContext context, Object value) {
+ super(context, value);
+ }
+
+ @Override
+ protected Object getValueField() {
+ return this.value;
+ }
+
+ @Override
+ protected void setValueField(Object v) {
+ this.value = v;
+ }
+
+ @Override
+ public void setValue(RegionEntryContext context, @Unretained Object value)
+ throws RegionClearedException {
+ super.setValue(context, value);
+ if (value == Token.TOMBSTONE) {
+ throw new RuntimeException("throw exception on setValue(TOMBSTONE)");
+ }
+ }
+
+ @Override
+ public int getEntryHash() {
+ return 0;
+ }
+
+ @Override
+ public HashEntry<Object, Object> getNextEntry() {
+ return null;
+ }
+
+ @Override
+ public void setNextEntry(HashEntry<Object, Object> n) {
+ }
+
+ @Override
+ public Object getKey() {
+ return null;
+ }
+
+ @Override
+ protected long getlastModifiedField() {
+ return 0;
+ }
+
+ @Override
+ protected boolean compareAndSetLastModifiedField(long expectedValue, long newValue) {
+ return false;
+ }
+
+ @Override
+ protected void setEntryHash(int v) {
+ }
+
+ }
+}
[41/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
index 415866b..8c228f2 100644
--- a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
@@ -1,18 +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
+ * 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;
@@ -45,31 +43,34 @@ public class BundledJarsJUnitTest {
private static final String VERSION_PATTERN = "[0-9-_.v]{3,}.*\\.jar$";
protected static final String GEMFIRE_HOME = System.getenv("GEMFIRE");
private Set<String> expectedJars;
-
+
@Before
public void loadExpectedJars() throws IOException {
- String expectedJarFile = TestUtil.getResourcePath(BundledJarsJUnitTest.class, "/expected_jars.txt");
-
- expectedJars = Files.lines(Paths.get(expectedJarFile))
- .collect(Collectors.toSet());
+ String expectedJarFile =
+ TestUtil.getResourcePath(BundledJarsJUnitTest.class, "/expected_jars.txt");
+
+ expectedJars = Files.lines(Paths.get(expectedJarFile)).collect(Collectors.toSet());
}
-
+
@Test
public void verifyBundledJarsHaveNotChanged() throws IOException {
TreeMap<String, String> sortedJars = getBundledJars();
- Stream<String> lines = sortedJars.entrySet().stream().map(entry -> removeVersion(entry.getKey()));
+ Stream<String> lines =
+ sortedJars.entrySet().stream().map(entry -> removeVersion(entry.getKey()));
Set<String> bundledJarNames = new TreeSet<String>(lines.collect(Collectors.toSet()));
-
+
Files.write(Paths.get("bundled_jars.txt"), bundledJarNames);
TreeSet<String> newJars = new TreeSet<String>(bundledJarNames);
newJars.removeAll(expectedJars);
TreeSet<String> missingJars = new TreeSet<String>(expectedJars);
missingJars.removeAll(bundledJarNames);
-
+
StringBuilder message = new StringBuilder();
- message.append("The bundled jars have changed. Please make sure you update the licence and notice");
- message.append("\nas described in https://cwiki.apache.org/confluence/display/GEODE/License+Guide+for+Contributors");
+ message.append(
+ "The bundled jars have changed. Please make sure you update the licence and notice");
+ message.append(
+ "\nas described in https://cwiki.apache.org/confluence/display/GEODE/License+Guide+for+Contributors");
message.append("\nWhen fixed, copy geode-assembly/build/test/bundled_jars.txt");
message.append("\nto src/test/resources/expected_jars.txt");
message.append("\nRemoved Jars\n--------------\n");
@@ -77,34 +78,33 @@ public class BundledJarsJUnitTest {
message.append("\n\nAdded Jars\n--------------\n");
message.append(String.join("\n", newJars));
message.append("\n\n");
-
+
assertTrue(message.toString(), expectedJars.equals(bundledJarNames));
-
+
}
/**
- * Find all of the jars bundled with the project.
- * Key is the name of the jar, value is the path.
+ * Find all of the jars bundled with the project. Key is the name of the jar, value is the path.
*/
protected TreeMap<String, String> getBundledJars() {
- File gemfireHomeDirectory= new File(GEMFIRE_HOME);
+ File gemfireHomeDirectory = new File(GEMFIRE_HOME);
assertTrue("Please set the GEMFIRE environment variable to the product installation directory.",
gemfireHomeDirectory.isDirectory());
-
+
List<File> jars = FileUtil.findAll(gemfireHomeDirectory, ".*\\.jar");
TreeMap<String, String> sortedJars = new TreeMap<String, String>();
jars.stream().forEach(jar -> sortedJars.put(jar.getName(), jar.getPath()));
-
+
List<File> wars = FileUtil.findAll(gemfireHomeDirectory, ".*\\.war");
TreeSet<File> sortedWars = new TreeSet<File>(wars);
sortedWars.stream().flatMap(BundledJarsJUnitTest::extractJarNames)
- .forEach(jar -> sortedJars.put(jar.getName(), jar.getPath()));
-
+ .forEach(jar -> sortedJars.put(jar.getName(), jar.getPath()));
+
sortedJars.keySet().removeIf(s -> s.startsWith("geode"));
return sortedJars;
}
-
+
private String removeVersion(String name) {
return name.replaceAll(VERSION_PATTERN, "");
}
@@ -115,11 +115,11 @@ public class BundledJarsJUnitTest {
private static Stream<File> extractJarNames(File war) {
try (JarFile warContents = new JarFile(war)) {
return warContents.stream()
- //Look for jars in the war
+ // Look for jars in the war
.filter(entry -> entry.getName().endsWith(".jar"))
- //Create a File with a path that includes the war name
+ // Create a File with a path that includes the war name
.map(entry -> new File(war.getName(), entry.getName()))
- //Materialize the list of files while the war is still open
+ // Materialize the list of files while the war is still open
.collect(Collectors.toList()).stream();
} catch (IOException e) {
throw new RuntimeException(e);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java
index ee72b30..4e8d389 100644
--- a/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/distributed/LocatorLauncherAssemblyIntegrationTest.java
@@ -1,18 +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
+ * 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.distributed;
@@ -46,7 +44,8 @@ import static org.apache.geode.distributed.ConfigurationProperties.*;
@Category(IntegrationTest.class)
@RunWith(Parameterized.class)
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
-public class LocatorLauncherAssemblyIntegrationTest extends AbstractLocatorLauncherIntegrationTestCase {
+public class LocatorLauncherAssemblyIntegrationTest
+ extends AbstractLocatorLauncherIntegrationTestCase {
@Before
public final void setUpLocatorLauncherLocalTest() throws Exception {
@@ -66,16 +65,10 @@ public class LocatorLauncherAssemblyIntegrationTest extends AbstractLocatorLaunc
public void testLocatorStopsWhenJmxPortIsZero() throws Throwable {
String rootFolder = this.temporaryFolder.getRoot().getCanonicalPath();
- final Builder builder = new Builder()
- .setMemberName(getUniqueName())
- .setPort(this.locatorPort)
- .setRedirectOutput(false)
- .setWorkingDirectory(rootFolder)
- .set(LOG_LEVEL, "config")
- .set(ENABLE_CLUSTER_CONFIGURATION, "false")
- .set(JMX_MANAGER, "true")
- .set(JMX_MANAGER_START, "true")
- .set(JMX_MANAGER_PORT, "0");
+ final Builder builder = new Builder().setMemberName(getUniqueName()).setPort(this.locatorPort)
+ .setRedirectOutput(false).setWorkingDirectory(rootFolder).set(LOG_LEVEL, "config")
+ .set(ENABLE_CLUSTER_CONFIGURATION, "false").set(JMX_MANAGER, "true")
+ .set(JMX_MANAGER_START, "true").set(JMX_MANAGER_PORT, "0");
performTest(builder);
}
@@ -88,15 +81,10 @@ public class LocatorLauncherAssemblyIntegrationTest extends AbstractLocatorLaunc
String rootFolder = this.temporaryFolder.getRoot().getCanonicalPath();
final int jmxPort = AvailablePortHelper.getRandomAvailableTCPPorts(1)[0];
- final Builder builder = new Builder().setMemberName(getUniqueName())
- .setPort(this.locatorPort)
- .setRedirectOutput(false)
- .setWorkingDirectory(rootFolder)
- .set(LOG_LEVEL, "config")
- .set(ENABLE_CLUSTER_CONFIGURATION, "false")
- .set(JMX_MANAGER, "true")
- .set(JMX_MANAGER_START, "true")
- .set(JMX_MANAGER_PORT, Integer.toString(jmxPort));
+ final Builder builder = new Builder().setMemberName(getUniqueName()).setPort(this.locatorPort)
+ .setRedirectOutput(false).setWorkingDirectory(rootFolder).set(LOG_LEVEL, "config")
+ .set(ENABLE_CLUSTER_CONFIGURATION, "false").set(JMX_MANAGER, "true")
+ .set(JMX_MANAGER_START, "true").set(JMX_MANAGER_PORT, Integer.toString(jmxPort));
performTest(builder);
}
@@ -115,7 +103,8 @@ public class LocatorLauncherAssemblyIntegrationTest extends AbstractLocatorLaunc
// validate the pid file and its contents
this.pidFile = new File(this.temporaryFolder.getRoot(), ProcessType.LOCATOR.getPidFileName());
- assertTrue("Pid file " + this.pidFile.getCanonicalPath().toString() + " should exist", this.pidFile.exists());
+ assertTrue("Pid file " + this.pidFile.getCanonicalPath().toString() + " should exist",
+ this.pidFile.exists());
final int pid = readPid(this.pidFile);
assertTrue(pid > 0);
assertEquals(ProcessUtils.identifyPid(), pid);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
index 78cf167..1a20655 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/AgentUtilJUnitTest.java
@@ -1,18 +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
+ * 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.management.internal;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index 933d152..4f42cb0 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -1,18 +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
+ * 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.management.internal.cli.commands;
@@ -83,8 +81,9 @@ import org.apache.geode.test.dunit.WaitCriterion;
import org.apache.geode.test.junit.categories.DistributedTest;
/**
- * The LauncherLifecycleCommandsDUnitTest class is a test suite of integration tests testing the contract and
- * functionality of the GemFire launcher lifecycle commands inside Gfsh.
+ * The LauncherLifecycleCommandsDUnitTest class is a test suite of integration tests testing the
+ * contract and functionality of the GemFire launcher lifecycle commands inside Gfsh.
+ *
* @see javax.management.MBeanServerConnection
* @see javax.management.remote.JMXConnector
* @see org.apache.geode.distributed.AbstractLauncher
@@ -105,15 +104,18 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
private final Queue<Integer> processIds = new ConcurrentLinkedDeque<>();
- protected static String getMemberId(final int jmxManagerPort, final String memberName) throws Exception {
+ protected static String getMemberId(final int jmxManagerPort, final String memberName)
+ throws Exception {
return getMemberId(InetAddress.getLocalHost().getHostName(), jmxManagerPort, memberName);
}
- protected static String getMemberId(final String jmxManagerHost, final int jmxManagerPort, final String memberName) throws Exception {
+ protected static String getMemberId(final String jmxManagerHost, final int jmxManagerPort,
+ final String memberName) throws Exception {
JMXConnector connector = null;
try {
- connector = JMXConnectorFactory.connect(new JMXServiceURL(String.format("service:jmx:rmi://%1$s/jndi/rmi://%1$s:%2$d/jmxrmi", jmxManagerHost, jmxManagerPort)));
+ connector = JMXConnectorFactory.connect(new JMXServiceURL(String.format(
+ "service:jmx:rmi://%1$s/jndi/rmi://%1$s:%2$d/jmxrmi", jmxManagerHost, jmxManagerPort)));
MBeanServerConnection connection = connector.getMBeanServerConnection();
@@ -127,10 +129,12 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertFalse(objectNames.isEmpty());
assertEquals(1, objectNames.size());
- //final ObjectName objectName = ObjectName.getInstance("GemFire:type=Member,Name=" + memberName);
+ // final ObjectName objectName = ObjectName.getInstance("GemFire:type=Member,Name=" +
+ // memberName);
ObjectName objectName = objectNames.iterator().next();
- //System.err.printf("ObjectName for Member with Name (%1$s) is %2$s%n", memberName, objectName);
+ // System.err.printf("ObjectName for Member with Name (%1$s) is %2$s%n", memberName,
+ // objectName);
return ObjectUtils.toString(connection.getAttribute(objectName, "Id"));
} finally {
@@ -146,7 +150,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
while ((pid = processIds.poll()) != null) {
if (launcherLifecycleCommands.isVmWithProcessIdRunning(pid)) {
try {
- String killCommand = String.format("%1$s %2$d", SystemUtils.isWindows() ? "taskkill /F /PID" : "kill -9", pid);
+ String killCommand = String.format("%1$s %2$d",
+ SystemUtils.isWindows() ? "taskkill /F /PID" : "kill -9", pid);
Runtime.getRuntime().exec(killCommand);
} catch (Throwable ignore) {
}
@@ -169,9 +174,11 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
}
protected Integer readPid(final File workingDirectory) throws IOException {
- assertTrue(String.format("The working directory (%1$s) must exist!", workingDirectory), workingDirectory != null && workingDirectory.isDirectory());
+ assertTrue(String.format("The working directory (%1$s) must exist!", workingDirectory),
+ workingDirectory != null && workingDirectory.isDirectory());
- File[] files = workingDirectory.listFiles(pathname -> (pathname != null && pathname.isFile() && pathname.getAbsolutePath().endsWith(".pid")));
+ File[] files = workingDirectory.listFiles(pathname -> (pathname != null && pathname.isFile()
+ && pathname.getAbsolutePath().endsWith(".pid")));
assertNotNull(files);
assertTrue(files.length > 0);
@@ -196,11 +203,13 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
protected String serviceStateStatusStringNormalized(final String serviceStateStatus) {
assertNotNull(serviceStateStatus);
- assertTrue("serviceStateStatus is missing 'Uptime': " + serviceStateStatus, serviceStateStatus.contains("Uptime"));
- assertTrue("serviceStateStatus is missing 'JVM Arguments': " + serviceStateStatus, serviceStateStatus.contains("JVM Arguments"));
+ assertTrue("serviceStateStatus is missing 'Uptime': " + serviceStateStatus,
+ serviceStateStatus.contains("Uptime"));
+ assertTrue("serviceStateStatus is missing 'JVM Arguments': " + serviceStateStatus,
+ serviceStateStatus.contains("JVM Arguments"));
return serviceStateStatus.substring(0, serviceStateStatus.indexOf("Uptime"))
- .concat(serviceStateStatus.substring(serviceStateStatus.indexOf("JVM Arguments")));
+ .concat(serviceStateStatus.substring(serviceStateStatus.indexOf("JVM Arguments")));
}
protected Status stopLocator(final File workingDirectory) {
@@ -208,14 +217,16 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
}
protected Status stopLocator(final String workingDirectory) {
- return waitForGemFireProcessToStop(new Builder().setCommand(Command.STOP).setWorkingDirectory(workingDirectory).build().stop(), workingDirectory);
+ return waitForGemFireProcessToStop(
+ new Builder().setCommand(Command.STOP).setWorkingDirectory(workingDirectory).build().stop(),
+ workingDirectory);
}
protected Status stopServer(final String workingDirectory) {
- return waitForGemFireProcessToStop(new ServerLauncher.Builder().setCommand(ServerLauncher.Command.STOP)
- .setWorkingDirectory(workingDirectory)
- .build()
- .stop(), workingDirectory);
+ return waitForGemFireProcessToStop(
+ new ServerLauncher.Builder().setCommand(ServerLauncher.Command.STOP)
+ .setWorkingDirectory(workingDirectory).build().stop(),
+ workingDirectory);
}
protected String toString(final Result result) {
@@ -231,14 +242,16 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
return buffer.toString();
}
- protected Status waitForGemFireProcessToStop(final ServiceState serviceState, final String workingDirectory) {
+ protected Status waitForGemFireProcessToStop(final ServiceState serviceState,
+ final String workingDirectory) {
if (!Status.STOPPED.equals(serviceState.getStatus())) {
try {
final Integer pid = readPid(new File(workingDirectory));
if (pid != null) {
WaitCriterion waitCriteria = new WaitCriterion() {
- private LauncherLifecycleCommands launcherLifecycleCommands = new LauncherLifecycleCommands();
+ private LauncherLifecycleCommands launcherLifecycleCommands =
+ new LauncherLifecycleCommands();
@Override
public boolean done() {
@@ -251,7 +264,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
}
};
- waitForCriterion(waitCriteria, TimeUnit.SECONDS.toMillis(15), TimeUnit.SECONDS.toMillis(5), false);
+ waitForCriterion(waitCriteria, TimeUnit.SECONDS.toMillis(15),
+ TimeUnit.SECONDS.toMillis(5), false);
if (!waitCriteria.done()) {
processIds.offer(pid);
@@ -302,9 +316,12 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, pathname);
command.addOption(CliStrings.START_LOCATOR__DIR, workingDirectory.getCanonicalPath());
command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
- command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + AvailablePortHelper.getRandomAvailableTCPPort());
+ command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION,
+ Boolean.FALSE.toString());
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX
+ + "jmx-manager-port=" + AvailablePortHelper.getRandomAvailableTCPPort());
CommandResult result = executeCommand(command.toString());
@@ -313,15 +330,19 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
String resultString = toString(result);
- assertTrue(resultString, resultString.contains("Exception in thread \"main\" java.lang.RuntimeException: A PID file already exists and a Locator may be running in " + IOUtils
- .tryGetCanonicalFileElseGetAbsoluteFile(workingDirectory)));
- assertTrue(resultString, resultString.contains("Caused by: org.apache.geode.internal.process.FileAlreadyExistsException: Pid file already exists: " + IOUtils
- .tryGetCanonicalFileElseGetAbsoluteFile(pidFile)));
+ assertTrue(resultString,
+ resultString.contains(
+ "Exception in thread \"main\" java.lang.RuntimeException: A PID file already exists and a Locator may be running in "
+ + IOUtils.tryGetCanonicalFileElseGetAbsoluteFile(workingDirectory)));
+ assertTrue(resultString,
+ resultString.contains(
+ "Caused by: org.apache.geode.internal.process.FileAlreadyExistsException: Pid file already exists: "
+ + IOUtils.tryGetCanonicalFileElseGetAbsoluteFile(pidFile)));
}
/*
- * This method makes an effort to get the PID of the running process. If it is unable to determine accurately, it
- * simply returns 1.
+ * This method makes an effort to get the PID of the running process. If it is unable to determine
+ * accurately, it simply returns 1.
*/
private int getPidOrOne() {
int pid = 1;
@@ -349,10 +370,14 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
command.addOption(CliStrings.START_LOCATOR__DIR, workingDirectory.getCanonicalPath());
command.addOption(CliStrings.START_LOCATOR__PORT, "0");
command.addOption(CliStrings.START_LOCATOR__PROPERTIES, gemfirePropertiesPathname);
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager=false");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-start=false");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager=false");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-start=false");
CommandResult result = executeCommand(command.toString());
@@ -361,11 +386,15 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
String resultString = toString(result);
- assertTrue(resultString, resultString.contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, StringUtils.EMPTY_STRING, gemfirePropertiesPathname)));
+ assertTrue(resultString,
+ resultString
+ .contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
+ StringUtils.EMPTY_STRING, gemfirePropertiesPathname)));
}
@Test
- public void test002StartLocatorFailsFastOnMissingGemFireSecurityPropertiesFile() throws IOException {
+ public void test002StartLocatorFailsFastOnMissingGemFireSecurityPropertiesFile()
+ throws IOException {
String gemfireSecurityPropertiesPathname = "/path/to/missing/gemfire-security.properties";
String pathName = getClass().getSimpleName().concat("_").concat(getTestMethodName());
final File workingDirectory = temporaryFolder.newFolder(pathName);
@@ -375,11 +404,16 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
command.addOption(CliStrings.START_LOCATOR__MEMBER_NAME, pathName);
command.addOption(CliStrings.START_LOCATOR__DIR, workingDirectory.getCanonicalPath());
command.addOption(CliStrings.START_LOCATOR__PORT, "0");
- command.addOption(CliStrings.START_LOCATOR__SECURITY_PROPERTIES, gemfireSecurityPropertiesPathname);
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager=false");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-start=false");
+ command.addOption(CliStrings.START_LOCATOR__SECURITY_PROPERTIES,
+ gemfireSecurityPropertiesPathname);
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager=false");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-start=false");
CommandResult result = executeCommand(command.toString());
@@ -388,7 +422,10 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
String resultString = toString(result);
- assertTrue(resultString, resultString.contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ", gemfireSecurityPropertiesPathname)));
+ assertTrue(resultString,
+ resultString
+ .contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
+ "Security ", gemfireSecurityPropertiesPathname)));
}
@Test
@@ -410,7 +447,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
String resultString = toString(result);
- assertTrue(resultString, resultString.contains(MessageFormat.format(CliStrings.CACHE_XML_NOT_FOUND_MESSAGE, cacheXmlPathname)));
+ assertTrue(resultString, resultString
+ .contains(MessageFormat.format(CliStrings.CACHE_XML_NOT_FOUND_MESSAGE, cacheXmlPathname)));
}
@Test
@@ -433,7 +471,10 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
String resultString = toString(result);
- assertTrue(resultString, resultString.contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, StringUtils.EMPTY_STRING, gemfirePropertiesFile)));
+ assertTrue(resultString,
+ resultString
+ .contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
+ StringUtils.EMPTY_STRING, gemfirePropertiesFile)));
}
@Test
@@ -459,7 +500,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
}
@Test
- public void test005StartServerFailsFastOnMissingGemFireSecurityPropertiesFile() throws IOException {
+ public void test005StartServerFailsFastOnMissingGemFireSecurityPropertiesFile()
+ throws IOException {
String gemfireSecuritiesPropertiesFile = "/path/to/missing/gemfire-securities.properties";
CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER);
@@ -469,7 +511,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
command.addOption(CliStrings.START_SERVER__NAME, pathName);
command.addOption(CliStrings.START_SERVER__DIR, workingDirectory.getCanonicalPath());
- command.addOption(CliStrings.START_SERVER__SECURITY_PROPERTIES, gemfireSecuritiesPropertiesFile);
+ command.addOption(CliStrings.START_SERVER__SECURITY_PROPERTIES,
+ gemfireSecuritiesPropertiesFile);
CommandResult result = executeCommand(command.toString());
@@ -478,7 +521,10 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
String resultString = toString(result);
- assertTrue(resultString, resultString.contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE, "Security ", gemfireSecuritiesPropertiesFile)));
+ assertTrue(resultString,
+ resultString
+ .contains(MessageFormat.format(CliStrings.GEODE_0_PROPERTIES_1_NOT_FOUND_MESSAGE,
+ "Security ", gemfireSecuritiesPropertiesFile)));
}
@Test
@@ -497,9 +543,12 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
command.addOption(CliStrings.START_LOCATOR__CONNECT, Boolean.FALSE.toString());
command.addOption(CliStrings.START_LOCATOR__DIR, pathname);
command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
- command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + AvailablePortHelper.getRandomAvailableTCPPort());
+ command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION,
+ Boolean.FALSE.toString());
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX
+ + "jmx-manager-port=" + AvailablePortHelper.getRandomAvailableTCPPort());
CommandResult result = executeCommand(command.toString());
@@ -509,7 +558,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
String locatorOutput = toString(result);
assertNotNull(locatorOutput);
- assertTrue("Locator output was: " + locatorOutput, locatorOutput.contains("Locator in " + IOUtils.tryGetCanonicalFileElseGetAbsoluteFile(workingDirectory)));
+ assertTrue("Locator output was: " + locatorOutput, locatorOutput.contains(
+ "Locator in " + IOUtils.tryGetCanonicalFileElseGetAbsoluteFile(workingDirectory)));
} finally {
stopLocator(workingDirectory);
}
@@ -517,11 +567,14 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
@Test
public void test007StatusLocatorUsingMemberNameIDWhenGfshIsNotConnected() {
- CommandResult result = executeCommand(CliStrings.STATUS_LOCATOR + " --name=" + getTestMethodName());
+ CommandResult result =
+ executeCommand(CliStrings.STATUS_LOCATOR + " --name=" + getTestMethodName());
assertNotNull(result);
assertEquals(Result.Status.ERROR, result.getStatus());
- assertEquals(CliStrings.format(CliStrings.STATUS_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE, "Locator"), StringUtils.trim(toString(result)));
+ assertEquals(
+ CliStrings.format(CliStrings.STATUS_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE, "Locator"),
+ StringUtils.trim(toString(result)));
}
@Test
@@ -543,45 +596,54 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
command.addOption(CliStrings.START_LOCATOR__CONNECT, Boolean.FALSE.toString());
command.addOption(CliStrings.START_LOCATOR__DIR, workingDirectory.getCanonicalPath());
command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
- command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
+ command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION,
+ Boolean.FALSE.toString());
command.addOption(CliStrings.START_LOCATOR__FORCE, Boolean.TRUE.toString());
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
CommandResult result = executeCommand(command.toString());
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- LocatorLauncher locatorLauncher = new LocatorLauncher.Builder().setCommand(LocatorLauncher.Command.STATUS)
- .setBindAddress(null)
- .setPort(locatorPort)
- .setWorkingDirectory(workingDirectory.getPath())
- .build();
+ LocatorLauncher locatorLauncher = new LocatorLauncher.Builder()
+ .setCommand(LocatorLauncher.Command.STATUS).setBindAddress(null).setPort(locatorPort)
+ .setWorkingDirectory(workingDirectory.getPath()).build();
assertNotNull(locatorLauncher);
- LocatorState expectedLocatorState = locatorLauncher.waitOnStatusResponse(60, 10, TimeUnit.SECONDS);
+ LocatorState expectedLocatorState =
+ locatorLauncher.waitOnStatusResponse(60, 10, TimeUnit.SECONDS);
assertNotNull(expectedLocatorState);
assertEquals(Status.ONLINE, expectedLocatorState.getStatus());
- result = executeCommand(String.format("%1$s --locator=localhost[%2$d]", CliStrings.CONNECT, locatorPort));
+ result = executeCommand(
+ String.format("%1$s --locator=localhost[%2$d]", CliStrings.CONNECT, locatorPort));
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- result = executeCommand(String.format("%1$s --name=invalidLocatorMemberName", CliStrings.STATUS_LOCATOR));
+ result = executeCommand(
+ String.format("%1$s --name=invalidLocatorMemberName", CliStrings.STATUS_LOCATOR));
assertNotNull(result);
assertEquals(Result.Status.ERROR, result.getStatus());
- assertEquals(CliStrings.format(CliStrings.STATUS_LOCATOR__NO_LOCATOR_FOUND_FOR_MEMBER_ERROR_MESSAGE, "invalidLocatorMemberName"), StringUtils.trim(toString(result)));
+ assertEquals(
+ CliStrings.format(CliStrings.STATUS_LOCATOR__NO_LOCATOR_FOUND_FOR_MEMBER_ERROR_MESSAGE,
+ "invalidLocatorMemberName"),
+ StringUtils.trim(toString(result)));
- result = executeCommand(String.format("%1$s --name=%2$s", CliStrings.STATUS_LOCATOR, pathname));
+ result =
+ executeCommand(String.format("%1$s --name=%2$s", CliStrings.STATUS_LOCATOR, pathname));
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- assertTrue(serviceStateStatusStringNormalized(toString(result)).contains(serviceStateStatusStringNormalized(expectedLocatorState)));
+ assertTrue(serviceStateStatusStringNormalized(toString(result))
+ .contains(serviceStateStatusStringNormalized(expectedLocatorState)));
} finally {
stopLocator(workingDirectory);
}
@@ -606,39 +668,44 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
command.addOption(CliStrings.START_LOCATOR__CONNECT, Boolean.FALSE.toString());
command.addOption(CliStrings.START_LOCATOR__DIR, workingDirectory.getCanonicalPath());
command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
- command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
+ command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION,
+ Boolean.FALSE.toString());
command.addOption(CliStrings.START_LOCATOR__FORCE, Boolean.TRUE.toString());
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
CommandResult result = executeCommand(command.toString());
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- LocatorLauncher locatorLauncher = new LocatorLauncher.Builder().setCommand(LocatorLauncher.Command.STATUS)
- .setBindAddress(null)
- .setPort(locatorPort)
- .setWorkingDirectory(workingDirectory.getPath())
- .build();
+ LocatorLauncher locatorLauncher = new LocatorLauncher.Builder()
+ .setCommand(LocatorLauncher.Command.STATUS).setBindAddress(null).setPort(locatorPort)
+ .setWorkingDirectory(workingDirectory.getPath()).build();
assertNotNull(locatorLauncher);
- LocatorState expectedLocatorState = locatorLauncher.waitOnStatusResponse(60, 10, TimeUnit.SECONDS);
+ LocatorState expectedLocatorState =
+ locatorLauncher.waitOnStatusResponse(60, 10, TimeUnit.SECONDS);
assertNotNull(expectedLocatorState);
assertEquals(Status.ONLINE, expectedLocatorState.getStatus());
- result = executeCommand(String.format("%1$s --locator=localhost[%2$d]", CliStrings.CONNECT, locatorPort));
+ result = executeCommand(
+ String.format("%1$s --locator=localhost[%2$d]", CliStrings.CONNECT, locatorPort));
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- result = executeCommand(String.format("%1$s --name=%2$s", CliStrings.STATUS_LOCATOR, getMemberId(jmxManagerPort, pathname)));
+ result = executeCommand(String.format("%1$s --name=%2$s", CliStrings.STATUS_LOCATOR,
+ getMemberId(jmxManagerPort, pathname)));
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- assertTrue(serviceStateStatusStringNormalized(toString(result)).contains(serviceStateStatusStringNormalized(expectedLocatorState)));
+ assertTrue(serviceStateStatusStringNormalized(toString(result))
+ .contains(serviceStateStatusStringNormalized(expectedLocatorState)));
} finally {
stopLocator(workingDirectory);
}
@@ -646,11 +713,14 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
@Test
public void test010StopLocatorUsingMemberNameIDWhenGfshIsNotConnected() {
- CommandResult result = executeCommand(CliStrings.STOP_LOCATOR + " --name=" + getTestMethodName());
+ CommandResult result =
+ executeCommand(CliStrings.STOP_LOCATOR + " --name=" + getTestMethodName());
assertNotNull(result);
assertEquals(Result.Status.ERROR, result.getStatus());
- assertEquals(CliStrings.format(CliStrings.STOP_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE, "Locator"), StringUtils.trim(toString(result)));
+ assertEquals(
+ CliStrings.format(CliStrings.STOP_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE, "Locator"),
+ StringUtils.trim(toString(result)));
}
@Test
@@ -672,21 +742,22 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
command.addOption(CliStrings.START_LOCATOR__CONNECT, Boolean.FALSE.toString());
command.addOption(CliStrings.START_LOCATOR__DIR, workingDirectory.getCanonicalPath());
command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
- command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
+ command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION,
+ Boolean.FALSE.toString());
command.addOption(CliStrings.START_LOCATOR__FORCE, Boolean.TRUE.toString());
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
CommandResult result = executeCommand(command.toString());
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- final LocatorLauncher locatorLauncher = new Builder().setCommand(Command.STOP)
- .setBindAddress(null)
- .setPort(locatorPort)
- .setWorkingDirectory(workingDirectory.getPath())
- .build();
+ final LocatorLauncher locatorLauncher =
+ new Builder().setCommand(Command.STOP).setBindAddress(null).setPort(locatorPort)
+ .setWorkingDirectory(workingDirectory.getPath()).build();
assertNotNull(locatorLauncher);
@@ -695,16 +766,21 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertNotNull(locatorStatus);
assertEquals(Status.ONLINE, locatorStatus.getStatus());
- result = executeCommand(String.format("%1$s --locator=localhost[%2$d]", CliStrings.CONNECT, locatorPort));
+ result = executeCommand(
+ String.format("%1$s --locator=localhost[%2$d]", CliStrings.CONNECT, locatorPort));
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- result = executeCommand(String.format("%1$s --name=invalidLocatorMemberName", CliStrings.STOP_LOCATOR));
+ result = executeCommand(
+ String.format("%1$s --name=invalidLocatorMemberName", CliStrings.STOP_LOCATOR));
assertNotNull(result);
assertEquals(Result.Status.ERROR, result.getStatus());
- assertEquals(CliStrings.format(CliStrings.STOP_LOCATOR__NO_LOCATOR_FOUND_FOR_MEMBER_ERROR_MESSAGE, "invalidLocatorMemberName"), StringUtils.trim(toString(result)));
+ assertEquals(
+ CliStrings.format(CliStrings.STOP_LOCATOR__NO_LOCATOR_FOUND_FOR_MEMBER_ERROR_MESSAGE,
+ "invalidLocatorMemberName"),
+ StringUtils.trim(toString(result)));
locatorStatus = locatorLauncher.status();
@@ -716,10 +792,12 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- // TODO figure out what output to assert and validate on now that 'stop locator' uses Gfsh's logger
+ // TODO figure out what output to assert and validate on now that 'stop locator' uses Gfsh's
+ // logger
// and standard err/out...
- //assertIndexDetailsEquals(CliStrings.format(CliStrings.STOP_LOCATOR__SHUTDOWN_MEMBER_MESSAGE, pathname),
- // StringUtils.trim(toString(result)));
+ // assertIndexDetailsEquals(CliStrings.format(CliStrings.STOP_LOCATOR__SHUTDOWN_MEMBER_MESSAGE,
+ // pathname),
+ // StringUtils.trim(toString(result)));
WaitCriterion waitCriteria = new WaitCriterion() {
@Override
@@ -765,21 +843,22 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
command.addOption(CliStrings.START_LOCATOR__CONNECT, Boolean.FALSE.toString());
command.addOption(CliStrings.START_LOCATOR__DIR, workingDirectory.getCanonicalPath());
command.addOption(CliStrings.START_LOCATOR__PORT, String.valueOf(locatorPort));
- command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION, Boolean.FALSE.toString());
+ command.addOption(CliStrings.START_LOCATOR__ENABLE__SHARED__CONFIGURATION,
+ Boolean.FALSE.toString());
command.addOption(CliStrings.START_LOCATOR__FORCE, Boolean.TRUE.toString());
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
- command.addOption(CliStrings.START_LOCATOR__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "http-service-port=0");
+ command.addOption(CliStrings.START_LOCATOR__J,
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "jmx-manager-port=" + jmxManagerPort);
CommandResult result = executeCommand(command.toString());
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- final LocatorLauncher locatorLauncher = new Builder().setCommand(Command.STOP)
- .setBindAddress(null)
- .setPort(locatorPort)
- .setWorkingDirectory(workingDirectory.getPath())
- .build();
+ final LocatorLauncher locatorLauncher =
+ new Builder().setCommand(Command.STOP).setBindAddress(null).setPort(locatorPort)
+ .setWorkingDirectory(workingDirectory.getPath()).build();
assertNotNull(locatorLauncher);
@@ -788,7 +867,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertNotNull(locatorState);
assertEquals(Status.ONLINE, locatorState.getStatus());
- result = executeCommand(String.format("%1$s --locator=localhost[%2$d]", CliStrings.CONNECT, locatorPort));
+ result = executeCommand(
+ String.format("%1$s --locator=localhost[%2$d]", CliStrings.CONNECT, locatorPort));
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
@@ -800,10 +880,12 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- // TODO figure out what output to assert and validate on now that 'stop locator' uses Gfsh's logger
+ // TODO figure out what output to assert and validate on now that 'stop locator' uses Gfsh's
+ // logger
// and standard err/out...
- //assertIndexDetailsEquals(CliStrings.format(CliStrings.STOP_LOCATOR__SHUTDOWN_MEMBER_MESSAGE, memberId),
- // StringUtils.trim(toString(result)));
+ // assertIndexDetailsEquals(CliStrings.format(CliStrings.STOP_LOCATOR__SHUTDOWN_MEMBER_MESSAGE,
+ // memberId),
+ // StringUtils.trim(toString(result)));
WaitCriterion waitCriteria = new WaitCriterion() {
@Override
@@ -841,15 +923,18 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
CommandStringBuilder command = new CommandStringBuilder(CliStrings.START_SERVER);
- command.addOption(CliStrings.START_SERVER__NAME, pathname + TIMESTAMP.format(Calendar.getInstance().getTime()));
+ command.addOption(CliStrings.START_SERVER__NAME,
+ pathname + TIMESTAMP.format(Calendar.getInstance().getTime()));
command.addOption(CliStrings.START_SERVER__SERVER_PORT, String.valueOf(serverPort));
command.addOption(CliStrings.START_SERVER__USE_CLUSTER_CONFIGURATION, Boolean.FALSE.toString());
command.addOption(CliStrings.START_SERVER__MAXHEAP, "10M");
command.addOption(CliStrings.START_SERVER__LOG_LEVEL, "config");
command.addOption(CliStrings.START_SERVER__DIR, workingDirectory.getCanonicalPath());
- command.addOption(CliStrings.START_SERVER__CACHE_XML_FILE, IOUtils.tryGetCanonicalPathElseGetAbsolutePath(writeAndGetCacheXmlFile(workingDirectory)));
+ command.addOption(CliStrings.START_SERVER__CACHE_XML_FILE,
+ IOUtils.tryGetCanonicalPathElseGetAbsolutePath(writeAndGetCacheXmlFile(workingDirectory)));
command.addOption(CliStrings.START_SERVER__INCLUDE_SYSTEM_CLASSPATH);
- command.addOption(CliStrings.START_SERVER__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + "" + START_LOCATOR + "=localhost[" + locatorPort + "]");
+ command.addOption(CliStrings.START_SERVER__J, "-D" + DistributionConfig.GEMFIRE_PREFIX + ""
+ + START_LOCATOR + "=localhost[" + locatorPort + "]");
CommandResult result = executeCommand(command.toString());
@@ -858,9 +943,10 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertNotNull(result);
assertEquals(Result.Status.OK, result.getStatus());
- ServerLauncher serverLauncher = new ServerLauncher.Builder().setCommand(ServerLauncher.Command.STATUS)
- .setWorkingDirectory(IOUtils.tryGetCanonicalPathElseGetAbsolutePath(workingDirectory))
- .build();
+ ServerLauncher serverLauncher =
+ new ServerLauncher.Builder().setCommand(ServerLauncher.Command.STATUS)
+ .setWorkingDirectory(IOUtils.tryGetCanonicalPathElseGetAbsolutePath(workingDirectory))
+ .build();
assertNotNull(serverLauncher);
@@ -890,7 +976,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
final int serverPid = serverState.getPid();
WaitCriterion waitCriteria = new WaitCriterion() {
- private LauncherLifecycleCommands launcherLifecycleCommands = new LauncherLifecycleCommands();
+ private LauncherLifecycleCommands launcherLifecycleCommands =
+ new LauncherLifecycleCommands();
@Override
public boolean done() {
@@ -903,7 +990,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
}
};
- waitForCriterion(waitCriteria, TimeUnit.SECONDS.toMillis(30), TimeUnit.SECONDS.toMillis(10), true);
+ waitForCriterion(waitCriteria, TimeUnit.SECONDS.toMillis(30), TimeUnit.SECONDS.toMillis(10),
+ true);
// Verify our GemFire Server JVM process is was terminated!
assertFalse(new LauncherLifecycleCommands().isVmWithProcessIdRunning(serverState.getPid()));
@@ -920,7 +1008,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
StringBuilder buffer = new StringBuilder("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
buffer.append(StringUtils.LINE_SEPARATOR);
- buffer.append("<!DOCTYPE cache PUBLIC \"-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN\"");
+ buffer.append(
+ "<!DOCTYPE cache PUBLIC \"-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN\"");
buffer.append(StringUtils.LINE_SEPARATOR);
buffer.append(" \"http://www.gemstone.com/dtd/cache7_0.dtd\">");
buffer.append(StringUtils.LINE_SEPARATOR);
@@ -933,7 +1022,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
BufferedWriter fileWriter = null;
try {
- fileWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(cacheXml, false), Charset.forName("UTF-8").newEncoder()));
+ fileWriter = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(cacheXml, false),
+ Charset.forName("UTF-8").newEncoder()));
fileWriter.write(buffer.toString());
fileWriter.flush();
} finally {
@@ -944,7 +1034,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
}
private ClientCache setupClientCache(final String durableClientId, final int serverPort) {
- ClientCache clientCache = new ClientCacheFactory().set(DURABLE_CLIENT_ID, durableClientId).create();
+ ClientCache clientCache =
+ new ClientCacheFactory().set(DURABLE_CLIENT_ID, durableClientId).create();
PoolFactory poolFactory = PoolManager.createFactory();
@@ -957,7 +1048,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
assertNotNull("The 'serverConnectionPool' was not properly configured and initialized!", pool);
- ClientRegionFactory<Long, String> regionFactory = clientCache.createClientRegionFactory(ClientRegionShortcut.PROXY);
+ ClientRegionFactory<Long, String> regionFactory =
+ clientCache.createClientRegionFactory(ClientRegionShortcut.PROXY);
regionFactory.setPoolName(pool.getName());
regionFactory.setKeyConstraint(Long.class);
@@ -965,7 +1057,8 @@ public class LauncherLifecycleCommandsDUnitTest extends CliCommandTestBase {
Region<Long, String> exampleProxy = regionFactory.create("Example");
- assertNotNull("The 'Example' Client Region was not properly configured and initialized", exampleProxy);
+ assertNotNull("The 'Example' Client Region was not properly configured and initialized",
+ exampleProxy);
return clientCache;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
index be77c7e..1872a84 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsIntegrationTest.java
@@ -1,18 +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
+ * 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.management.internal.cli.commands;
@@ -42,8 +40,8 @@ import org.apache.geode.internal.util.IOUtils;
import org.apache.geode.test.junit.categories.IntegrationTest;
/**
- * The LauncherLifecycleCommandsJUnitTest class is a test suite of test cases testing the contract and functionality of
- * the lifecycle launcher GemFire shell (Gfsh) commands.
+ * The LauncherLifecycleCommandsJUnitTest class is a test suite of test cases testing the contract
+ * and functionality of the lifecycle launcher GemFire shell (Gfsh) commands.
*
* @see org.apache.geode.management.internal.cli.commands.LauncherLifecycleCommands
* @see org.junit.Assert
@@ -78,12 +76,13 @@ public class LauncherLifecycleCommandsIntegrationTest {
assertNotNull(coreDependenciesJar);
assertTrue(coreDependenciesJar + " is not a file", coreDependenciesJar.isFile());
- Collection<String> expectedJarDependencies = Arrays.asList("antlr", "commons-io", "commons-lang", "commons-logging",
- "geode", "jackson-annotations", "jackson-core", "jackson-databind", "jansi", "jline", "snappy",
- "spring-core", "spring-shell", "jetty-server", "jetty-servlet", "jetty-webapp", "jetty-util", "jetty-http",
- "servlet-api", "jetty-io", "jetty-security", "jetty-xml"
+ Collection<String> expectedJarDependencies =
+ Arrays.asList("antlr", "commons-io", "commons-lang", "commons-logging", "geode",
+ "jackson-annotations", "jackson-core", "jackson-databind", "jansi", "jline", "snappy",
+ "spring-core", "spring-shell", "jetty-server", "jetty-servlet", "jetty-webapp",
+ "jetty-util", "jetty-http", "servlet-api", "jetty-io", "jetty-security", "jetty-xml"
- );
+ );
assertJarFileManifestClassPath(coreDependenciesJar, expectedJarDependencies);
}
@@ -93,7 +92,8 @@ public class LauncherLifecycleCommandsIntegrationTest {
final int expectedPid = 12345;
File folder = temporaryFolder.newFolder();
- File pidFile = new File(folder, getClass().getSimpleName() + "_" + testName.getMethodName() + ".pid");
+ File pidFile =
+ new File(folder, getClass().getSimpleName() + "_" + testName.getMethodName() + ".pid");
assertTrue(pidFile.createNewFile());
@@ -118,7 +118,7 @@ public class LauncherLifecycleCommandsIntegrationTest {
}
private void assertJarFileManifestClassPath(final File dependenciesJar,
- final Collection<String> expectedJarDependencies) throws IOException {
+ final Collection<String> expectedJarDependencies) throws IOException {
JarFile dependenciesJarFile = new JarFile(dependenciesJar);
Manifest manifest = dependenciesJarFile.getManifest();
@@ -132,19 +132,23 @@ public class LauncherLifecycleCommandsIntegrationTest {
String[] actualJarDependencies = attributes.getValue(Name.CLASS_PATH).split(" ");
assertNotNull(actualJarDependencies);
- assertTrue(String.format("Expected the actual number of JAR dependencies to be (%1$d); but was (%2$d)!",
+ assertTrue(
+ String.format(
+ "Expected the actual number of JAR dependencies to be (%1$d); but was (%2$d)!",
expectedJarDependencies.size(), actualJarDependencies.length),
- actualJarDependencies.length >= expectedJarDependencies.size());
- //assertTrue(Arrays.asList(actualJarDependencies).containsAll(expectedJarDependencies));
+ actualJarDependencies.length >= expectedJarDependencies.size());
+ // assertTrue(Arrays.asList(actualJarDependencies).containsAll(expectedJarDependencies));
List<String> actualJarDependenciesList = new ArrayList<>(Arrays.asList(actualJarDependencies));
- List<String> missingExpectedJarDependenciesList = new ArrayList<>(expectedJarDependencies.size());
+ List<String> missingExpectedJarDependenciesList =
+ new ArrayList<>(expectedJarDependencies.size());
for (String expectedJarDependency : expectedJarDependencies) {
boolean containsExpectedJar = false;
for (int index = 0, size = actualJarDependenciesList.size(); index < size; index++) {
- if (actualJarDependenciesList.get(index).toLowerCase().contains(expectedJarDependency.toLowerCase())) {
+ if (actualJarDependenciesList.get(index).toLowerCase()
+ .contains(expectedJarDependency.toLowerCase())) {
actualJarDependenciesList.remove(index);
containsExpectedJar = true;
break;
@@ -156,10 +160,12 @@ public class LauncherLifecycleCommandsIntegrationTest {
}
}
- assertTrue(String.format(
+ assertTrue(
+ String.format(
"GemFire dependencies JAR file (%1$s) does not contain the expected dependencies (%2$s) in the Manifest Class-Path attribute (%3$s)!",
- dependenciesJar, missingExpectedJarDependenciesList, attributes.getValue(Name.CLASS_PATH)),
- missingExpectedJarDependenciesList.isEmpty());
+ dependenciesJar, missingExpectedJarDependenciesList,
+ attributes.getValue(Name.CLASS_PATH)),
+ missingExpectedJarDependenciesList.isEmpty());
}
}
[10/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
index ac75f38..40a514a 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -38,215 +36,208 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
/**
- * This class uses the JMX Attributes/Operations that use (return/throw)
- * GemFire types. This is the single MBean accessible with ObjectName string
- * {@link MemberInfoWithStatsMBean#MBEAN_NAME}}. This MBean can be used to
- * retrieve the all member details as plain java types.
+ * This class uses the JMX Attributes/Operations that use (return/throw) GemFire types. This is the
+ * single MBean accessible with ObjectName string {@link MemberInfoWithStatsMBean#MBEAN_NAME}}. This
+ * MBean can be used to retrieve the all member details as plain java types.
*
- * This MBean also acts as a Notification Hub for all the Notifications that are
- * defined for Admin Distributed System.
+ * This MBean also acts as a Notification Hub for all the Notifications that are defined for Admin
+ * Distributed System.
*
*
* @since GemFire 6.5
*/
-public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
- implements NotificationEmitter {
+public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements NotificationEmitter {
private static final Logger logger = LogService.getLogger();
-
+
/* constants defining max no of attributes/operations/notifications */
- private static final int MAX_ATTRIBUTES_COUNT = 3;
- private static final int MAX_OPERATIONS_COUNT = 3;
+ private static final int MAX_ATTRIBUTES_COUNT = 3;
+ private static final int MAX_OPERATIONS_COUNT = 3;
private static final int MAX_NOTIFICATIONS_COUNT = 9;
-
+
private static final String NOT_AVAILABLE_STR = "N/A";
private static final String NOT_AVAILABLE = null;
private static final Number NOT_AVAILABLE_NUMBER = null;
- /* String constant used for a region that is used on admin side just as a root
- * for rootRegions defined on the member */
+ /*
+ * String constant used for a region that is used on admin side just as a root for rootRegions
+ * defined on the member
+ */
private static final String PLACE_HOLDER_ROOT_REGION = "/Root/";
/* String that are used to form QueryExp/ObjectName for querying MBeanServer */
- private static final String REGION_QUERY_EXPRESSION = "*GemFire.Cache*:*,owner={0},type=Region";
- private static final String STATS_QUERY_EXPRESSION = "*GemFire.Statistic*:*,source={0},name={1}";
-
+ private static final String REGION_QUERY_EXPRESSION = "*GemFire.Cache*:*,owner={0},type=Region";
+ private static final String STATS_QUERY_EXPRESSION = "*GemFire.Statistic*:*,source={0},name={1}";
+
/** mbean name string for this MBean */
- /*default*/static final String MBEAN_NAME = "GemFire:type=MemberInfoWithStatsMBean";
+ /* default */static final String MBEAN_NAME = "GemFire:type=MemberInfoWithStatsMBean";
/** ObjectName handle for this MBean */
private ObjectName objectName;
-
+
/** version of the GemFire Enterprise system that is running */
- private String version;
- private int refreshInterval;
- private String id;
-
- private Agent agent;
+ private String version;
+ private int refreshInterval;
+ private String id;
+
+ private Agent agent;
private AdminDistributedSystemJmxImpl adminDSJmx;
-
- private NotificationForwarder forwarder;
- private boolean isInitialized;//needs synchronization?
+
+ private NotificationForwarder forwarder;
+ private boolean isInitialized;// needs synchronization?
/**
* Default Constructor
*
* @param agent Admin Agent instance
* @throws OperationsException if ObjectName can't be formed for this MBean
- * @throws MBeanRegistrationException
- * @throws AdminException
+ * @throws MBeanRegistrationException
+ * @throws AdminException
*/
- MemberInfoWithStatsMBean(Agent agent) throws OperationsException, MBeanRegistrationException, AdminException {
- this.agent = agent;
- this.objectName = ObjectName.getInstance(MBEAN_NAME);
- this.version = GemFireVersion.getGemFireVersion();
+ MemberInfoWithStatsMBean(Agent agent)
+ throws OperationsException, MBeanRegistrationException, AdminException {
+ this.agent = agent;
+ this.objectName = ObjectName.getInstance(MBEAN_NAME);
+ this.version = GemFireVersion.getGemFireVersion();
this.refreshInterval = -1;
- this.id = NOT_AVAILABLE_STR;
- this.forwarder = new NotificationForwarder(agent.getMBeanServer());
+ this.id = NOT_AVAILABLE_STR;
+ this.forwarder = new NotificationForwarder(agent.getMBeanServer());
}
/**
- * Returns attributes defined for this MBean as an array of
- * MBeanAttributeInfo objects.
+ * Returns attributes defined for this MBean as an array of MBeanAttributeInfo objects.
*
* @return attributes defined as an array of MBeanAttributeInfo objects.
*/
@Override
protected MBeanAttributeInfo[] createMBeanAttributeInfo() {
MBeanAttributeInfo[] attributesInfo = new MBeanAttributeInfo[MAX_ATTRIBUTES_COUNT];
-
- /* First letter in attribute name has to be 'V' so that getVersion is
- * called. With 'v' it looks for getversion, same for others */
- attributesInfo[0] = new MBeanAttributeInfo("Version",
- String.class.getName(),
- "GemFire Enterprise Version",
- true, /*readable*/
- false, /*writable*/
- false);/*has getter with name like 'is****'*/
-
- attributesInfo[1] = new MBeanAttributeInfo("RefreshInterval",
- String.class.getName(),
- "The interval (in seconds) between auto-polling for updating member & statistics resources. If this is '-1', it means the this MBean has not yet been initialized. First call to getMembers operation will initialize this MBean.",
- true, /*readable*/
- false, /*writable*/
- false);/*has getter with name like 'is****'*/
-
- attributesInfo[2] = new MBeanAttributeInfo("Id",
- String.class.getName(),
- "Identifier of the GemFire Enterprise. If this is 'N/A', it means the this MBean has not yet been initialized. First call to getMembers operation will initialize this MBean.",
- true, /*readable*/
- false, /*writable*/
- false);/*has getter with name like 'is****'*/
-
-
+
+ /*
+ * First letter in attribute name has to be 'V' so that getVersion is called. With 'v' it looks
+ * for getversion, same for others
+ */
+ attributesInfo[0] = new MBeanAttributeInfo("Version", String.class.getName(),
+ "GemFire Enterprise Version", true, /* readable */
+ false, /* writable */
+ false);/* has getter with name like 'is****' */
+
+ attributesInfo[1] = new MBeanAttributeInfo("RefreshInterval", String.class.getName(),
+ "The interval (in seconds) between auto-polling for updating member & statistics resources. If this is '-1', it means the this MBean has not yet been initialized. First call to getMembers operation will initialize this MBean.",
+ true, /* readable */
+ false, /* writable */
+ false);/* has getter with name like 'is****' */
+
+ attributesInfo[2] = new MBeanAttributeInfo("Id", String.class.getName(),
+ "Identifier of the GemFire Enterprise. If this is 'N/A', it means the this MBean has not yet been initialized. First call to getMembers operation will initialize this MBean.",
+ true, /* readable */
+ false, /* writable */
+ false);/* has getter with name like 'is****' */
+
+
return attributesInfo;
}
-
+
/**
- * Returns operations defined for this MBean as an array of
- * MBeanOperationInfo objects.
+ * Returns operations defined for this MBean as an array of MBeanOperationInfo objects.
*
- * @return operations defined as an array of MBeanOperationInfo objects.
+ * @return operations defined as an array of MBeanOperationInfo objects.
*/
@Override
protected MBeanOperationInfo[] createMBeanOperationInfo() {
MBeanOperationInfo[] operationsInfo = new MBeanOperationInfo[MAX_OPERATIONS_COUNT];
-
- operationsInfo[0] = new MBeanOperationInfo("getMembers",
- "Returns ids as strings for all the members - Application Peers & Cache Servers.",
- new MBeanParameterInfo[] {},
- String[].class.getName(),
- MBeanOperationInfo.ACTION_INFO);
-
+
+ operationsInfo[0] = new MBeanOperationInfo("getMembers",
+ "Returns ids as strings for all the members - Application Peers & Cache Servers.",
+ new MBeanParameterInfo[] {}, String[].class.getName(), MBeanOperationInfo.ACTION_INFO);
+
MBeanParameterInfo[] getMemberDetailsArgs = new MBeanParameterInfo[1];
- getMemberDetailsArgs[0] = new MBeanParameterInfo("memberId", String.class.getName(), "Id of the member for all the details are to be retrieved.");
- operationsInfo[1] = new MBeanOperationInfo("getMemberDetails",
- "Returns details for a given member",
- getMemberDetailsArgs,
- Map.class.getName(),
- MBeanOperationInfo.ACTION_INFO);
-
- /* For retrieving ObjectNames of existing Region MBeans, MBeanServerConnection.queryMBeans(), could be called */
+ getMemberDetailsArgs[0] = new MBeanParameterInfo("memberId", String.class.getName(),
+ "Id of the member for all the details are to be retrieved.");
+ operationsInfo[1] =
+ new MBeanOperationInfo("getMemberDetails", "Returns details for a given member",
+ getMemberDetailsArgs, Map.class.getName(), MBeanOperationInfo.ACTION_INFO);
+
+ /*
+ * For retrieving ObjectNames of existing Region MBeans, MBeanServerConnection.queryMBeans(),
+ * could be called
+ */
MBeanParameterInfo[] getRegionSnapArgs = new MBeanParameterInfo[1];
- getRegionSnapArgs[0] = new MBeanParameterInfo("memberId", String.class.getName(), "Id of the member on which we want to discover all the region MBean.");
- operationsInfo[2] = new MBeanOperationInfo("getRegions",
- "Returns a java.util.Map of details of regions on a member",
- getRegionSnapArgs,
- Map.class.getName(),
- MBeanOperationInfo.ACTION_INFO);
-
-
+ getRegionSnapArgs[0] = new MBeanParameterInfo("memberId", String.class.getName(),
+ "Id of the member on which we want to discover all the region MBean.");
+ operationsInfo[2] = new MBeanOperationInfo("getRegions",
+ "Returns a java.util.Map of details of regions on a member", getRegionSnapArgs,
+ Map.class.getName(), MBeanOperationInfo.ACTION_INFO);
+
+
return operationsInfo;
}
/**
- * Returns notifications defined for this MBean as an array of
- * MBeanNotificationInfo objects.
+ * Returns notifications defined for this MBean as an array of MBeanNotificationInfo objects.
*
- * @return notification definitions as an array of MBeanNotificationInfo
- * objects.
+ * @return notification definitions as an array of MBeanNotificationInfo objects.
*/
@Override
protected MBeanNotificationInfo[] createMBeanNotificationInfo() {
MBeanNotificationInfo[] notificationsInfo = new MBeanNotificationInfo[MAX_NOTIFICATIONS_COUNT];
-
+
String[] notificationTypes = new String[] {AdminDistributedSystemJmxImpl.NOTIF_MEMBER_JOINED};
- notificationsInfo[0] = new MBeanNotificationInfo(notificationTypes,
- Notification.class.getName(),
- "A GemFire manager, cache, or other member has joined this distributed system.");
-
+ notificationsInfo[0] =
+ new MBeanNotificationInfo(notificationTypes, Notification.class.getName(),
+ "A GemFire manager, cache, or other member has joined this distributed system.");
+
notificationTypes = new String[] {AdminDistributedSystemJmxImpl.NOTIF_MEMBER_LEFT};
- notificationsInfo[1] = new MBeanNotificationInfo(notificationTypes,
- Notification.class.getName(),
- "A GemFire manager, cache, or other member has left the distributed system.");
-
+ notificationsInfo[1] =
+ new MBeanNotificationInfo(notificationTypes, Notification.class.getName(),
+ "A GemFire manager, cache, or other member has left the distributed system.");
+
notificationTypes = new String[] {AdminDistributedSystemJmxImpl.NOTIF_MEMBER_CRASHED};
- notificationsInfo[2] = new MBeanNotificationInfo(notificationTypes,
- Notification.class.getName(),
- "A member of this distributed system has crashed instead of leaving cleanly.");
-
+ notificationsInfo[2] =
+ new MBeanNotificationInfo(notificationTypes, Notification.class.getName(),
+ "A member of this distributed system has crashed instead of leaving cleanly.");
+
notificationTypes = new String[] {AdminDistributedSystemJmxImpl.NOTIF_ALERT};
- notificationsInfo[3] = new MBeanNotificationInfo(notificationTypes,
- Notification.class.getName(),
- "A member of this distributed system has generated an alert.");
-
+ notificationsInfo[3] =
+ new MBeanNotificationInfo(notificationTypes, Notification.class.getName(),
+ "A member of this distributed system has generated an alert.");
+
notificationTypes = new String[] {AdminDistributedSystemJmxImpl.NOTIF_ADMIN_SYSTEM_DISCONNECT};
- notificationsInfo[4] = new MBeanNotificationInfo(notificationTypes,
- Notification.class.getName(),
- "A GemFire manager, cache, or other member has joined this distributed system.");
-
+ notificationsInfo[4] =
+ new MBeanNotificationInfo(notificationTypes, Notification.class.getName(),
+ "A GemFire manager, cache, or other member has joined this distributed system.");
+
notificationTypes = new String[] {SystemMemberJmx.NOTIF_CACHE_CREATED};
- notificationsInfo[5] = new MBeanNotificationInfo(notificationTypes,
- Notification.class.getName(),
- "A cache got created on a member of this distributed system.");
-
+ notificationsInfo[5] =
+ new MBeanNotificationInfo(notificationTypes, Notification.class.getName(),
+ "A cache got created on a member of this distributed system.");
+
notificationTypes = new String[] {SystemMemberJmx.NOTIF_CACHE_CLOSED};
- notificationsInfo[6] = new MBeanNotificationInfo(notificationTypes,
- Notification.class.getName(),
- "A cache is closed on a member of this distributed system.");
-
+ notificationsInfo[6] = new MBeanNotificationInfo(notificationTypes,
+ Notification.class.getName(), "A cache is closed on a member of this distributed system.");
+
notificationTypes = new String[] {SystemMemberJmx.NOTIF_REGION_CREATED};
- notificationsInfo[7] = new MBeanNotificationInfo(notificationTypes,
- Notification.class.getName(),
- "A region is created in a cache on a member of this distributed system.");
-
+ notificationsInfo[7] =
+ new MBeanNotificationInfo(notificationTypes, Notification.class.getName(),
+ "A region is created in a cache on a member of this distributed system.");
+
notificationTypes = new String[] {SystemMemberJmx.NOTIF_REGION_LOST};
- notificationsInfo[8] = new MBeanNotificationInfo(notificationTypes,
- Notification.class.getName(),
- "A region was removed from a cache on a member of this distributed system.");
+ notificationsInfo[8] =
+ new MBeanNotificationInfo(notificationTypes, Notification.class.getName(),
+ "A region was removed from a cache on a member of this distributed system.");
-// String[] notificationTypes5 = new String[] {AdminDistributedSystemJmxImpl.NOTIF_STAT_ALERT};
-// notificationsInfo[9] = new MBeanNotificationInfo(notificationTypes5,
-// Notification.class.getName(),
-// "An alert based on statistic(s) has been raised.");
+ // String[] notificationTypes5 = new String[] {AdminDistributedSystemJmxImpl.NOTIF_STAT_ALERT};
+ // notificationsInfo[9] = new MBeanNotificationInfo(notificationTypes5,
+ // Notification.class.getName(),
+ // "An alert based on statistic(s) has been raised.");
return notificationsInfo;
}
-
+
/**
*
* @return ObjectName of this MBean
*/
- /*default*/ ObjectName getObjectName() {
+ /* default */ ObjectName getObjectName() {
return objectName;
}
@@ -278,25 +269,24 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
* Connects the Admin Agent in the DS
*
* @return AdminDistributedSystem MBean ObjectName
- * @throws OperationsException
- * if connection to the DS fails
- * @throws AdminException
- * if connection to the DS fails
+ * @throws OperationsException if connection to the DS fails
+ * @throws AdminException if connection to the DS fails
*/
private ObjectName connectToSystem() throws OperationsException, AdminException {
ObjectName adminDsObjName = agent.connectToSystem();
-
+
AdminDistributedSystem adminDS = agent.getDistributedSystem();
- if (adminDSJmx == null && adminDS instanceof AdminDistributedSystemJmxImpl) {//instanceof checks for null
- adminDSJmx = (AdminDistributedSystemJmxImpl) adminDS;
+ if (adminDSJmx == null && adminDS instanceof AdminDistributedSystemJmxImpl) {// instanceof
+ // checks for null
+ adminDSJmx = (AdminDistributedSystemJmxImpl) adminDS;
refreshInterval = adminDSJmx.getRefreshInterval();
- id = adminDSJmx.getId();
+ id = adminDSJmx.getId();
forwarder.registerNotificationListener(adminDSJmx.getObjectName());
}
return adminDsObjName;
}
-
+
/**
*
* @param memberId
@@ -305,7 +295,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
*/
private SystemMemberJmx findMember(String memberId) throws AdminException {
SystemMemberJmx foundMember = null;
-
+
if (agent.isConnected()) {
SystemMember[] members = adminDSJmx.getSystemMemberApplications();
for (SystemMember app : members) {
@@ -314,7 +304,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
break;
}
}
-
+
if (foundMember == null) {
members = adminDSJmx.getCacheVms();
for (SystemMember cacheVm : members) {
@@ -325,7 +315,7 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
}
}
}
-
+
return foundMember;
}
@@ -333,31 +323,29 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
* Return ObjectNames for all the Member MBeans in the DS.
*
* @return Array of ObjectNames of all Member MBeans
- * @throws OperationsException
- * if (1)agent could not connect in the DS OR
- * (2)Notification Listener could not be registered for the Admin
- * DS MBean OR
- * (3)fails to retrieve information from Admin DS
+ * @throws OperationsException if (1)agent could not connect in the DS OR (2)Notification Listener
+ * could not be registered for the Admin DS MBean OR (3)fails to retrieve information from
+ * Admin DS
*/
public String[] getMembers() throws OperationsException {
String[] members = new String[0];
-
+
try {
if (!isInitialized) {
- initializeAll(); //initialize if not yet
+ initializeAll(); // initialize if not yet
}
if (adminDSJmx != null) {
- CacheVm[] cacheVms = adminDSJmx.getCacheVms();
- SystemMember[] appVms = adminDSJmx.getSystemMemberApplications();
-
+ CacheVm[] cacheVms = adminDSJmx.getCacheVms();
+ SystemMember[] appVms = adminDSJmx.getSystemMemberApplications();
+
List<String> membersList = new ArrayList<String>();
- if (cacheVms != null && cacheVms.length !=0) {
+ if (cacheVms != null && cacheVms.length != 0) {
for (SystemMember cacheVm : cacheVms) {
membersList.add(cacheVm.getId());
}
}
- if (appVms != null && appVms.length !=0) {
+ if (appVms != null && appVms.length != 0) {
for (SystemMember appVm : appVms) {
membersList.add(appVm.getId());
}
@@ -366,54 +354,62 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
members = membersList.toArray(members);
}
} catch (AdminException e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0, "getMembers"), e);
+ logger.warn(
+ LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0, "getMembers"),
+ e);
throw new OperationsException(e.getMessage());
} catch (Exception e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0, "getMembers"), e);
+ logger.warn(
+ LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0, "getMembers"),
+ e);
throw new OperationsException(e.getMessage());
}
-
+
return members;
}
/**
- * Returns information including ObjectNames for all regions on a member with
- * given member id.
+ * Returns information including ObjectNames for all regions on a member with given member id.
*
- * @param memberId
- * member identifier as a String
+ * @param memberId member identifier as a String
* @return Map of details of all regions on a member with given id
- * @throws OperationsException
- * if fails to retrieve the regions information
+ * @throws OperationsException if fails to retrieve the regions information
*/
public Map<String, Map<String, ?>> getRegions(String memberId) throws OperationsException {
Map<String, Map<String, ?>> regionsInfo = new LinkedHashMap<String, Map<String, ?>>();
-
+
if (memberId != null) {
try {
SystemMemberJmx foundMember = findMember(memberId);
if (foundMember != null) {
SystemMemberCacheJmxImpl cache = (SystemMemberCacheJmxImpl) foundMember.getCache();
if (cache != null) {
- Map<String, ObjectName> existingRegionMbeans = getExistingRegionMbeansFullPaths(memberId);
- //TODO: this is in-efficient
- //Can a region.create JMX notification be used?
+ Map<String, ObjectName> existingRegionMbeans =
+ getExistingRegionMbeansFullPaths(memberId);
+ // TODO: this is in-efficient
+ // Can a region.create JMX notification be used?
regionsInfo = getAllRegionsDetails(cache, existingRegionMbeans);
existingRegionMbeans.clear();
}
}
} catch (AdminException e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1, new Object[]{"getRegions", memberId}), e);
+ logger.warn(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
+ new Object[] {"getRegions", memberId}), e);
throw new OperationsException(e.getMessage());
} catch (Exception e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1, new Object[]{"getRegions", memberId}), e);
+ logger.warn(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
+ new Object[] {"getRegions", memberId}), e);
throw new OperationsException(e.getMessage());
}
}
-
+
return regionsInfo;
}
-
+
/* **************************************************************************/
/* ************* INITIALIZE THE ENTIRE ADMIN DS AT A TIME *******************/
/* **************************************************************************/
@@ -425,49 +421,50 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
try {
connectToSystem();
if (adminDSJmx != null) {
- //Members are already inited after connectToSystem. Now init Cache, Region & Stats MBeans
+ // Members are already inited after connectToSystem. Now init Cache, Region & Stats MBeans
SystemMember[] cacheVms = adminDSJmx.getCacheVms();
for (int i = 0; i < cacheVms.length; i++) {
try {
- initializeCacheRegionsAndStats((SystemMemberJmx)cacheVms[i]);
+ initializeCacheRegionsAndStats((SystemMemberJmx) cacheVms[i]);
} catch (AdminException e) {
- logger.info(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING_0_CONTINUING,
- cacheVms[i].getId()), e);
+ logger.info(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING_0_CONTINUING,
+ cacheVms[i].getId()), e);
}
}
SystemMember[] appVms = adminDSJmx.getSystemMemberApplications();
for (int i = 0; i < appVms.length; i++) {
try {
- initializeCacheRegionsAndStats((SystemMemberJmx)appVms[i]);
+ initializeCacheRegionsAndStats((SystemMemberJmx) appVms[i]);
} catch (AdminException e) {
- logger.info(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING_0_CONTINUING,
- appVms[i].getId()), e);
+ logger.info(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING_0_CONTINUING,
+ appVms[i].getId()), e);
}
}
}
} catch (AdminException e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING), e);
+ logger.warn(LocalizedMessage
+ .create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING), e);
throw new OperationsException(e.getMessage());
} catch (Exception e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING), e);
+ logger.warn(LocalizedMessage
+ .create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING), e);
throw new OperationsException(e.getMessage());
}
-
+
isInitialized = true;
}
-
+
/**
* Initializes Cache, Regions & Statistics Types MBeans for the given Member.
*
- * @param memberJmx
- * Member Mbean instance
- * @throws OperationsException
- * if fails to initialize required MBeans
- * @throws AdminException
- * if fails to initialize required MBeans
+ * @param memberJmx Member Mbean instance
+ * @throws OperationsException if fails to initialize required MBeans
+ * @throws AdminException if fails to initialize required MBeans
*/
- private void initializeCacheRegionsAndStats(SystemMemberJmx memberJmx)
- throws OperationsException, AdminException {
+ private void initializeCacheRegionsAndStats(SystemMemberJmx memberJmx)
+ throws OperationsException, AdminException {
if (memberJmx != null) {
SystemMemberCacheJmxImpl cache = (SystemMemberCacheJmxImpl) memberJmx.getCache();
if (cache != null) {
@@ -481,10 +478,8 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
/**
* Initializes statistics for a member with the given mbean.
*
- * @param memberJmx
- * Member Mbean instance
- * @throws AdminException
- * if fails to initialize required statistic MBeans
+ * @param memberJmx Member Mbean instance
+ * @throws AdminException if fails to initialize required statistic MBeans
*/
private void initStats(SystemMemberJmx memberJmx) throws AdminException {
StatisticResource[] statResources = memberJmx.getStats();
@@ -494,120 +489,147 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
}
/**
- * Initializes all regions & its subregions using the Cache MBean and the
- * RegionSubRegionSnapshot for this cache MBean.
+ * Initializes all regions & its subregions using the Cache MBean and the RegionSubRegionSnapshot
+ * for this cache MBean.
*
- * @param cache
- * Cache MBean resource
- * @param regionSnapshot
- * RegionSubRegionSnapshot instance for the cache
- * @throws MalformedObjectNameException
- * if fails to initialize the region MBean
- * @throws AdminException
- * if fails to initialize the region MBean
+ * @param cache Cache MBean resource
+ * @param regionSnapshot RegionSubRegionSnapshot instance for the cache
+ * @throws MalformedObjectNameException if fails to initialize the region MBean
+ * @throws AdminException if fails to initialize the region MBean
*/
@SuppressWarnings("rawtypes")
- private void initializeRegionSubRegions(SystemMemberCacheJmxImpl cache,
- RegionSubRegionSnapshot regionSnapshot)
- throws MalformedObjectNameException,
- AdminException {
+ private void initializeRegionSubRegions(SystemMemberCacheJmxImpl cache,
+ RegionSubRegionSnapshot regionSnapshot) throws MalformedObjectNameException, AdminException {
String fullPath = regionSnapshot.getFullPath();
if (!fullPath.equals(PLACE_HOLDER_ROOT_REGION)) {
- fullPath = fullPath.substring(PLACE_HOLDER_ROOT_REGION.length()-1);
+ fullPath = fullPath.substring(PLACE_HOLDER_ROOT_REGION.length() - 1);
cache.manageRegion(fullPath);
}
-
+
Set subRegionSnapshots = regionSnapshot.getSubRegionSnapshots();
-
+
for (Iterator iterator = subRegionSnapshots.iterator(); iterator.hasNext();) {
RegionSubRegionSnapshot subRegion = (RegionSubRegionSnapshot) iterator.next();
try {
initializeRegionSubRegions(cache, subRegion);
} catch (AdminException e) {
- logger.info(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING_0_CONTINUING, subRegion.getFullPath()), e);
+ logger.info(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INTIALIZING_0_CONTINUING,
+ subRegion.getFullPath()), e);
}
}
}
-
-
+
+
/* **************************************************************************/
/* ********************** EVERYTHING HYPERIC NEEDS **************************/
/* **************************************************************************/
-
+
/* constants defined that could be used simply retrieve needed info from Map */
private static final String TYPE_NAME_CACHESERVER = "Cache Server";
private static final String TYPE_NAME_APPLICATION = "Application Peer";
/*
- * NOTE -
- * (My Understanding about the followings - abhishek)
- * 1. CacheVM - a VM started using Cache Server Launcher. This is considered
- * to be a dedicated cache VM because there is only GemFire Cache code
- * running here.
- * 2. ApplicationVM - a VM started with a written code using APIs and we can
- * not guarantee that there will be ONLY GemFire code running in this VM.
- * 3. Cache Server - Responsible for serving requests from the clients. There
- * could be multiple of these per Cache and hence per VM - one of 1 or 2 above.
- * These could be specified by <cache-server> (or deprecated <bridge-server>)
- * element(s) in the cache-xml file or using an API Cache.addCacheServer().
+ * NOTE - (My Understanding about the followings - abhishek) 1. CacheVM - a VM started using Cache
+ * Server Launcher. This is considered to be a dedicated cache VM because there is only GemFire
+ * Cache code running here. 2. ApplicationVM - a VM started with a written code using APIs and we
+ * can not guarantee that there will be ONLY GemFire code running in this VM. 3. Cache Server -
+ * Responsible for serving requests from the clients. There could be multiple of these per Cache
+ * and hence per VM - one of 1 or 2 above. These could be specified by <cache-server> (or
+ * deprecated <bridge-server>) element(s) in the cache-xml file or using an API
+ * Cache.addCacheServer().
*/
-// private static final String VERSION = "gemfire.version.string";
-// private static final String MEMBER_COUNT = "gemfire.membercount.int";
-// private static final String GATEWAYHUB_COUNT = "gemfire.gatewayhubcount.int";
-// private static final String CLIENT_COUNT = "gemfire.clientcount.int";
+ // private static final String VERSION = "gemfire.version.string";
+ // private static final String MEMBER_COUNT = "gemfire.membercount.int";
+ // private static final String GATEWAYHUB_COUNT = "gemfire.gatewayhubcount.int";
+ // private static final String CLIENT_COUNT = "gemfire.clientcount.int";
private static final String MEMBER_ID = DistributionConfig.GEMFIRE_PREFIX + "member.id.string";
- private static final String MEMBER_NAME = DistributionConfig.GEMFIRE_PREFIX + "member.name.string";
- private static final String MEMBER_HOST = DistributionConfig.GEMFIRE_PREFIX + "member.host.string";
+ private static final String MEMBER_NAME =
+ DistributionConfig.GEMFIRE_PREFIX + "member.name.string";
+ private static final String MEMBER_HOST =
+ DistributionConfig.GEMFIRE_PREFIX + "member.host.string";
private static final String MEMBER_PORT = DistributionConfig.GEMFIRE_PREFIX + "member.port.int";
- private static final String MEMBER_UPTIME = DistributionConfig.GEMFIRE_PREFIX + "member.uptime.long";
- private static final String MEMBER_CLIENTS = DistributionConfig.GEMFIRE_PREFIX + "member.clients.map";
- private static final String MEMBER_REGIONS = DistributionConfig.GEMFIRE_PREFIX + "member.regions.map";
- private static final String MEMBER_TYPE = DistributionConfig.GEMFIRE_PREFIX + "member.type.string";
- private static final String IS_SERVER = DistributionConfig.GEMFIRE_PREFIX + "member.isserver.boolean";
- private static final String IS_GATEWAY = DistributionConfig.GEMFIRE_PREFIX + "member.isgateway.boolean";
-
- private static final String MEMBER_STATSAMPLING_ENABLED = DistributionConfig.GEMFIRE_PREFIX + "member.config.statsamplingenabled.boolean";
- private static final String MEMBER_TIME_STATS_ENABLED = DistributionConfig.GEMFIRE_PREFIX + "member.config.timestatsenabled.boolean";
-
- private static final String STATS_PROCESSCPUTIME = DistributionConfig.GEMFIRE_PREFIX + "member.stat.processcputime.long";
- private static final String STATS_CPUS = DistributionConfig.GEMFIRE_PREFIX + "member.stat.cpus.int";
- private static final String STATS_USEDMEMORY = DistributionConfig.GEMFIRE_PREFIX + "member.stat.usedmemory.long";
- private static final String STATS_MAXMEMORY = DistributionConfig.GEMFIRE_PREFIX + "member.stat.maxmemory.long";
- private static final String STATS_GETS = DistributionConfig.GEMFIRE_PREFIX + "member.stat.gets.int";
- private static final String STATS_GETTIME = DistributionConfig.GEMFIRE_PREFIX + "member.stat.gettime.long";
- private static final String STATS_PUTS = DistributionConfig.GEMFIRE_PREFIX + "member.stat.puts.int";
- private static final String STATS_PUTTIME = DistributionConfig.GEMFIRE_PREFIX + "member.stat.puttime.long";
-
- private static final String REGION_NAME = DistributionConfig.GEMFIRE_PREFIX + "region.name.string";
- private static final String REGION_PATH = DistributionConfig.GEMFIRE_PREFIX + "region.path.string";
- private static final String REGION_SCOPE = DistributionConfig.GEMFIRE_PREFIX + "region.scope.string";
- private static final String REGION_DATAPOLICY = DistributionConfig.GEMFIRE_PREFIX + "region.datapolicy.string";
- private static final String REGION_INTERESTPOLICY = DistributionConfig.GEMFIRE_PREFIX + "region.interestpolicy.string";
- private static final String REGION_ENTRYCOUNT = DistributionConfig.GEMFIRE_PREFIX + "region.entrycount.int";
- private static final String REGION_DISKATTRS = DistributionConfig.GEMFIRE_PREFIX + "region.diskattrs.string";
+ private static final String MEMBER_UPTIME =
+ DistributionConfig.GEMFIRE_PREFIX + "member.uptime.long";
+ private static final String MEMBER_CLIENTS =
+ DistributionConfig.GEMFIRE_PREFIX + "member.clients.map";
+ private static final String MEMBER_REGIONS =
+ DistributionConfig.GEMFIRE_PREFIX + "member.regions.map";
+ private static final String MEMBER_TYPE =
+ DistributionConfig.GEMFIRE_PREFIX + "member.type.string";
+ private static final String IS_SERVER =
+ DistributionConfig.GEMFIRE_PREFIX + "member.isserver.boolean";
+ private static final String IS_GATEWAY =
+ DistributionConfig.GEMFIRE_PREFIX + "member.isgateway.boolean";
+
+ private static final String MEMBER_STATSAMPLING_ENABLED =
+ DistributionConfig.GEMFIRE_PREFIX + "member.config.statsamplingenabled.boolean";
+ private static final String MEMBER_TIME_STATS_ENABLED =
+ DistributionConfig.GEMFIRE_PREFIX + "member.config.timestatsenabled.boolean";
+
+ private static final String STATS_PROCESSCPUTIME =
+ DistributionConfig.GEMFIRE_PREFIX + "member.stat.processcputime.long";
+ private static final String STATS_CPUS =
+ DistributionConfig.GEMFIRE_PREFIX + "member.stat.cpus.int";
+ private static final String STATS_USEDMEMORY =
+ DistributionConfig.GEMFIRE_PREFIX + "member.stat.usedmemory.long";
+ private static final String STATS_MAXMEMORY =
+ DistributionConfig.GEMFIRE_PREFIX + "member.stat.maxmemory.long";
+ private static final String STATS_GETS =
+ DistributionConfig.GEMFIRE_PREFIX + "member.stat.gets.int";
+ private static final String STATS_GETTIME =
+ DistributionConfig.GEMFIRE_PREFIX + "member.stat.gettime.long";
+ private static final String STATS_PUTS =
+ DistributionConfig.GEMFIRE_PREFIX + "member.stat.puts.int";
+ private static final String STATS_PUTTIME =
+ DistributionConfig.GEMFIRE_PREFIX + "member.stat.puttime.long";
+
+ private static final String REGION_NAME =
+ DistributionConfig.GEMFIRE_PREFIX + "region.name.string";
+ private static final String REGION_PATH =
+ DistributionConfig.GEMFIRE_PREFIX + "region.path.string";
+ private static final String REGION_SCOPE =
+ DistributionConfig.GEMFIRE_PREFIX + "region.scope.string";
+ private static final String REGION_DATAPOLICY =
+ DistributionConfig.GEMFIRE_PREFIX + "region.datapolicy.string";
+ private static final String REGION_INTERESTPOLICY =
+ DistributionConfig.GEMFIRE_PREFIX + "region.interestpolicy.string";
+ private static final String REGION_ENTRYCOUNT =
+ DistributionConfig.GEMFIRE_PREFIX + "region.entrycount.int";
+ private static final String REGION_DISKATTRS =
+ DistributionConfig.GEMFIRE_PREFIX + "region.diskattrs.string";
private static final String CLIENT_ID = DistributionConfig.GEMFIRE_PREFIX + "client.id.string";
- private static final String CLIENT_NAME = DistributionConfig.GEMFIRE_PREFIX + "client.name.string";
- private static final String CLIENT_HOST = DistributionConfig.GEMFIRE_PREFIX + "client.host.string";
- private static final String CLIENT_QUEUESIZE = DistributionConfig.GEMFIRE_PREFIX + "client.queuesize.int";
- private static final String CLIENT_STATS_GETS = DistributionConfig.GEMFIRE_PREFIX + "client.stats.gets.int";
- private static final String CLIENT_STATS_PUTS = DistributionConfig.GEMFIRE_PREFIX + "client.stats.puts.int";
- private static final String CLIENT_STATS_CACHEMISSES = DistributionConfig.GEMFIRE_PREFIX + "client.stats.cachemisses.int";
- private static final String CLIENT_STATS_CPUUSAGE = DistributionConfig.GEMFIRE_PREFIX + "client.stats.cpuusage.long";
- private static final String CLIENT_STATS_CPUS = DistributionConfig.GEMFIRE_PREFIX + "client.stats.cpus.int";
- private static final String CLIENT_STATS_UPDATETIME = DistributionConfig.GEMFIRE_PREFIX + "client.stats.updatetime.long";
- private static final String CLIENT_STATS_THREADS = DistributionConfig.GEMFIRE_PREFIX + "client.stats.threads.int";
-
+ private static final String CLIENT_NAME =
+ DistributionConfig.GEMFIRE_PREFIX + "client.name.string";
+ private static final String CLIENT_HOST =
+ DistributionConfig.GEMFIRE_PREFIX + "client.host.string";
+ private static final String CLIENT_QUEUESIZE =
+ DistributionConfig.GEMFIRE_PREFIX + "client.queuesize.int";
+ private static final String CLIENT_STATS_GETS =
+ DistributionConfig.GEMFIRE_PREFIX + "client.stats.gets.int";
+ private static final String CLIENT_STATS_PUTS =
+ DistributionConfig.GEMFIRE_PREFIX + "client.stats.puts.int";
+ private static final String CLIENT_STATS_CACHEMISSES =
+ DistributionConfig.GEMFIRE_PREFIX + "client.stats.cachemisses.int";
+ private static final String CLIENT_STATS_CPUUSAGE =
+ DistributionConfig.GEMFIRE_PREFIX + "client.stats.cpuusage.long";
+ private static final String CLIENT_STATS_CPUS =
+ DistributionConfig.GEMFIRE_PREFIX + "client.stats.cpus.int";
+ private static final String CLIENT_STATS_UPDATETIME =
+ DistributionConfig.GEMFIRE_PREFIX + "client.stats.updatetime.long";
+ private static final String CLIENT_STATS_THREADS =
+ DistributionConfig.GEMFIRE_PREFIX + "client.stats.threads.int";
+
/**
*
* @param memberId
- * @return All the required details for a member with given memberId
+ * @return All the required details for a member with given memberId
* @throws OperationsException
*/
- public Map<String, Object> getMemberDetails(String memberId)
- throws OperationsException {
+ public Map<String, Object> getMemberDetails(String memberId) throws OperationsException {
Map<String, Object> allDetails = new TreeMap<String, Object>();
if (memberId != null) {
@@ -615,16 +637,16 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
SystemMemberJmx member = findMember(memberId);
if (member != null) {
SystemMemberCacheJmxImpl cache = (SystemMemberCacheJmxImpl) member.getCache();
- GemFireMemberStatus snapshot = cache.getSnapshot();
- boolean isServer = snapshot.getIsServer();
+ GemFireMemberStatus snapshot = cache.getSnapshot();
+ boolean isServer = snapshot.getIsServer();
boolean isGatewayHub = snapshot.getIsGatewayHub();
-
- //1. Member info
+
+ // 1. Member info
allDetails.put(MEMBER_ID, member.getId());
allDetails.put(MEMBER_NAME, member.getName());
- String host = member.getHost();//from of GemFireVM.getHost
+ String host = member.getHost();// from of GemFireVM.getHost
InetAddress hostAddr = member.getHostAddress();
- //possibility of null host address
+ // possibility of null host address
if (hostAddr != null) {
host = hostAddr.getHostName();
}
@@ -632,47 +654,47 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
allDetails.put(MEMBER_UPTIME, snapshot.getUpTime());
allDetails.put(IS_SERVER, isServer);
allDetails.put(IS_GATEWAY, isGatewayHub);
-
+
String memberType = "";
if (member instanceof CacheServerJmxImpl) {
memberType = TYPE_NAME_CACHESERVER;
- } else {//Mark it of Application type if neither a gateway hub nor a server
+ } else {// Mark it of Application type if neither a gateway hub nor a server
memberType = TYPE_NAME_APPLICATION;
}
-// if (isGatewayHub) {
-// memberType = TYPE_NAME_GATEWAYHUB;
-// } else if (isServer) {
-// memberType = TYPE_NAME_CACHESERVER;
-// } else {//Mark it of Application type if neither a gateway nor a server
-// memberType = TYPE_NAME_APPLICATION;
-// }
+ // if (isGatewayHub) {
+ // memberType = TYPE_NAME_GATEWAYHUB;
+ // } else if (isServer) {
+ // memberType = TYPE_NAME_CACHESERVER;
+ // } else {//Mark it of Application type if neither a gateway nor a server
+ // memberType = TYPE_NAME_APPLICATION;
+ // }
allDetails.put(MEMBER_TYPE, memberType);
- //2. Region info
+ // 2. Region info
Map<String, ObjectName> existingRegionMbeans = getExistingRegionMbeansFullPaths(memberId);
allDetails.put(MEMBER_REGIONS, getAllRegionsDetails(cache, existingRegionMbeans));
existingRegionMbeans.clear();
- //3. Clients info
+ // 3. Clients info
allDetails.put(MEMBER_CLIENTS, getClientDetails(snapshot));
-
+
boolean statSamplingEnabled = true;
- //assuming will never return as per current implementation
+ // assuming will never return as per current implementation
ConfigurationParameter[] configParams = member.getConfiguration();
for (ConfigurationParameter configParam : configParams) {
if (STATISTIC_SAMPLING_ENABLED.equals(configParam.getName())) {
allDetails.put(MEMBER_STATSAMPLING_ENABLED, configParam.getValue());
- statSamplingEnabled = Boolean.parseBoolean(""+configParam.getValue());
+ statSamplingEnabled = Boolean.parseBoolean("" + configParam.getValue());
} else if (ENABLE_TIME_STATISTICS.equals(configParam.getName())) {
allDetails.put(MEMBER_TIME_STATS_ENABLED, configParam.getValue());
}
}
-
- //5. Stats info
+
+ // 5. Stats info
allDetails.putAll(getRequiredStats(member, statSamplingEnabled));
SystemMemberCacheServer[] cacheServers = cache.getCacheServers();
- //attempt refreshing the cache info once
+ // attempt refreshing the cache info once
if (cacheServers.length == 0) {
cache.refresh();
cacheServers = cache.getCacheServers();
@@ -680,52 +702,54 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
Integer memberCacheServerPort = Integer.valueOf(0);
if (cacheServers.length != 0) {
/*
- * Taking the first cache server port.
- * We don't recommend multiple cache severs for a cache.
+ * Taking the first cache server port. We don't recommend multiple cache severs for a
+ * cache.
*/
memberCacheServerPort = Integer.valueOf(cacheServers[0].getPort());
}
allDetails.put(MEMBER_PORT, memberCacheServerPort);
}
-
+
} catch (AdminException e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
- new Object[] {"getMemberDetails", memberId}), e);
+ logger.warn(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
+ new Object[] {"getMemberDetails", memberId}), e);
throw new OperationsException(e.getMessage());
} catch (Exception e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
- new Object[] {"getMemberDetails", memberId}), e);
+ logger.warn(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_FOR_OPERATION_0_FOR_MEMBER_1,
+ new Object[] {"getMemberDetails", memberId}), e);
throw new OperationsException(e.getMessage());
}
}
-
+
return allDetails;
}
-
+
/**
*
* @param snapshot
- * @return Map of client details
+ * @return Map of client details
*/
@SuppressWarnings("rawtypes")
private Map<String, Map<String, ?>> getClientDetails(GemFireMemberStatus snapshot) {
- Map<String, Map<String, ?>> clientsInfo =
- new LinkedHashMap<String, Map<String, ?>>();
-
+ Map<String, Map<String, ?>> clientsInfo = new LinkedHashMap<String, Map<String, ?>>();
+
Set connectedClients = snapshot.getConnectedClients();
if (!connectedClients.isEmpty()) {
Map clientHealthStatsMap = snapshot.getClientHealthStats();
-
+
for (Iterator iterator = connectedClients.iterator(); iterator.hasNext();) {
Map<String, Object> clientData = new HashMap<String, Object>();
String clientId = (String) iterator.next();
- String host = snapshot.getClientHostName(clientId);
+ String host = snapshot.getClientHostName(clientId);
clientData.put(CLIENT_ID, clientId);
clientData.put(CLIENT_NAME, extractClientName(clientId, host));
clientData.put(CLIENT_HOST, host);
clientData.put(CLIENT_QUEUESIZE, snapshot.getClientQueueSize(clientId));
-
- ClientHealthStats clientHealthStats = (ClientHealthStats) clientHealthStatsMap.get(clientId);
+
+ ClientHealthStats clientHealthStats =
+ (ClientHealthStats) clientHealthStatsMap.get(clientId);
if (clientHealthStats != null) {
clientData.put(CLIENT_STATS_GETS, clientHealthStats.getNumOfGets());
clientData.put(CLIENT_STATS_PUTS, clientHealthStats.getNumOfPuts());
@@ -743,103 +767,88 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
clientData.put(CLIENT_STATS_UPDATETIME, Long.valueOf(0));
clientData.put(CLIENT_STATS_THREADS, Integer.valueOf(0));
}
-
+
clientsInfo.put(clientId, clientData);
}
}
-
+
return clientsInfo;
}
/**
* Returns a Map containing information about regions.
*
- * @param cache
- * Reference to an MBean representing a Cache on a member
- * @param existingRegionMbeans
- * Map of Path against Region MBean ObjectNames
+ * @param cache Reference to an MBean representing a Cache on a member
+ * @param existingRegionMbeans Map of Path against Region MBean ObjectNames
* @return Map of all region details
- * @throws OperationsException
- * if fails to retrieve
+ * @throws OperationsException if fails to retrieve
*/
- private Map<String, Map<String, ?>> getAllRegionsDetails(
- SystemMemberCacheJmxImpl cache,
- Map<String, ObjectName> existingRegionMbeans)
- throws OperationsException {
- Map<String, Map<String, ?>> regionsInfo =
- new TreeMap<String, Map<String, ?>>();
-
+ private Map<String, Map<String, ?>> getAllRegionsDetails(SystemMemberCacheJmxImpl cache,
+ Map<String, ObjectName> existingRegionMbeans) throws OperationsException {
+ Map<String, Map<String, ?>> regionsInfo = new TreeMap<String, Map<String, ?>>();
+
if (cache != null) {
try {
RegionSubRegionSnapshot regionSnapshot = cache.getRegionSnapshot();
collectAllRegionsDetails(cache, regionSnapshot, regionsInfo, existingRegionMbeans);
} catch (AdminException e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.ONE_ARG, "Exception occurred while getting region details."), e);
+ logger.warn(LocalizedMessage.create(LocalizedStrings.ONE_ARG,
+ "Exception occurred while getting region details."), e);
throw new OperationsException(e.getMessage());
} catch (Exception e) {
- logger.warn(LocalizedMessage.create(LocalizedStrings.ONE_ARG, "Exception occurred while getting region details."), e);
+ logger.warn(LocalizedMessage.create(LocalizedStrings.ONE_ARG,
+ "Exception occurred while getting region details."), e);
throw new OperationsException(e.getMessage());
}
}
-
+
return regionsInfo;
}
/**
- * Collects all the region details from the RegionSubRegionSnapshot instance
- * passed and the Cache MBean. Checks in the set of existingRegionMbeans
- * before initializing Region Mbeans if there are not initialized yet.
+ * Collects all the region details from the RegionSubRegionSnapshot instance passed and the Cache
+ * MBean. Checks in the set of existingRegionMbeans before initializing Region Mbeans if there are
+ * not initialized yet.
*
- * @param cache
- * Cache MBean instance
- * @param regionSnapshot
- * RegionSubRegionSnapshot instance
- * @param regionsInfo
- * Map of regions information that gets populated recursively
- * @param existingRegionMbeans
- * Map of ObjectNames of existing region MBeans
- * @throws AdminException
- * if unable to initialize region MBean
- * @throws OperationsException
- * if fails to retrieve the Region MBean attribute info
- * @throws MBeanException
- * if fails to retrieve the Region MBean attribute info
- * @throws ReflectionException
- * if fails to retrieve the Region MBean attribute info
+ * @param cache Cache MBean instance
+ * @param regionSnapshot RegionSubRegionSnapshot instance
+ * @param regionsInfo Map of regions information that gets populated recursively
+ * @param existingRegionMbeans Map of ObjectNames of existing region MBeans
+ * @throws AdminException if unable to initialize region MBean
+ * @throws OperationsException if fails to retrieve the Region MBean attribute info
+ * @throws MBeanException if fails to retrieve the Region MBean attribute info
+ * @throws ReflectionException if fails to retrieve the Region MBean attribute info
*/
@SuppressWarnings("rawtypes")
- private void collectAllRegionsDetails(SystemMemberCacheJmxImpl cache,
- RegionSubRegionSnapshot regionSnapshot,
- Map<String, Map<String, ?>> regionsInfo,
- Map<String, ObjectName> existingRegionMbeans)
- throws AdminException, OperationsException,
- MBeanException, ReflectionException {
+ private void collectAllRegionsDetails(SystemMemberCacheJmxImpl cache,
+ RegionSubRegionSnapshot regionSnapshot, Map<String, Map<String, ?>> regionsInfo,
+ Map<String, ObjectName> existingRegionMbeans)
+ throws AdminException, OperationsException, MBeanException, ReflectionException {
String fullPath = regionSnapshot.getFullPath();
if (!fullPath.equals(PLACE_HOLDER_ROOT_REGION)) {
- fullPath = fullPath.substring(PLACE_HOLDER_ROOT_REGION.length()-1);
+ fullPath = fullPath.substring(PLACE_HOLDER_ROOT_REGION.length() - 1);
String name = regionSnapshot.getName();
Integer entryCount = Integer.valueOf(regionSnapshot.getEntryCount());
Map<String, Object> details = new TreeMap<String, Object>();
details.put(REGION_NAME, name);
details.put(REGION_PATH, fullPath);
details.put(REGION_ENTRYCOUNT, entryCount);
-
+
ObjectName regionObjectName = existingRegionMbeans.get(fullPath);
- if (regionObjectName == null) {//initialize if has not yet been
+ if (regionObjectName == null) {// initialize if has not yet been
regionObjectName = cache.manageRegion(fullPath);
}
Object attribute = getAttribute(regionObjectName, "scope", NOT_AVAILABLE);
attribute = attribute != null ? attribute.toString() : attribute;
details.put(REGION_SCOPE, attribute);
-
+
attribute = getAttribute(regionObjectName, "dataPolicy", NOT_AVAILABLE);
attribute = attribute != null ? attribute.toString() : attribute;
details.put(REGION_DATAPOLICY, attribute);
- SubscriptionAttributes interestPolicyAttr =
- (SubscriptionAttributes) getAttribute(regionObjectName,
- "subscriptionAttributes", null);
+ SubscriptionAttributes interestPolicyAttr =
+ (SubscriptionAttributes) getAttribute(regionObjectName, "subscriptionAttributes", null);
String interestPolicyStr = NOT_AVAILABLE;
if (interestPolicyAttr != null) {
InterestPolicy interestPolicy = interestPolicyAttr.getInterestPolicy();
@@ -852,23 +861,22 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
attribute = getAttribute(regionObjectName, "diskWriteAttributes", NOT_AVAILABLE);
attribute = attribute != null ? attribute.toString() : attribute;
details.put(REGION_DISKATTRS, attribute);
-
+
regionsInfo.put(fullPath, details);
}
-
+
Set subRegionSnapshots = regionSnapshot.getSubRegionSnapshots();
-
+
for (Iterator iterator = subRegionSnapshots.iterator(); iterator.hasNext();) {
RegionSubRegionSnapshot subRegion = (RegionSubRegionSnapshot) iterator.next();
collectAllRegionsDetails(cache, subRegion, regionsInfo, existingRegionMbeans);
}
}
-
+
/**
* Checks if the given host name string contains ':' as in IPv6 host address.
*
- * @param host
- * host name string
+ * @param host host name string
* @return true if the host string contains ':', false otherwise
*/
private static boolean isIPv6(String host) {
@@ -876,51 +884,43 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
}
/**
- * Checks if the given host name is actually a String representation of an
- * IPv4 address.
+ * Checks if the given host name is actually a String representation of an IPv4 address.
*
- * @param host
- * host name string
- * @return true if given host name is a String representation of an IPv4
- * address, false otherwise
+ * @param host host name string
+ * @return true if given host name is a String representation of an IPv4 address, false otherwise
*/
private static boolean isIPv4(String host) {
String regex = "\\d{1,3}.\\d{1,3}.\\d{1,3}.\\d{1,3}";
-
+
return host.matches(regex);
}
-
+
/**
- * Excludes the host name from the client id and returns the String. If the
- * host name can not be detected, returns an empty string. Typically, the
- * client id looks like: HOST(VM_PID:VM_KIND):PORT:RANDOM_STRING:CLIENT_NAME
+ * Excludes the host name from the client id and returns the String. If the host name can not be
+ * detected, returns an empty string. Typically, the client id looks like:
+ * HOST(VM_PID:VM_KIND):PORT:RANDOM_STRING:CLIENT_NAME
*
- * Extracts the client name from the client id. If the client id is not in the
- * expected format, returns 'N/A'
+ * Extracts the client name from the client id. If the client id is not in the expected format,
+ * returns 'N/A'
*
- * @param clientId
- * string identifier for a client
- * @param host
- * host name (FQDN) the client is running on
+ * @param clientId string identifier for a client
+ * @param host host name (FQDN) the client is running on
* @return name extracted from given client id
*/
/*
- * Some examples of Client Id format:
- * (1) Java Client:
- * nase(21716:loner):51789:42e9a0bf:client_nase_21716
- * nase(2560:loner):2:7a84729a:Feeder
+ * Some examples of Client Id format: (1) Java Client:
+ * nase(21716:loner):51789:42e9a0bf:client_nase_21716 nase(2560:loner):2:7a84729a:Feeder
*
- * (2) Native Client:
- * nase(21045:loner):2:GFNative_OnNnEpyRWL:ExampleDistributedSystem
+ * (2) Native Client: nase(21045:loner):2:GFNative_OnNnEpyRWL:ExampleDistributedSystem
*
* (3) IPv6 Host whose name can not be resolved:
* fdf0:76cf:a0ed:9449:0:0:0:1001(21716:loner):51789:42e9a0b:client_nase_21716
- * fdf0:76cf:a0ed:9449:0:0:0:1001:51789:42e9a0b:client_nase_21716
+ * fdf0:76cf:a0ed:9449:0:0:0:1001:51789:42e9a0b:client_nase_21716
*/
private static String extractClientName(String clientId, String host) {
- /* This isIPv6, isIPv4, extractClientName is taken from GFMon code base*/
+ /* This isIPv6, isIPv4, extractClientName is taken from GFMon code base */
String hostExcludedId = "";
- if ( (isIPv6(host) || isIPv4(host))&& clientId.startsWith(host)) {
+ if ((isIPv6(host) || isIPv4(host)) && clientId.startsWith(host)) {
hostExcludedId = clientId.substring(host.length());
} else {
int firstDotIndex = host.indexOf(".");
@@ -929,14 +929,14 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
hostExcludedId = clientId.substring(hostShortName.length());
}
}
-
+
String vmPIDAndKindRegex = "\\(\\w+:\\w+\\)";
- String regex = "(\\<ec\\>)?:[0-9]+(:\\w+){2}+";
- String name = NOT_AVAILABLE;
- String temp = hostExcludedId;
+ String regex = "(\\<ec\\>)?:[0-9]+(:\\w+){2}+";
+ String name = NOT_AVAILABLE;
+ String temp = hostExcludedId;
int openIndex = temp.indexOf("(");
- if (openIndex != -1) {
+ if (openIndex != -1) {
regex = vmPIDAndKindRegex + regex;
}
@@ -944,23 +944,22 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
String[] splitted = temp.split(":");
name = splitted[splitted.length - 1];
}
-
+
return name;
}
/**
- * Returns a Map of all the statistics required for Hyperic currently. It
- * relies on the attribute of the StatisticsResource Mbeans.
+ * Returns a Map of all the statistics required for Hyperic currently. It relies on the attribute
+ * of the StatisticsResource Mbeans.
*
- * @param member
- * instance for which the stats are needed
+ * @param member instance for which the stats are needed
* @return Map of all the statistics required for Hyperic currently.
- * @throws OperationsException
- * exceptions thrown while retrieving the attributes
+ * @throws OperationsException exceptions thrown while retrieving the attributes
*/
- private Map<String, Object> getRequiredStats(SystemMemberJmx member, boolean statSamplingEnabled) throws OperationsException {
+ private Map<String, Object> getRequiredStats(SystemMemberJmx member, boolean statSamplingEnabled)
+ throws OperationsException {
Map<String, Object> statDetails = new TreeMap<String, Object>();
-
+
try {
if (!statSamplingEnabled) {
statDetails.put(STATS_PROCESSCPUTIME, NOT_AVAILABLE_NUMBER);
@@ -973,96 +972,109 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
statDetails.put(STATS_PUTTIME, NOT_AVAILABLE_NUMBER);
} else {
MBeanServer mBeanServer = agent.getMBeanServer();
- Number defaultVal = NOT_AVAILABLE_NUMBER;
+ Number defaultVal = NOT_AVAILABLE_NUMBER;
Number processCpuTime = defaultVal;
- Number cpus = defaultVal;
- Number maxMemory = defaultVal;
- Number usedMemory = defaultVal;
- Number gets = defaultVal;
- Number getTime = defaultVal;
- Number puts = defaultVal;
- Number putTime = defaultVal;
-
+ Number cpus = defaultVal;
+ Number maxMemory = defaultVal;
+ Number usedMemory = defaultVal;
+ Number gets = defaultVal;
+ Number getTime = defaultVal;
+ Number puts = defaultVal;
+ Number putTime = defaultVal;
+
ObjectName[] vmMemoryUsageStats = getExistingStats(member.getId(), "vmHeapMemoryStats");
- ObjectName[] vmStats = getExistingStats(member.getId(), "vmStats");
- ObjectName[] cachePerfStats = getExistingStats(member.getId(), "cachePerfStats");
+ ObjectName[] vmStats = getExistingStats(member.getId(), "vmStats");
+ ObjectName[] cachePerfStats = getExistingStats(member.getId(), "cachePerfStats");
boolean needToReinit = false;
if (vmMemoryUsageStats.length == 0 || vmStats.length == 0 || cachePerfStats.length == 0) {
- //if the StatisticResource MBeans are not created
+ // if the StatisticResource MBeans are not created
needToReinit = true;
}
- if(!needToReinit) {
+ if (!needToReinit) {
/*
- * To handle a case when the StatisticResource MBeans are created but
- * not registered with RefreshTimer. If VMMemoryUsageStats are
- * present, maxMemory should always be non-zero. */
- for (int i = 0; i < vmMemoryUsageStats.length; i++) {//ideally there should be a single instance
+ * To handle a case when the StatisticResource MBeans are created but not registered with
+ * RefreshTimer. If VMMemoryUsageStats are present, maxMemory should always be non-zero.
+ */
+ for (int i = 0; i < vmMemoryUsageStats.length; i++) {// ideally there should be a single
+ // instance
String type = (String) mBeanServer.getAttribute(vmMemoryUsageStats[i], "type");
-
- if ("VMMemoryUsageStats".equals(type)) { //first instance that has Statistics Type name
- maxMemory = (Number) getAttribute(vmMemoryUsageStats[i], "maxMemory", defaultVal);
+
+ if ("VMMemoryUsageStats".equals(type)) { // first instance that has Statistics Type name
+ maxMemory = (Number) getAttribute(vmMemoryUsageStats[i], "maxMemory", defaultVal);
break;
}
}
-
- needToReinit = 0 == maxMemory.longValue();
+
+ needToReinit = 0 == maxMemory.longValue();
}
- if(needToReinit) {
- logger.info(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_REINITIALIZING_STATS_FOR_0, member.getId()));
+ if (needToReinit) {
+ logger.info(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_REINITIALIZING_STATS_FOR_0,
+ member.getId()));
initStats(member);
vmMemoryUsageStats = getExistingStats(member.getId(), "vmHeapMemoryStats");
- vmStats = getExistingStats(member.getId(), "vmStats");
- cachePerfStats = getExistingStats(member.getId(), "cachePerfStats");
+ vmStats = getExistingStats(member.getId(), "vmStats");
+ cachePerfStats = getExistingStats(member.getId(), "cachePerfStats");
}
-
- for (int i = 0; i < vmMemoryUsageStats.length; i++) {//ideally there should be a single instance
+
+ for (int i = 0; i < vmMemoryUsageStats.length; i++) {// ideally there should be a single
+ // instance
String type = (String) mBeanServer.getAttribute(vmMemoryUsageStats[i], "type");
-
- if ("VMMemoryUsageStats".equals(type)) { //first instance that has Statistics Type name
- maxMemory = (Number) getAttribute(vmMemoryUsageStats[i], "maxMemory", defaultVal);
+
+ if ("VMMemoryUsageStats".equals(type)) { // first instance that has Statistics Type name
+ maxMemory = (Number) getAttribute(vmMemoryUsageStats[i], "maxMemory", defaultVal);
usedMemory = (Number) getAttribute(vmMemoryUsageStats[i], "usedMemory", defaultVal);
break;
}
}
- for (int i = 0; i < vmStats.length; i++) {//ideally there should be a single instance
+ for (int i = 0; i < vmStats.length; i++) {// ideally there should be a single instance
String type = (String) mBeanServer.getAttribute(vmStats[i], "type");
-
- if ("VMStats".equals(type)) { //first instance that has Statistics Type name
+
+ if ("VMStats".equals(type)) { // first instance that has Statistics Type name
processCpuTime = (Number) getAttribute(vmStats[i], "processCpuTime", defaultVal);
- cpus = (Number) getAttribute(vmStats[i], "cpus", defaultVal);
+ cpus = (Number) getAttribute(vmStats[i], "cpus", defaultVal);
break;
}
}
-
- for (int i = 0; i < cachePerfStats.length; i++) {//ideally there should be a single instance
+
+ for (int i = 0; i < cachePerfStats.length; i++) {// ideally there should be a single
+ // instance
String type = (String) mBeanServer.getAttribute(cachePerfStats[i], "type");
-
- if ("CachePerfStats".equals(type)) { //first instance that has Statistics Type name
- gets = (Number) getAttribute(cachePerfStats[i], "gets", defaultVal);
+
+ if ("CachePerfStats".equals(type)) { // first instance that has Statistics Type name
+ gets = (Number) getAttribute(cachePerfStats[i], "gets", defaultVal);
getTime = (Number) getAttribute(cachePerfStats[i], "getTime", defaultVal);
- puts = (Number) getAttribute(cachePerfStats[i], "puts", defaultVal);
+ puts = (Number) getAttribute(cachePerfStats[i], "puts", defaultVal);
putTime = (Number) getAttribute(cachePerfStats[i], "putTime", defaultVal);
break;
}
}
-
- statDetails.put(STATS_PROCESSCPUTIME, processCpuTime == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : processCpuTime.longValue());
- statDetails.put(STATS_CPUS, cpus == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : cpus.intValue());
- statDetails.put(STATS_MAXMEMORY, maxMemory == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : maxMemory.longValue());
- statDetails.put(STATS_USEDMEMORY, usedMemory == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : usedMemory.longValue());
- statDetails.put(STATS_GETS, gets == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : gets.intValue());
- statDetails.put(STATS_GETTIME, getTime == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : getTime.intValue());
- statDetails.put(STATS_PUTS, puts == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : puts.intValue());
- statDetails.put(STATS_PUTTIME, putTime == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : putTime.longValue());
+
+ statDetails.put(STATS_PROCESSCPUTIME, processCpuTime == NOT_AVAILABLE_NUMBER
+ ? NOT_AVAILABLE_NUMBER : processCpuTime.longValue());
+ statDetails.put(STATS_CPUS,
+ cpus == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : cpus.intValue());
+ statDetails.put(STATS_MAXMEMORY,
+ maxMemory == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : maxMemory.longValue());
+ statDetails.put(STATS_USEDMEMORY,
+ usedMemory == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : usedMemory.longValue());
+ statDetails.put(STATS_GETS,
+ gets == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : gets.intValue());
+ statDetails.put(STATS_GETTIME,
+ getTime == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : getTime.intValue());
+ statDetails.put(STATS_PUTS,
+ puts == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : puts.intValue());
+ statDetails.put(STATS_PUTTIME,
+ putTime == NOT_AVAILABLE_NUMBER ? NOT_AVAILABLE_NUMBER : putTime.longValue());
}
} catch (Exception e) {
logger.warn(e.getMessage(), e);
throw new OperationsException(e.getMessage());
}
-
+
return statDetails;
}
@@ -1070,45 +1082,37 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
* Returns attribute with given attribute name on MBean with given ObjectName.
*
*
- * @param objectName
- * ObjectName for the MBean
- * @param attribute
- * attribute name
- * @param unavailableValue
- * return this value if the attribute value is null
+ * @param objectName ObjectName for the MBean
+ * @param attribute attribute name
+ * @param unavailableValue return this value if the attribute value is null
* @return value of attribute with given attribute name
- * @throws OperationsException
- * if attribute is not found for MBean with this ObjectName or MBean
- * instance is not found
- * @throws MBeanException
- * if MBeans getter throws exception
- * @throws ReflectionException
- * thrown when trying to invoke the setter.
+ * @throws OperationsException if attribute is not found for MBean with this ObjectName or MBean
+ * instance is not found
+ * @throws MBeanException if MBeans getter throws exception
+ * @throws ReflectionException thrown when trying to invoke the setter.
*/
- private Object getAttribute(ObjectName objectName, String attribute,
- Object unavailableValue)
- throws OperationsException, MBeanException, ReflectionException {
+ private Object getAttribute(ObjectName objectName, String attribute, Object unavailableValue)
+ throws OperationsException, MBeanException, ReflectionException {
/* NOTE: callers methods rely on non-null value being returned */
Object value = null;
-
+
MBeanServer mBeanServer = agent.getMBeanServer();
value = mBeanServer.getAttribute(objectName, attribute);
-
- value = (value != null)? value : unavailableValue;
-
+
+ value = (value != null) ? value : unavailableValue;
+
return value;
}
/**
* Return Map of region full against the ObjectName of existing region MBeans.
*
- * @param memberId
- * string identifier of a member
+ * @param memberId string identifier of a member
* @return Map of region path vs ObjectName for existing region MBeans
- * @throws MalformedObjectNameException
- * If the query expression used is not valid
+ * @throws MalformedObjectNameException If the query expression used is not valid
*/
- private Map<String, ObjectName> getExistingRegionMbeansFullPaths(String memberId) throws MalformedObjectNameException {
+ private Map<String, ObjectName> getExistingRegionMbeansFullPaths(String memberId)
+ throws MalformedObjectNameException {
Map<String, ObjectName> pathsToObjName = new HashMap<String, ObjectName>();
if (memberId != null && memberId.trim().length() != 0) {
@@ -1118,69 +1122,63 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
pathsToObjName.put(objectName.getKeyProperty("path"), objectName);
}
}
-
+
return pathsToObjName;
}
/**
* Returns an array of ObjectNames existing statistics types MBeans
*
- * @param memberId
- * string identifier of a member
- * @param name
- * text id of the stats which appears in the stats ObjectName as name
- * keyProperty
+ * @param memberId string identifier of a member
+ * @param name text id of the stats which appears in the stats ObjectName as name keyProperty
* @return Array of Stats MBean ObjectNames
- * @throws MalformedObjectNameException
- * If the query expression used is not valid
+ * @throws MalformedObjectNameException If the query expression used is not valid
*/
- private ObjectName[] getExistingStats(String memberId, String name) throws MalformedObjectNameException {
+ private ObjectName[] getExistingStats(String memberId, String name)
+ throws MalformedObjectNameException {
ObjectName[] statObjectNames = new ObjectName[0];
-
+
if (memberId != null && memberId.trim().length() != 0) {
Object[] params = new Object[] {MBeanUtil.makeCompliantMBeanNameProperty(memberId), name};
Set<ObjectName> queryNames = queryObjectNames(STATS_QUERY_EXPRESSION, params);
statObjectNames = new ObjectName[queryNames.size()];
statObjectNames = queryNames.toArray(statObjectNames);
}
-
+
return statObjectNames;
}
/**
- * Queries the MBean server with the string formed using placing the params in
- * the parameterized string passed as queryStr.
+ * Queries the MBean server with the string formed using placing the params in the parameterized
+ * string passed as queryStr.
*
- * @param queryStr
- * parameterized string
- * @param params
- * params to put in the string
+ * @param queryStr parameterized string
+ * @param params params to put in the string
* @return results of an ObjectName query
- * @throws MalformedObjectNameException
- * If the query expression ObjectName formed is not valid
+ * @throws MalformedObjectNameException If the query expression ObjectName formed is not valid
*/
- private Set<ObjectName> queryObjectNames(String queryStr, Object ... params)
- throws MalformedObjectNameException {
- Set<ObjectName> queried = Collections.emptySet();
-
- queryStr = MessageFormat.format(queryStr, params);
+ private Set<ObjectName> queryObjectNames(String queryStr, Object... params)
+ throws MalformedObjectNameException {
+ Set<ObjectName> queried = Collections.emptySet();
+
+ queryStr = MessageFormat.format(queryStr, params);
ObjectName queryExp = ObjectName.getInstance(queryStr);
queried = agent.getMBeanServer().queryNames(null, queryExp);
-
+
return queried;
}
-
-
+
+
/* *************************************************************************/
/* **************** NOTIFICATION EMITTER IMPLEMENTATION ********************/
/* *************************************************************************/
/**
- * @see NotificationEmitter#addNotificationListener(NotificationListener, NotificationFilter, Object)
+ * @see NotificationEmitter#addNotificationListener(NotificationListener, NotificationFilter,
+ * Object)
*/
- public void addNotificationListener(NotificationListener listener,
- NotificationFilter filter, Object handback)
- throws IllegalArgumentException {
+ public void addNotificationListener(NotificationListener listener, NotificationFilter filter,
+ Object handback) throws IllegalArgumentException {
forwarder.addNotificationListener(listener, filter, handback);
}
@@ -1198,65 +1196,59 @@ public class MemberInfoWithStatsMBean extends AbstractDynamicMBean
public MBeanNotificationInfo[] getNotificationInfo() {
return getMBeanInfo().getNotifications();
}
-
+
/**
- * @see NotificationEmitter#removeNotificationListener(NotificationListener, NotificationFilter, Object)
+ * @see NotificationEmitter#removeNotificationListener(NotificationListener, NotificationFilter,
+ * Object)
*/
- public void removeNotificationListener(NotificationListener listener,
- NotificationFilter filter, Object handback)
- throws ListenerNotFoundException {
+ public void removeNotificationListener(NotificationListener listener, NotificationFilter filter,
+ Object handback) throws ListenerNotFoundException {
forwarder.removeNotificationListener(listener, filter, handback);
}
-
+
}
+
/**
- * This class acts as a hub for the Notifications defined on
- * AdminDistributedSystem & SystemMember MBeans. This acts as a listener for
- * these notifications and broadcasts them as notifications from the
- * {@link MemberInfoWithStatsMBean} MBean. This class extends
- * {@link NotificationBroadcasterSupport} only to have the functionality to send
- * notifications.
+ * This class acts as a hub for the Notifications defined on AdminDistributedSystem & SystemMember
+ * MBeans. This acts as a listener for these notifications and broadcasts them as notifications from
+ * the {@link MemberInfoWithStatsMBean} MBean. This class extends
+ * {@link NotificationBroadcasterSupport} only to have the functionality to send notifications.
*
*
* @since GemFire 6.5
*/
-class NotificationForwarder extends NotificationBroadcasterSupport
- implements NotificationListener {
-
+class NotificationForwarder extends NotificationBroadcasterSupport implements NotificationListener {
+
private static final Logger logger = LogService.getLogger();
-
+
/* sequence generator for notifications from GemFireTypesWrapper MBean */
private static AtomicLong notificationSequenceNumber = new AtomicLong();
/* reference to the MBeanServer instance */
- private MBeanServer mBeanServer;
+ private MBeanServer mBeanServer;
/**
* Default Constructor
*
- * @param mBeanServer
- * reference to the MBeanServer instance
+ * @param mBeanServer reference to the MBeanServer instance
*/
- /*default*/NotificationForwarder(MBeanServer mBeanServer) {
+ /* default */ NotificationForwarder(MBeanServer mBeanServer) {
this.mBeanServer = mBeanServer;
}
/**
- * Handles notifications as: 1. Member Joined: Registers this
- * NotificationForwarder as a notification listener for Cache/Region
- * Notifications. 2. Member Left/Crashed: Unregisters this
- * NotificationForwarder as a notification listener for Cache/Region
- * Notifications. 3. AdminDistributedSystem Disconnected: Unregisters this
- * NotificationForwarder as a notification listener for member Notifications.
+ * Handles notifications as: 1. Member Joined: Registers this NotificationForwarder as a
+ * notification listener for Cache/Region Notifications. 2. Member Left/Crashed: Unregisters this
+ * NotificationForwarder as a notification listener for Cache/Region Notifications. 3.
+ * AdminDistributedSystem Disconnected: Unregisters this NotificationForwarder as a notification
+ * listener for member Notifications.
*
- * Forwards the notifications to the JMX Clients that have registered for
- * notifications on this MBean
+ * Forwards the notifications to the JMX Clients that have registered for notifications on this
+ * MBean
*
- * @param notification
- * notification to be handled
- * @param handback
- * handback object used while NotificationForwarder was registered
+ * @param notification notification to be handled
+ * @param handback handback object used while NotificationForwarder was registered
*
* @see NotificationListener#handleNotification(Notification, Object)
*/
@@ -1264,10 +1256,11 @@ class NotificationForwarder extends NotificationBroadcasterSupport
Object notifSource = notification.getSource();
if (AdminDistributedSystemJmxImpl.NOTIF_MEMBER_JOINED.equals(notification.getType())) {
ObjectName source = (ObjectName) notifSource;
- //initialize statistics/register with refreshTimer for new member
+ // initialize statistics/register with refreshTimer for new member
String[] noArgs = {};
try {
- ObjectName[] stats = (ObjectName[]) mBeanServer.invoke(source, "manageStats", noArgs, noArgs);
+ ObjectName[] stats =
+ (ObjectName[]) mBeanServer.invoke(source, "manageStats", noArgs, noArgs);
if (stats != null) {
for (ObjectName stat : stats) {
mBeanServer.invoke(stat, "getStatistics", noArgs, noArgs);
@@ -1275,78 +1268,80 @@ class NotificationForwarder extends NotificationBroadcasterSupport
}
logger.debug("getStatistics call completed with no exceptions.");
} catch (ReflectionException e) {
- logger.info(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INITIALIZING_STATISICS_FOR_0, source.toString()), e);
+ logger.info(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INITIALIZING_STATISICS_FOR_0,
+ source.toString()), e);
} catch (MBeanException e) {
- logger.info(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INITIALIZING_STATISICS_FOR_0, source.toString()), e);
+ logger.info(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INITIALIZING_STATISICS_FOR_0,
+ source.toString()), e);
} catch (InstanceNotFoundException e) {
- logger.info(LocalizedMessage.create(LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INITIALIZING_STATISICS_FOR_0, source.toString()), e);
+ logger.info(LocalizedMessage.create(
+ LocalizedStrings.MemberInfoWithStatsMBean_EXCEPTION_WHILE_INITIALIZING_STATISICS_FOR_0,
+ source.toString()), e);
}
- //register this listener for joined member's cache/region notifications
+ //
<TRUNCATED>
[67/98] [abbrv] incubator-geode git commit: GEODE-2025: do not use
8080 as the default http-server-port since we defined default in
DistributionConfig
Posted by ds...@apache.org.
GEODE-2025: do not use 8080 as the default http-server-port since we defined default in DistributionConfig
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/b4b6e079
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b4b6e079
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b4b6e079
Branch: refs/heads/feature/GEM-983
Commit: b4b6e079d355aa5ef7b7c49d526772d8ecb7c75c
Parents: bd6f9e6
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Mon Oct 24 15:59:35 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Oct 24 16:00:38 2016 -0700
----------------------------------------------------------------------
.../management/internal/cli/commands/golden-help-offline.properties | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b4b6e079/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
index 40c28d2..7ee735b 100644
--- a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
+++ b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
@@ -2731,7 +2731,6 @@ PARAMETERS\n\
\ \ \ \ http-service-port\n\
\ \ \ \ \ \ \ \ Port on which HTTP Service will listen on\n\
\ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ \ \ \ \ Default (if the parameter is not specified): 8080\n\
\ \ \ \ http-service-bind-address\n\
\ \ \ \ \ \ \ \ The IP address on which the HTTP Service will be bound. By default, the Server is bound to\n\
\ \ \ \ \ \ \ \ all local addresses.\n\
[54/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/swagger-ui.min.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/swagger-ui.min.js b/geode-web-api/src/main/webapp/docs/swagger-ui.min.js
deleted file mode 100644
index d6d7c89..0000000
--- a/geode-web-api/src/main/webapp/docs/swagger-ui.min.js
+++ /dev/null
@@ -1 +0,0 @@
-$(function(){$.fn.vAlign=function(){return this.each(function(c){var a=$(this).height();var d=$(this).parent().height();var b=(d-a)/2;$(this).css("margin-top",b)})};$.fn.stretchFormtasticInputWidthToParent=function(){return this.each(function(b){var d=$(this).closest("form").innerWidth();var c=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10);var a=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",d-c-a)})};$("form.formtastic li.string input, form.formtastic textarea").stretchFormtasticInputWidthToParent();$("ul.downplayed li div.content p").vAlign();$("form.sandbox").submit(function(){var a=true;$(this).find("input.required").each(function(){$(this).removeClass("error");if($(this).val()==""){$(this).addClass("error");$(this).wiggle();a=false}});return a})});function clippyCopiedCallback(b){$("#api_key_copied").fadeIn().delay(1000).fadeOut()}log=function(){log.histor
y=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments))}};if(Function.prototype.bind&&console&&typeof console.log=="object"){["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(a){console[a]=this.bind(console[a],console)},Function.prototype.call)}var Docs={shebang:function(){var b=$.param.fragment().split("/");b.shift();switch(b.length){case 1:log("shebang resource:"+b[0]);var d="resource_"+b[0];Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});break;case 2:log("shebang endpoint: "+b.join("_"));Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});var c=b.join("_");var a=c+"_content";log("li_dom_id "+c);log("li_content_dom_id "+a);Docs.expandOperation($("#"+a));$("#"+c).slideto({highlight:false});break}},toggleEndpointListForResource:function(b){var a=$("li#resource_"+Docs.escapeResourceName(b)+" ul.endpoints");if(a.is(":visible")){Docs
.collapseEndpointListForResource(b)}else{Docs.expandEndpointListForResource(b)}},expandEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);if(b==""){$(".resource ul.endpoints").slideDown();return}$("li#resource_"+b).addClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideDown()},collapseEndpointListForResource:function(b){var b=Docs.escapeResourceName(b);$("li#resource_"+b).removeClass("active");var a=$("li#resource_"+b+" ul.endpoints");a.slideUp()},expandOperationsForResource:function(a){Docs.expandEndpointListForResource(a);if(a==""){$(".resource ul.endpoints li.operation div.content").slideDown();return}$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(a){Docs.expandEndpointListForResource(a);$("li#resource_"+Docs.escapeResourceName(a)+" li.operation div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(
a){return a.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(a){a.slideDown()},collapseOperation:function(a){a.slideUp()}};(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n ";return o}function n(p,o){return'\n <option value="application/json">application/json</option>\n'}i+='<label for="contentType"></label>\n<select name="contentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n
";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.main=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",c,h="function",j=this.escapeExpression,p=this;function e(v,u){var r="",t,s;r+='\n <div class="info_title">'+j(((t=((t=v.info),t==null||t===false?t:t.title)),typeof t===h?t.apply(v):t))+'</div>\n <div class="info_description">';s=((t=((t=v.info),t==null||t===false?t:t.description)),typeof t===h?t.apply(v):t);if(s||s===0){r+=s}r+="</div>\n ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.termsOfServiceUrl),{hash:{},inverse:p.noop,fn:p.program(2,d,u),data:u});if(s||s===0){r+=s}r+="\n ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.contact),{hash:{},inverse:p.noop,fn:p.program(4,q,u),data:u});if(s||s===0){r+=s}r+="\n ";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.license),{hash:{},inverse:p.noop,fn:p.program(6,o,u),data:u});if(s||s===0){r+=s}r+="\n
";return r}function d(u,t){var r="",s;r+='<div class="info_tos"><a href="'+j(((s=((s=u.info),s==null||s===false?s:s.termsOfServiceUrl)),typeof s===h?s.apply(u):s))+'">Terms of service</a></div>';return r}function q(u,t){var r="",s;r+="<div class='info_contact'><a href=\"mailto:"+j(((s=((s=u.info),s==null||s===false?s:s.contact)),typeof s===h?s.apply(u):s))+'">Contact the developer</a></div>';return r}function o(u,t){var r="",s;r+="<div class='info_license'><a href='"+j(((s=((s=u.info),s==null||s===false?s:s.licenseUrl)),typeof s===h?s.apply(u):s))+"'>"+j(((s=((s=u.info),s==null||s===false?s:s.license)),typeof s===h?s.apply(u):s))+"</a></div>";return r}function n(u,t){var r="",s;r+='\n , <span style="font-variant: small-caps">api version</span>: ';if(s=f.apiVersion){s=s.call(u,{hash:{},data:t})}else{s=u.apiVersion;s=typeof s===h?s.apply(u):s}r+=j(s)+"\n ";return r}i+="<div class='info' id='api_info'>\n ";c=f["if"].call(m,m.info,{hash:{},inverse:p.noop,fn:p.program(1,e,
k),data:k});if(c||c===0){i+=c}i+="\n</div>\n<div class='container' id='resources_container'>\n <ul id='resources'>\n </ul>\n\n <div class=\"footer\">\n <br>\n <br>\n <h4 style=\"color: #999\">[ <span style=\"font-variant: small-caps\">base url</span>: ";if(c=f.basePath){c=c.call(m,{hash:{},data:k})}else{c=m.basePath;c=typeof c===h?c.apply(m):c}i+=j(c)+"\n ";c=f["if"].call(m,m.apiVersion,{hash:{},inverse:p.noop,fn:p.program(8,n,k),data:k});if(c||c===0){i+=c}i+="]</h4>\n </div>\n</div>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.operation=b(function(g,s,q,m,y){this.compilerInfo=[4,">= 1.0.0"];q=this.merge(q,g.helpers);y=y||{};var r="",i,f,e="function",d=this.escapeExpression,p=this,c=q.blockHelperMissing;function o(C,B){var z="",A;z+="\n <h4>Implementation Notes</h4>\n <p>";if(A=q.notes){A=A.call(C,{hash:{},data:B})}else{A=C.notes;A=typeof A===e?A.apply(C):A}if(A||A===0)
{z+=A}z+="</p>\n ";return z}function n(A,z){return'\n <div class="auth">\n <span class="api-ic ic-error"></span>'}function l(C,B){var z="",A;z+='\n <div id="api_information_panel" style="top: 526px; left: 776px; display: none;">\n ';A=q.each.call(C,C,{hash:{},inverse:p.noop,fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n </div>\n ";return z}function k(D,C){var z="",B,A;z+="\n <div title='";A=((B=D.description),typeof B===e?B.apply(D):B);if(A||A===0){z+=A}z+="'>"+d(((B=D.scope),typeof B===e?B.apply(D):B))+"</div>\n ";return z}function h(A,z){return"</div>"}function x(A,z){return'\n <div class=\'access\'>\n <span class="api-ic ic-off" title="click to authenticate"></span>\n </div>\n '}function w(A,z){return'\n <h4>Response Class</h4>\n <p><span class="model-signature" /></p>\n <br/>\n <div class="response-content-type" />\n '}functio
n v(A,z){return'\n <h4>Parameters</h4>\n <table class=\'fullwidth\'>\n <thead>\n <tr>\n <th style="width: 100px; max-width: 100px">Parameter</th>\n <th style="width: 310px; max-width: 310px">Value</th>\n <th style="width: 200px; max-width: 200px">Description</th>\n <th style="width: 100px; max-width: 100px">Parameter Type</th>\n <th style="width: 220px; max-width: 230px">Data Type</th>\n </tr>\n </thead>\n <tbody class="operation-params">\n\n </tbody>\n </table>\n '}function u(A,z){return"\n <div style='margin:0;padding:0;display:inline'></div>\n <h4>Response Messages</h4>\n <table class='fullwidth'>\n <thead>\n <tr>\n <th>HTTP Status Code</th>\n <th>Reason</th>\n <th>Response Model</th>\n </tr>\n </thead>\n <tbody cl
ass=\"operation-status\">\n \n </tbody>\n </table>\n "}function t(A,z){return"\n "}function j(A,z){return"\n <div class='sandbox_header'>\n <input class='submit' name='commit' type='button' value='Try it out!' />\n <a href='#' class='response_hider' style='display:none'>Hide Response</a>\n <img alt='Throbber' class='response_throbber' src='images/throbber.gif' style='display:none' />\n </div>\n "}r+="\n <ul class='operations' >\n <li class='";if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+" operation' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"'>\n <div class='heading'>\n <h3>\n <span class='http_method'>\n <a href='#!/";if(i=q.p
arentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.method){i=i.call(s,{hash:{},data:y})}else{i=s.method;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n </span>\n <span class='path'>\n <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.path){i=i.call(s,{hash:{},data:y})}else{i=s.path;i=typeof i===e?i.apply(s):i}r+=d(i)+"</a>\n </span>\n </h3>\n <ul class='options'>\n <li>\n <a href='#!/";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"/";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=
s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+'\' class="toggleOperation">';if(i=q.summary){i=i.call(s,{hash:{},data:y})}else{i=s.summary;i=typeof i===e?i.apply(s):i}if(i||i===0){r+=i}r+="</a>\n </li>\n </ul>\n </div>\n <div class='content' id='";if(i=q.parentId){i=i.call(s,{hash:{},data:y})}else{i=s.parentId;i=typeof i===e?i.apply(s):i}r+=d(i)+"_";if(i=q.nickname){i=i.call(s,{hash:{},data:y})}else{i=s.nickname;i=typeof i===e?i.apply(s):i}r+=d(i)+"_content' style='display:none'>\n ";i=q["if"].call(s,s.notes,{hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y});if(i||i===0){r+=i}r+="\n ";f={hash:{},inverse:p.noop,fn:p.program(3,n,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n ";i=q.each.call(s,s.oauth,{hash:{},inverse:p.noop,fn:p.program(5,l,y),data:y});if(i||i===0){r+=i}r+="\n ";f={hash:{},inverse:p.noop,fn:p.program(8,h,y),data:y};if(i=q.oau
th){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n ";f={hash:{},inverse:p.noop,fn:p.program(10,x,y),data:y};if(i=q.oauth){i=i.call(s,f)}else{i=s.oauth;i=typeof i===e?i.apply(s):i}if(!q.oauth){i=c.call(s,i,f)}if(i||i===0){r+=i}r+="\n ";i=q["if"].call(s,s.type,{hash:{},inverse:p.noop,fn:p.program(12,w,y),data:y});if(i||i===0){r+=i}r+="\n <form accept-charset='UTF-8' class='sandbox'>\n <div style='margin:0;padding:0;display:inline'></div>\n ";i=q["if"].call(s,s.parameters,{hash:{},inverse:p.noop,fn:p.program(14,v,y),data:y});if(i||i===0){r+=i}r+="\n ";i=q["if"].call(s,s.responseMessages,{hash:{},inverse:p.noop,fn:p.program(16,u,y),data:y});if(i||i===0){r+=i}r+="\n ";i=q["if"].call(s,s.isReadOnly,{hash:{},inverse:p.program(20,j,y),fn:p.program(18,t,y),data:y});if(i||i===0){r+=i}r+="\n </form>\n <div class='response' style='display:none'>\n <h4>R
equest URL</h4>\n <div class='block request_url'></div>\n <h4>Response Body</h4>\n <div class='block response_body'></div>\n <h4>Response Code</h4>\n <div class='block response_code'></div>\n <h4>Response Headers</h4>\n <div class='block response_headers'></div>\n </div>\n </div>\n </li>\n </ul>\n";return r})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param=b(function(f,q,o,j,s){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);s=s||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(x,w){var u="",v;u+="\n ";v=o["if"].call(x,x.isFile,{hash:{},inverse:n.program(4,k,w),fn:n.program(2,l,w),data:w});if(v||v===0){u+=v}u+="\n ";return u}function l(x,w){var u="",v;u+='\n <input type="file" name=\'';if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+'\'/>\n <div class="parameter-content-type" /
>\n ';return u}function k(x,w){var u="",v;u+="\n ";v=o["if"].call(x,x.defaultValue,{hash:{},inverse:n.program(7,h,w),fn:n.program(5,i,w),data:w});if(v||v===0){u+=v}u+="\n ";return u}function i(x,w){var u="",v;u+="\n <textarea class='body-textarea' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+"'>";if(v=o.defaultValue){v=v.call(x,{hash:{},data:w})}else{v=x.defaultValue;v=typeof v===d?v.apply(x):v}u+=c(v)+"</textarea>\n ";return u}function h(x,w){var u="",v;u+="\n <textarea class='body-textarea' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+'\'></textarea>\n <br />\n <div class="parameter-content-type" />\n ';return u}function e(x,w){var u="",v;u+="\n ";v=o["if"].call(x,x.defaultValue,{hash:{},inverse:n.program(12,r,w),fn:n.program(10,t,w),data:w});if(v||v===0){u+=v}u+="\n ";return u}function t(x,w){var u="",v;u+="\n <input class='parameter' minlength='0'
name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+"' placeholder='' type='text' value='";if(v=o.defaultValue){v=v.call(x,{hash:{},data:w})}else{v=x.defaultValue;v=typeof v===d?v.apply(x):v}u+=c(v)+"'/>\n ";return u}function r(x,w){var u="",v;u+="\n <input class='parameter' minlength='0' name='";if(v=o.name){v=v.call(x,{hash:{},data:w})}else{v=x.name;v=typeof v===d?v.apply(x):v}u+=c(v)+"' placeholder='' type='text' value=''/>\n ";return u}p+="<td class='code'>";if(g=o.name){g=g.call(q,{hash:{},data:s})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n\n ";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,s),fn:n.program(1,m,s),data:s});if(g||g===0){p+=g}p+="\n\n</td>\n<td>";if(g=o.description){g=g.call(q,{hash:{},data:s})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:s})}else{g=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0)
{p+=g}p+='</td>\n<td>\n <span class="model-signature"></span>\n</td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_list=b(function(h,t,r,m,y){this.compilerInfo=[4,">= 1.0.0"];r=this.merge(r,h.helpers);y=y||{};var s="",j,g,e,p=this,q=r.helperMissing,d="function",c=this.escapeExpression;function o(A,z){return" multiple='multiple'"}function n(A,z){return"\n "}function l(C,B){var z="",A;z+="\n ";A=r["if"].call(C,C.defaultValue,{hash:{},inverse:p.program(8,i,B),fn:p.program(6,k,B),data:B});if(A||A===0){z+=A}z+="\n ";return z}function k(A,z){return"\n "}function i(E,D){var z="",C,B,A;z+="\n ";A={hash:{},inverse:p.program(11,x,D),fn:p.program(9,f,D),data:D};B=((C=r.isArray||E.isArray),C?C.call(E,E,A):q.call(E,"isArray",E,A));if(B||B===0){z+=B}z+="\n ";return z}function f(A,z){return"\n "}function x(A,z){return"\n <option selected=\"\" value=''></option>\n "}function w(C,B){v
ar z="",A;z+="\n ";A=r["if"].call(C,C.isDefault,{hash:{},inverse:p.program(16,u,B),fn:p.program(14,v,B),data:B});if(A||A===0){z+=A}z+="\n ";return z}function v(C,B){var z="",A;z+='\n <option selected="" value=\'';if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+" (default)</option>\n ";return z}function u(C,B){var z="",A;z+="\n <option value='";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"'>";if(A=r.value){A=A.call(C,{hash:{},data:B})}else{A=C.value;A=typeof A===d?A.apply(C):A}z+=c(A)+"</option>\n ";return z}s+="<td class='code'>";if(j=r.name){j=j.call(t,{hash:{},data:y})}else{j=t.name;j=typeof j===d?j.apply(t):j}s+=c(j)+"</td>\n<td>\n <select ";e={hash:{},inverse:p.noop,fn:p.program(1,o,y),data:y};g=((j=r.isArray||t.isArray),j?j.call(t,t,e):q.call(t,"isArray"
,t,e));if(g||g===0){s+=g}s+=" class='parameter' name='";if(g=r.name){g=g.call(t,{hash:{},data:y})}else{g=t.name;g=typeof g===d?g.apply(t):g}s+=c(g)+"'>\n ";g=r["if"].call(t,t.required,{hash:{},inverse:p.program(5,l,y),fn:p.program(3,n,y),data:y});if(g||g===0){s+=g}s+="\n ";g=r.each.call(t,((j=t.allowableValues),j==null||j===false?j:j.descriptiveValues),{hash:{},inverse:p.noop,fn:p.program(13,w,y),data:y});if(g||g===0){s+=g}s+="\n </select>\n</td>\n<td>";if(g=r.description){g=g.call(t,{hash:{},data:y})}else{g=t.description;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+="</td>\n<td>";if(g=r.paramType){g=g.call(t,{hash:{},data:y})}else{g=t.paramType;g=typeof g===d?g.apply(t):g}if(g||g===0){s+=g}s+='</td>\n<td><span class="model-signature"></span></td>';return s})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="functio
n",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n <textarea class='body-textarea' readonly='readonly' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n ";return q}function c(t,s){var q="",r;q+="\n ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n ";return q}function p(t,s){var q="",r;q+="\n ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n ";return q}function n(r,q){return"\n (empty)\n "}i+="<td class='code'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),dat
a:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_readonly_required=b(function(g,m,f,l,k){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var i="",d,h="function",j=this.escapeExpression,o=this;function e(t,s){var q="",r;q+="\n <textarea class='body-textarea' readonly='readonly' placeholder='(required)' name='";if(r=f.name){r=r.call(t,{hash:{},data:s})}else{r=t.name;r=typeof r===h?r.apply(t):r}q+=j(r)+"'>";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"</textarea>\n ";return q}function c(t,s){
var q="",r;q+="\n ";r=f["if"].call(t,t.defaultValue,{hash:{},inverse:o.program(6,n,s),fn:o.program(4,p,s),data:s});if(r||r===0){q+=r}q+="\n ";return q}function p(t,s){var q="",r;q+="\n ";if(r=f.defaultValue){r=r.call(t,{hash:{},data:s})}else{r=t.defaultValue;r=typeof r===h?r.apply(t):r}q+=j(r)+"\n ";return q}function n(r,q){return"\n (empty)\n "}i+="<td class='code required'>";if(d=f.name){d=d.call(m,{hash:{},data:k})}else{d=m.name;d=typeof d===h?d.apply(m):d}i+=j(d)+"</td>\n<td>\n ";d=f["if"].call(m,m.isBody,{hash:{},inverse:o.program(3,c,k),fn:o.program(1,e,k),data:k});if(d||d===0){i+=d}i+="\n</td>\n<td>";if(d=f.description){d=d.call(m,{hash:{},data:k})}else{d=m.description;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+="</td>\n<td>";if(d=f.paramType){d=d.call(m,{hash:{},data:k})}else{d=m.paramType;d=typeof d===h?d.apply(m):d}if(d||d===0){i+=d}i+='</td>\n<td><span class="model-signature"></span></td>\n';return i})})();(function(){
var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.param_required=b(function(f,q,o,j,u){this.compilerInfo=[4,">= 1.0.0"];o=this.merge(o,f.helpers);u=u||{};var p="",g,d="function",c=this.escapeExpression,n=this;function m(z,y){var w="",x;w+="\n ";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(4,k,y),fn:n.program(2,l,y),data:y});if(x||x===0){w+=x}w+="\n ";return w}function l(z,y){var w="",x;w+='\n <input type="file" name=\'';if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n ";return w}function k(z,y){var w="",x;w+="\n ";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(7,h,y),fn:n.program(5,i,y),data:y});if(x||x===0){w+=x}w+="\n ";return w}function i(z,y){var w="",x;w+="\n <textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'>";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x
=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"</textarea>\n ";return w}function h(z,y){var w="",x;w+="\n <textarea class='body-textarea' placeholder='(required)' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+'\'></textarea>\n <br />\n <div class="parameter-content-type" />\n ';return w}function e(z,y){var w="",x;w+="\n ";x=o["if"].call(z,z.isFile,{hash:{},inverse:n.program(12,t,y),fn:n.program(10,v,y),data:y});if(x||x===0){w+=x}w+="\n ";return w}function v(z,y){var w="",x;w+="\n <input class='parameter' class='required' type='file' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n ";return w}function t(z,y){var w="",x;w+="\n ";x=o["if"].call(z,z.defaultValue,{hash:{},inverse:n.program(15,r,y),fn:n.program(13,s,y),data:y});if(x||x===0){w+=x}w+="\n ";return w}function s(z,y){var w="",x;w+="\n <input class='parameter required' minlength='1' name='
";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value='";if(x=o.defaultValue){x=x.call(z,{hash:{},data:y})}else{x=z.defaultValue;x=typeof x===d?x.apply(z):x}w+=c(x)+"'/>\n ";return w}function r(z,y){var w="",x;w+="\n <input class='parameter required' minlength='1' name='";if(x=o.name){x=x.call(z,{hash:{},data:y})}else{x=z.name;x=typeof x===d?x.apply(z):x}w+=c(x)+"' placeholder='(required)' type='text' value=''/>\n ";return w}p+="<td class='code required'>";if(g=o.name){g=g.call(q,{hash:{},data:u})}else{g=q.name;g=typeof g===d?g.apply(q):g}p+=c(g)+"</td>\n<td>\n ";g=o["if"].call(q,q.isBody,{hash:{},inverse:n.program(9,e,u),fn:n.program(1,m,u),data:u});if(g||g===0){p+=g}p+="\n</td>\n<td>\n <strong>";if(g=o.description){g=g.call(q,{hash:{},data:u})}else{g=q.description;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+="</strong>\n</td>\n<td>";if(g=o.paramType){g=g.call(q,{hash:{},data:u})}else{g
=q.paramType;g=typeof g===d?g.apply(q):g}if(g||g===0){p+=g}p+='</td>\n<td><span class="model-signature"></span></td>\n';return p})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.parameter_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n ";p=f.each.call(r,r.consumes,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n ";return o}function n(p,o){return'\n <option value="application/json">application/json</option>\n'}i+='<label for="parameterContentType"></label>\n<select name="parameterContentType">\n';c=f["if"].call(l,l.consumes,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</s
elect>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.resource=b(function(f,l,e,k,j){this.compilerInfo=[4,">= 1.0.0"];e=this.merge(e,f.helpers);j=j||{};var h="",c,o,g="function",i=this.escapeExpression,n=this,m=e.blockHelperMissing;function d(q,p){return" : "}h+="<div class='heading'>\n <h2>\n <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"' onclick=\"Docs.toggleEndpointListForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"');\">";if(c=e.name){c=c.call(l,{hash:{},data:j})}else{c=l.name;c=typeof c===g?c.apply(l):c}h+=i(c)+"</a> ";o={hash:{},inverse:n.noop,fn:n.program(1,d,j),data:j};if(c=e.description){c=c.call(l,o)}else{c=l.description;c=typeof c===g?c.apply(l):c}if(!e.description){c=m.call(l,c,o)}if(c||c===0){h+=c}if(c=e.description){c=c.call(l,{hash:{},data:j})}else{c=l.description;c=typeof c===g?c.apply(l):c}i
f(c||c===0){h+=c}h+="\n </h2>\n <ul class='options'>\n <li>\n <a href='#!/";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"' id='endpointListTogger_";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"'\n onclick=\"Docs.toggleEndpointListForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"');\">Show/Hide</a>\n </li>\n <li>\n <a href='#' onclick=\"Docs.collapseOperationsForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"'); return false;\">\n List Operations\n </a>\n </li>\n <li>\n <a href='#' onclick=\"Docs.expandOperationsForResource('";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"'); return false;\">\n Expand Operations\n </a>\n </li>\n <li>\n <a href='";if(c=e.url){c=c.call(l,{hash
:{},data:j})}else{c=l.url;c=typeof c===g?c.apply(l):c}h+=i(c)+"'>Raw</a>\n </li>\n </ul>\n</div>\n<ul class='endpoints' id='";if(c=e.id){c=c.call(l,{hash:{},data:j})}else{c=l.id;c=typeof c===g?c.apply(l):c}h+=i(c)+"_endpoint_list' style='display:none'>\n\n</ul>\n";return h})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.response_content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">= 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n ";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return o}function d(r,q){var o="",p;o+='\n <option value="';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+='">';p=(typeof r===h?r.apply(r):r);if(p||p===0){o+=p}o+="</option>\n ";return o}function n(p,o){return'\n <option value="application/json">application/json</option>\n'}i+='<label for="responseContentType"></label>\n<select nam
e="responseContentType">\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n</select>\n";return i})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.signature=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+='<div>\n<ul class="signature-nav">\n <li><a class="description-link" href="#">Model</a></li>\n <li><a class="snippet-link" href="#">Model Schema</a></li>\n</ul>\n<div>\n\n<div class="signature-container">\n <div class="description">\n ';if(c=d.signature){c=c.call(k,{hash:{},data:i})}else{c=k.signature;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+='\n </div>\n\n <div class="snippet">\n <pre><code>';if(c=d.sampleJSON){c=c.call(k,{hash:{},data:i})}else{c=k.sampleJSON;c=typeof c===f?c.apply(k):c}g+=h(c)+'</code></pre>\n <small class="notice"></sma
ll>\n </div>\n</div>\n\n';return g})})();(function(){var b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.status_code=b(function(e,k,d,j,i){this.compilerInfo=[4,">= 1.0.0"];d=this.merge(d,e.helpers);i=i||{};var g="",c,f="function",h=this.escapeExpression;g+="<td width='15%' class='code'>";if(c=d.code){c=c.call(k,{hash:{},data:i})}else{c=k.code;c=typeof c===f?c.apply(k):c}g+=h(c)+"</td>\n<td>";if(c=d.message){c=c.call(k,{hash:{},data:i})}else{c=k.message;c=typeof c===f?c.apply(k):c}if(c||c===0){g+=c}g+="</td>\n<td width='50%'><span class=\"model-signature\" /></td>";return g})})();(function(){var j,r,u,o,l,k,n,m,i,p,s,q,h,c,g,f,e,d,b,a,x,w,t={}.hasOwnProperty,v=function(B,z){for(var y in z){if(t.call(z,y)){B[y]=z[y]}}function A(){this.constructor=B}A.prototype=z.prototype;B.prototype=new A();B.__super__=z.prototype;return B};s=(function(z){v(y,z);function y(){q=y.__super__.constructor.apply(this,arguments);return q}y.prototype.dom_id="swagger_ui";y.prototype
.options=null;y.prototype.api=null;y.prototype.headerView=null;y.prototype.mainView=null;y.prototype.initialize=function(A){var B=this;if(A==null){A={}}if(A.dom_id!=null){this.dom_id=A.dom_id;delete A.dom_id}if($("#"+this.dom_id)==null){$("body").append('<div id="'+this.dom_id+'"></div>')}this.options=A;this.options.success=function(){return B.render()};this.options.progress=function(C){return B.showMessage(C)};this.options.failure=function(C){return B.onLoadFailure(C)};this.headerView=new r({el:$("#header")});return this.headerView.on("update-swagger-ui",function(C){return B.updateSwaggerUi(C)})};y.prototype.updateSwaggerUi=function(A){this.options.url=A.url;return this.load()};y.prototype.load=function(){var B,A;if((A=this.mainView)!=null){A.clear()}B=this.options.url;if(B.indexOf("http")!==0){B=this.buildUrl(window.location.href.toString(),B)}this.options.url=B;this.headerView.update(B);this.api=new SwaggerApi(this.options);this.api.build();return this.api};y.prototype.render=fun
ction(){var A=this;this.showMessage("Finished Loading Resource Information. Rendering Swagger UI...");this.mainView=new u({model:this.api,el:$("#"+this.dom_id)}).render();this.showMessage();switch(this.options.docExpansion){case"full":Docs.expandOperationsForResource("");break;case"list":Docs.collapseOperationsForResource("")}if(this.options.onComplete){this.options.onComplete(this.api,this)}return setTimeout(function(){return Docs.shebang()},400)};y.prototype.buildUrl=function(C,A){var B,D;log("base is "+C);if(A.indexOf("/")===0){D=C.split("/");C=D[0]+"//"+D[2];return C+A}else{B=C.length;if(C.indexOf("?")>-1){B=Math.min(B,C.indexOf("?"))}if(C.indexOf("#")>-1){B=Math.min(B,C.indexOf("#"))}C=C.substring(0,B);if(C.indexOf("/",C.length-1)!==-1){return C+A}return C+"/"+A}};y.prototype.showMessage=function(A){if(A==null){A=""}$("#message-bar").removeClass("message-fail");$("#message-bar").addClass("message-success");return $("#message-bar").html(A)};y.prototype.onLoadFailure=function(A){
var B;if(A==null){A=""}$("#message-bar").removeClass("message-success");$("#message-bar").addClass("message-fail");B=$("#message-bar").html(A);if(this.options.onFailure!=null){this.options.onFailure(A)}return B};return y})(Backbone.Router);window.SwaggerUi=s;r=(function(z){v(y,z);function y(){h=y.__super__.constructor.apply(this,arguments);return h}y.prototype.events={"click #show-pet-store-icon":"showPetStore","click #show-wordnik-dev-icon":"showWordnikDev","click #explore":"showCustom","keyup #input_baseUrl":"showCustomOnKeyup","keyup #input_apiKey":"showCustomOnKeyup"};y.prototype.initialize=function(){};y.prototype.showPetStore=function(A){return this.trigger("update-swagger-ui",{url:"http://petstore.swagger.wordnik.com/api/api-docs"})};y.prototype.showWordnikDev=function(A){return this.trigger("update-swagger-ui",{url:"http://api.wordnik.com/v4/resources.json"})};y.prototype.showCustomOnKeyup=function(A){if(A.keyCode===13){return this.showCustom()}};y.prototype.showCustom=funct
ion(A){if(A!=null){A.preventDefault()}return this.trigger("update-swagger-ui",{url:$("#input_baseUrl").val(),apiKey:$("#input_apiKey").val()})};y.prototype.update=function(B,C,A){if(A==null){A=false}$("#input_baseUrl").val(B);if(A){return this.trigger("update-swagger-ui",{url:B})}};return y})(Backbone.View);u=(function(y){v(z,y);function z(){g=z.__super__.constructor.apply(this,arguments);return g}z.prototype.initialize=function(){};z.prototype.render=function(){var B,G,D,E,C,A,F;$(this.el).html(Handlebars.templates.main(this.model));E={};B=0;F=this.model.apisArray;for(C=0,A=F.length;C<A;C++){D=F[C];G=D.name;while(typeof E[G]!=="undefined"){G=G+"_"+B;B+=1}D.id=G;E[G]=D;this.addResource(D)}return this};z.prototype.addResource=function(B){var A;A=new n({model:B,tagName:"li",id:"resource_"+B.id,className:"resource"});return $("#resources").append(A.render().el)};z.prototype.clear=function(){return $(this.el).html("")};return z})(Backbone.View);n=(function(z){v(y,z);function y(){f=y.__s
uper__.constructor.apply(this,arguments);return f}y.prototype.initialize=function(){};y.prototype.render=function(){var B,G,D,C,E,A,F;$(this.el).html(Handlebars.templates.resource(this.model));D={};F=this.model.operationsArray;for(E=0,A=F.length;E<A;E++){C=F[E];B=0;G=C.nickname;while(typeof D[G]!=="undefined"){G=G+"_"+B;B+=1}D[G]=C;C.nickname=G;C.parentId=this.model.id;this.addOperation(C)}return this};y.prototype.addOperation=function(A){var B;A.number=this.number;B=new o({model:A,tagName:"li",className:"endpoint"});$(".endpoints",$(this.el)).append(B.render().el);return this.number++};return y})(Backbone.View);o=(function(z){v(y,z);function y(){e=y.__super__.constructor.apply(this,arguments);return e}y.prototype.invocationUrl=null;y.prototype.events={"submit .sandbox":"submitOperation","click .submit":"submitOperation","click .response_hider":"hideResponse","click .toggleOperation":"toggleOperationContent","mouseenter .api-ic":"mouseEnter","mouseout .api-ic":"mouseExit"};y.prototy
pe.initialize=function(){};y.prototype.mouseEnter=function(F){var D,E,I,B,A,J,G,C,K,H;D=$(F.currentTarget.parentNode).find("#api_information_panel");K=event.pageX;H=event.pageY;J=$(window).scrollLeft();G=$(window).scrollTop();B=J+$(window).width();A=G+$(window).height();C=D.width();E=D.height();if(K+C>B){K=B-C}if(K<J){K=J}if(H+E>A){H=A-E}if(H<G){H=G}I={};I.top=H;I.left=K;D.css(I);return $(F.currentTarget.parentNode).find("#api_information_panel").show()};y.prototype.mouseExit=function(A){return $(A.currentTarget.parentNode).find("#api_information_panel").hide()};y.prototype.render=function(){var Q,R,P,O,I,N,J,M,K,H,L,G,F,E,C,T,V,U,S,D,B,A,W;R=true;if(!R){this.model.isReadOnly=true}this.model.oauth=null;if(this.model.authorizations){D=this.model.authorizations;for(P in D){L=D[P];if(P==="oauth2"){if(this.model.oauth===null){this.model.oauth={}}if(this.model.oauth.scopes===void 0){this.model.oauth.scopes=[]}for(G=0,T=L.length;G<T;G++){O=L[G];this.model.oauth.scopes.push(O)}}}}$(this.el
).html(Handlebars.templates.operation(this.model));if(this.model.responseClassSignature&&this.model.responseClassSignature!=="string"){M={sampleJSON:this.model.responseSampleJSON,isParam:false,signature:this.model.responseClassSignature};J=new i({model:M,tagName:"div"});$(".model-signature",$(this.el)).append(J.render().el)}else{$(".model-signature",$(this.el)).html(this.model.type)}Q={isParam:false};Q.consumes=this.model.consumes;Q.produces=this.model.produces;B=this.model.parameters;for(F=0,V=B.length;F<V;F++){I=B[F];H=I.type||I.dataType;if(H.toLowerCase()==="file"){if(!Q.consumes){log("set content type ");Q.consumes="multipart/form-data"}}}N=new m({model:Q});$(".response-content-type",$(this.el)).append(N.render().el);A=this.model.parameters;for(E=0,U=A.length;E<U;E++){I=A[E];this.addParameter(I,Q.consumes)}W=this.model.responseMessages;for(C=0,S=W.length;C<S;C++){K=W[C];this.addStatusCode(K)}return this};y.prototype.addParameter=function(C,A){var B;C.consumes=A;B=new k({model:C,
tagName:"tr",readOnly:this.model.isReadOnly});return $(".operation-params",$(this.el)).append(B.render().el)};y.prototype.addStatusCode=function(B){var A;A=new p({model:B,tagName:"tr"});return $(".operation-status",$(this.el)).append(A.render().el)};y.prototype.submitOperation=function(O){var Q,G,N,D,I,A,J,M,L,K,P,F,C,H,E,B;if(O!=null){O.preventDefault()}G=$(".sandbox",$(this.el));Q=true;G.find("input.required").each(function(){var R=this;$(this).removeClass("error");if(jQuery.trim($(this).val())===""){$(this).addClass("error");$(this).wiggle({callback:function(){return $(R).focus()}});return Q=false}});if(Q){D={};A={parent:this};N=false;H=G.find("input");for(M=0,P=H.length;M<P;M++){I=H[M];if((I.value!=null)&&jQuery.trim(I.value).length>0){D[I.name]=I.value}if(I.type==="file"){N=true}}E=G.find("textarea");for(L=0,F=E.length;L<F;L++){I=E[L];if((I.value!=null)&&jQuery.trim(I.value).length>0){D.body=I.value}}B=G.find("select");for(K=0,C=B.length;K<C;K++){I=B[K];J=this.getSelectedValue(
I);if((J!=null)&&jQuery.trim(J).length>0){D[I.name]=J}}A.responseContentType=$("div select[name=responseContentType]",$(this.el)).val();A.requestContentType=$("div select[name=parameterContentType]",$(this.el)).val();$(".response_throbber",$(this.el)).show();if(N){return this.handleFileUpload(D,G)}else{return this.model["do"](D,A,this.showCompleteStatus,this.showErrorStatus,this)}}};y.prototype.success=function(A,B){return B.showCompleteStatus(A)};y.prototype.handleFileUpload=function(R,I){var M,H,C,N,L,K,P,J,G,F,D,Q,U,T,S,E,B,A,V,O=this;E=I.serializeArray();for(J=0,Q=E.length;J<Q;J++){N=E[J];if((N.value!=null)&&jQuery.trim(N.value).length>0){R[N.name]=N.value}}M=new FormData();P=0;B=this.model.parameters;for(G=0,U=B.length;G<U;G++){K=B[G];if(K.paramType==="form"){if(R[K.name]!==void 0){M.append(K.name,R[K.name])}}}C={};A=this.model.parameters;for(F=0,T=A.length;F<T;F++){K=A[F];if(K.paramType==="header"){C[K.name]=R[K.name]}}log(C);V=I.find('input[type~="file"]');for(D=0,S=V.length;
D<S;D++){H=V[D];if(typeof H.files[0]!=="undefined"){M.append($(H).attr("name"),H.files[0]);P+=1}}log(M);this.invocationUrl=this.model.supportHeaderParams()?(C=this.model.getHeaderParams(R),this.model.urlify(R,false)):this.model.urlify(R,true);$(".request_url",$(this.el)).html("<pre>"+this.invocationUrl+"</pre>");L={type:this.model.method,url:this.invocationUrl,headers:C,data:M,dataType:"json",contentType:false,processData:false,error:function(X,Y,W){return O.showErrorStatus(O.wrap(X),O)},success:function(W){return O.showResponse(W,O)},complete:function(W){return O.showCompleteStatus(O.wrap(W),O)}};if(window.authorizations){window.authorizations.apply(L)}if(P===0){L.data.append("fake","true")}jQuery.ajax(L);return false};y.prototype.wrap=function(E){var C,F,H,B,G,D,A;H={};F=E.getAllResponseHeaders().split("\r");for(D=0,A=F.length;D<A;D++){B=F[D];C=B.split(":");if(C[0]!==void 0&&C[1]!==void 0){H[C[0].trim()]=C[1].trim()}}G={};G.content={};G.content.data=E.responseText;G.headers=H;G.re
quest={};G.request.url=this.invocationUrl;G.status=E.status;return G};y.prototype.getSelectedValue=function(A){var D,C,F,B,E;if(!A.multiple){return A.value}else{C=[];E=A.options;for(F=0,B=E.length;F<B;F++){D=E[F];if(D.selected){C.push(D.value)}}if(C.length>0){return C.join(",")}else{return null}}};y.prototype.hideResponse=function(A){if(A!=null){A.preventDefault()}$(".response",$(this.el)).slideUp();return $(".response_hider",$(this.el)).fadeOut()};y.prototype.showResponse=function(A){var B;B=JSON.stringify(A,null,"\t").replace(/\n/g,"<br>");return $(".response_body",$(this.el)).html(escape(B))};y.prototype.showErrorStatus=function(B,A){return A.showStatus(B)};y.prototype.showCompleteStatus=function(B,A){return A.showStatus(B)};y.prototype.formatXml=function(H){var D,G,B,I,N,J,C,A,L,M,F,E,K;A=/(>)(<)(\/*)/g;M=/[ ]*(.*)[ ]+\n/g;D=/(<.+>)(.+\n)/g;H=H.replace(A,"$1\n$2$3").replace(M,"$1\n").replace(D,"$1\n$2");C=0;G="";N=H.split("\n");B=0;I="other";L={"single->single":0,"single->closin
g":-1,"single->opening":0,"single->other":0,"closing->single":0,"closing->closing":-1,"closing->opening":0,"closing->other":0,"opening->single":1,"opening->closing":0,"opening->opening":1,"opening->other":1,"other->single":0,"other->closing":-1,"other->opening":0,"other->other":0};F=function(T){var P,O,R,V,S,Q,U;Q={single:Boolean(T.match(/<.+\/>/)),closing:Boolean(T.match(/<\/.+>/)),opening:Boolean(T.match(/<[^!?].*>/))};S=((function(){var W;W=[];for(R in Q){U=Q[R];if(U){W.push(R)}}return W})())[0];S=S===void 0?"other":S;P=I+"->"+S;I=S;V="";B+=L[P];V=((function(){var X,Y,W;W=[];for(O=X=0,Y=B;0<=Y?X<Y:X>Y;O=0<=Y?++X:--X){W.push(" ")}return W})()).join("");if(P==="opening->closing"){return G=G.substr(0,G.length-1)+T+"\n"}else{return G+=V+T+"\n"}};for(E=0,K=N.length;E<K;E++){J=N[E];F(J)}return G};y.prototype.showStatus=function(A){var E,D,H,G,F,C,B;if(A.content===void 0){D=A.data;B=A.url}else{D=A.content.data;B=A.request.url}G=A.headers;H=G&&G["Content-Type"]?G["Content-Type"].split("
;")[0].trim():null;if(!D){E=$("<code />").text("no content");F=$('<pre class="json" />').append(E)}else{if(H==="application/json"||/\+json$/.test(H)){E=$("<code />").text(JSON.stringify(JSON.parse(D),null," "));F=$('<pre class="json" />').append(E)}else{if(H==="application/xml"||/\+xml$/.test(H)){E=$("<code />").text(this.formatXml(D));F=$('<pre class="xml" />').append(E)}else{if(H==="text/html"){E=$("<code />").html(D);F=$('<pre class="xml" />').append(E)}else{if(/^image\//.test(H)){F=$("<img>").attr("src",B)}else{E=$("<code />").text(D);F=$('<pre class="json" />').append(E)}}}}}C=F;$(".request_url",$(this.el)).html("<pre>"+B+"</pre>");$(".response_code",$(this.el)).html("<pre>"+A.status+"</pre>");$(".response_body",$(this.el)).html(C);$(".response_headers",$(this.el)).html("<pre>"+JSON.stringify(A.headers,null," ").replace(/\n/g,"<br>")+"</pre>");$(".response",$(this.el)).slideDown();$(".response_hider",$(this.el)).show();$(".response_throbber",$(this.el)).hide();return hljs.hig
hlightBlock($(".response_body",$(this.el))[0])};y.prototype.toggleOperationContent=function(){var A;A=$("#"+Docs.escapeResourceName(this.model.parentId)+"_"+this.model.nickname+"_content");if(A.is(":visible")){return Docs.collapseOperation(A)}else{return Docs.expandOperation(A)}};return y})(Backbone.View);p=(function(z){v(y,z);function y(){d=y.__super__.constructor.apply(this,arguments);return d}y.prototype.initialize=function(){};y.prototype.render=function(){var B,A,C;C=this.template();$(this.el).html(C(this.model));if(swaggerUi.api.models.hasOwnProperty(this.model.responseModel)){B={sampleJSON:JSON.stringify(swaggerUi.api.models[this.model.responseModel].createJSONSample(),null,2),isParam:false,signature:swaggerUi.api.models[this.model.responseModel].getMockSignature()};A=new i({model:B,tagName:"div"});$(".model-signature",this.$el).append(A.render().el)}else{$(".model-signature",this.$el).html("")}return this};y.prototype.template=function(){return Handlebars.templates.status_co
de};return y})(Backbone.View);k=(function(z){v(y,z);function y(){b=y.__super__.constructor.apply(this,arguments);return b}y.prototype.initialize=function(){return Handlebars.registerHelper("isArray",function(B,A){if(B.type.toLowerCase()==="array"||B.allowMultiple){return A.fn(this)}else{return A.inverse(this)}})};y.prototype.render=function(){var G,A,C,F,B,H,E,D;D=this.model.type||this.model.dataType;if(this.model.paramType==="body"){this.model.isBody=true}if(D.toLowerCase()==="file"){this.model.isFile=true}E=this.template();$(this.el).html(E(this.model));B={sampleJSON:this.model.sampleJSON,isParam:true,signature:this.model.signature};if(this.model.sampleJSON){H=new i({model:B,tagName:"div"});$(".model-signature",$(this.el)).append(H.render().el)}else{$(".model-signature",$(this.el)).html(this.model.signature)}A=false;if(this.model.isBody){A=true}G={isParam:A};G.consumes=this.model.consumes;if(A){C=new l({model:G});$(".parameter-content-type",$(this.el)).append(C.render().el)}else{F
=new m({model:G});$(".response-content-type",$(this.el)).append(F.render().el)}return this};y.prototype.template=function(){if(this.model.isList){return Handlebars.templates.param_list}else{if(this.options.readOnly){if(this.model.required){return Handlebars.templates.param_readonly_required}else{return Handlebars.templates.param_readonly}}else{if(this.model.required){return Handlebars.templates.param_required}else{return Handlebars.templates.param}}}};return y})(Backbone.View);i=(function(z){v(y,z);function y(){a=y.__super__.constructor.apply(this,arguments);return a}y.prototype.events={"click a.description-link":"switchToDescription","click a.snippet-link":"switchToSnippet","mousedown .snippet":"snippetToTextArea"};y.prototype.initialize=function(){};y.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));this.switchToDescription();this.isParam=this.model.isParam;if(this.isParam){$(".notice",$(this.el)).text("Click to set as parameter value")}return thi
s};y.prototype.template=function(){return Handlebars.templates.signature};y.prototype.switchToDescription=function(A){if(A!=null){A.preventDefault()}$(".snippet",$(this.el)).hide();$(".description",$(this.el)).show();$(".description-link",$(this.el)).addClass("selected");return $(".snippet-link",$(this.el)).removeClass("selected")};y.prototype.switchToSnippet=function(A){if(A!=null){A.preventDefault()}$(".description",$(this.el)).hide();$(".snippet",$(this.el)).show();$(".snippet-link",$(this.el)).addClass("selected");return $(".description-link",$(this.el)).removeClass("selected")};y.prototype.snippetToTextArea=function(A){var B;if(this.isParam){if(A!=null){A.preventDefault()}B=$("textarea",$(this.el.parentNode.parentNode.parentNode));if($.trim(B.val())===""){return B.val(this.model.sampleJSON)}}};return y})(Backbone.View);j=(function(y){v(z,y);function z(){x=z.__super__.constructor.apply(this,arguments);return x}z.prototype.initialize=function(){};z.prototype.render=function(){var
A;A=this.template();$(this.el).html(A(this.model));$("label[for=contentType]",$(this.el)).text("Response Content Type");return this};z.prototype.template=function(){return Handlebars.templates.content_type};return z})(Backbone.View);m=(function(y){v(z,y);function z(){w=z.__super__.constructor.apply(this,arguments);return w}z.prototype.initialize=function(){};z.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));$("label[for=responseContentType]",$(this.el)).text("Response Content Type");return this};z.prototype.template=function(){return Handlebars.templates.response_content_type};return z})(Backbone.View);l=(function(z){v(y,z);function y(){c=y.__super__.constructor.apply(this,arguments);return c}y.prototype.initialize=function(){};y.prototype.render=function(){var A;A=this.template();$(this.el).html(A(this.model));$("label[for=parameterContentType]",$(this.el)).text("Parameter content type:");return this};y.prototype.template=function(){return Handle
bars.templates.parameter_content_type};return y})(Backbone.View)}).call(this);
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/geode-web/src/main/webapp/WEB-INF/web.xml b/geode-web/src/main/webapp/WEB-INF/web.xml
index d6c591f..873d675 100644
--- a/geode-web/src/main/webapp/WEB-INF/web.xml
+++ b/geode-web/src/main/webapp/WEB-INF/web.xml
@@ -23,7 +23,7 @@ limitations under the License.
<display-name>GemFire Management and Monitoring REST API</display-name>
<description>
- Web deployment descriptor declaring the Management REST API for GemFire.
+ Web deployment descriptor declaring the Management REST API for Geode.
</description>
<filter>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/gradle/dependency-versions.properties
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index 50af2aa..828b088 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -100,8 +100,7 @@ spring-tx.version = 4.3.2.RELEASE
springframework.version = 4.3.2.RELEASE
stephenc-findbugs.version = 1.3.9-1
spymemcached.version = 2.9.0
-swagger.version = 1.3.2
-swagger-springmvc.version = 0.8.2
+springfox.version=2.6.0
system-rules.version = 1.16.0
tempus-fugit.version = 1.1
tomcat6.version = 6.0.37
[56/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/shred/content.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/shred/content.js b/geode-web-api/src/main/webapp/docs/lib/shred/content.js
deleted file mode 100644
index 1c21acd..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/shred/content.js
+++ /dev/null
@@ -1,193 +0,0 @@
-
-// The purpose of the `Content` object is to abstract away the data conversions
-// to and from raw content entities as strings. For example, you want to be able
-// to pass in a Javascript object and have it be automatically converted into a
-// JSON string if the `content-type` is set to a JSON-based media type.
-// Conversely, you want to be able to transparently get back a Javascript object
-// in the response if the `content-type` is a JSON-based media-type.
-
-// One limitation of the current implementation is that it [assumes the `charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
-
-// The `Content` constructor takes an options object, which *must* have either a
-// `body` or `data` property and *may* have a `type` property indicating the
-// media type. If there is no `type` attribute, a default will be inferred.
-var Content = function(options) {
- this.body = options.body;
- this.data = options.data;
- this.type = options.type;
-};
-
-Content.prototype = {
- // Treat `toString()` as asking for the `content.body`. That is, the raw content entity.
- //
- // toString: function() { return this.body; }
- //
- // Commented out, but I've forgotten why. :/
-};
-
-
-// `Content` objects have the following attributes:
-Object.defineProperties(Content.prototype,{
-
-// - **type**. Typically accessed as `content.type`, reflects the `content-type`
-// header associated with the request or response. If not passed as an options
-// to the constructor or set explicitly, it will infer the type the `data`
-// attribute, if possible, and, failing that, will default to `text/plain`.
- type: {
- get: function() {
- if (this._type) {
- return this._type;
- } else {
- if (this._data) {
- switch(typeof this._data) {
- case "string": return "text/plain";
- case "object": return "application/json";
- }
- }
- }
- return "text/plain";
- },
- set: function(value) {
- this._type = value;
- return this;
- },
- enumerable: true
- },
-
-// - **data**. Typically accessed as `content.data`, reflects the content entity
-// converted into Javascript data. This can be a string, if the `type` is, say,
-// `text/plain`, but can also be a Javascript object. The conversion applied is
-// based on the `processor` attribute. The `data` attribute can also be set
-// directly, in which case the conversion will be done the other way, to infer
-// the `body` attribute.
- data: {
- get: function() {
- if (this._body) {
- return this.processor.parser(this._body);
- } else {
- return this._data;
- }
- },
- set: function(data) {
- if (this._body&&data) Errors.setDataWithBody(this);
- this._data = data;
- return this;
- },
- enumerable: true
- },
-
-// - **body**. Typically accessed as `content.body`, reflects the content entity
-// as a UTF-8 string. It is the mirror of the `data` attribute. If you set the
-// `data` attribute, the `body` attribute will be inferred and vice-versa. If
-// you attempt to set both, an exception is raised.
- body: {
- get: function() {
- if (this._data) {
- return this.processor.stringify(this._data);
- } else {
- return this._body.toString();
- }
- },
- set: function(body) {
- if (this._data&&body) Errors.setBodyWithData(this);
- this._body = body;
- return this;
- },
- enumerable: true
- },
-
-// - **processor**. The functions that will be used to convert to/from `data` and
-// `body` attributes. You can add processors. The two that are built-in are for
-// `text/plain`, which is basically an identity transformation and
-// `application/json` and other JSON-based media types (including custom media
-// types with `+json`). You can add your own processors. See below.
- processor: {
- get: function() {
- var processor = Content.processors[this.type];
- if (processor) {
- return processor;
- } else {
- // Return the first processor that matches any part of the
- // content type. ex: application/vnd.foobar.baz+json will match json.
- var main = this.type.split(";")[0];
- var parts = main.split(/\+|\//);
- for (var i=0, l=parts.length; i < l; i++) {
- processor = Content.processors[parts[i]]
- }
- return processor || {parser:identity,stringify:toString};
- }
- },
- enumerable: true
- },
-
-// - **length**. Typically accessed as `content.length`, returns the length in
-// bytes of the raw content entity.
- length: {
- get: function() {
- if (typeof Buffer !== 'undefined') {
- return Buffer.byteLength(this.body);
- }
- return this.body.length;
- }
- }
-});
-
-Content.processors = {};
-
-// The `registerProcessor` function allows you to add your own processors to
-// convert content entities. Each processor consists of a Javascript object with
-// two properties:
-// - **parser**. The function used to parse a raw content entity and convert it
-// into a Javascript data type.
-// - **stringify**. The function used to convert a Javascript data type into a
-// raw content entity.
-Content.registerProcessor = function(types,processor) {
-
-// You can pass an array of types that will trigger this processor, or just one.
-// We determine the array via duck-typing here.
- if (types.forEach) {
- types.forEach(function(type) {
- Content.processors[type] = processor;
- });
- } else {
- // If you didn't pass an array, we just use what you pass in.
- Content.processors[types] = processor;
- }
-};
-
-// Register the identity processor, which is used for text-based media types.
-var identity = function(x) { return x; }
- , toString = function(x) { return x.toString(); }
-Content.registerProcessor(
- ["text/html","text/plain","text"],
- { parser: identity, stringify: toString });
-
-// Register the JSON processor, which is used for JSON-based media types.
-Content.registerProcessor(
- ["application/json; charset=utf-8","application/json","json"],
- {
- parser: function(string) {
- return JSON.parse(string);
- },
- stringify: function(data) {
- return JSON.stringify(data); }});
-
-var qs = require('querystring');
-// Register the post processor, which is used for JSON-based media types.
-Content.registerProcessor(
- ["application/x-www-form-urlencoded"],
- { parser : qs.parse, stringify : qs.stringify });
-
-// Error functions are defined separately here in an attempt to make the code
-// easier to read.
-var Errors = {
- setDataWithBody: function(object) {
- throw new Error("Attempt to set data attribute of a content object " +
- "when the body attributes was already set.");
- },
- setBodyWithData: function(object) {
- throw new Error("Attempt to set body attribute of a content object " +
- "when the data attributes was already set.");
- }
-}
-module.exports = Content;
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/swagger-oauth.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/swagger-oauth.js b/geode-web-api/src/main/webapp/docs/lib/swagger-oauth.js
deleted file mode 100644
index ad533fc..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/swagger-oauth.js
+++ /dev/null
@@ -1,211 +0,0 @@
-var appName;
-var popupMask;
-var popupDialog;
-var clientId;
-var realm;
-
-function handleLogin() {
- var scopes = [];
-
- if(window.swaggerUi.api.authSchemes
- && window.swaggerUi.api.authSchemes.oauth2
- && window.swaggerUi.api.authSchemes.oauth2.scopes) {
- scopes = window.swaggerUi.api.authSchemes.oauth2.scopes;
- }
-
- if(window.swaggerUi.api
- && window.swaggerUi.api.info) {
- appName = window.swaggerUi.api.info.title;
- }
-
- if(popupDialog.length > 0)
- popupDialog = popupDialog.last();
- else {
- popupDialog = $(
- [
- '<div class="api-popup-dialog">',
- '<div class="api-popup-title">Select OAuth2.0 Scopes</div>',
- '<div class="api-popup-content">',
- '<p>Scopes are used to grant an application different levels of access to data on behalf of the end user. Each API may declare one or more scopes.',
- '<a href="#">Learn how to use</a>',
- '</p>',
- '<p><strong>' + appName + '</strong> API requires the following scopes. Select which ones you want to grant to Swagger UI.</p>',
- '<ul class="api-popup-scopes">',
- '</ul>',
- '<p class="error-msg"></p>',
- '<div class="api-popup-actions"><button class="api-popup-authbtn api-button green" type="button">Authorize</button><button class="api-popup-cancel api-button gray" type="button">Cancel</button></div>',
- '</div>',
- '</div>'].join(''));
- $(document.body).append(popupDialog);
-
- popup = popupDialog.find('ul.api-popup-scopes').empty();
- for (i = 0; i < scopes.length; i ++) {
- scope = scopes[i];
- str = '<li><input type="checkbox" id="scope_' + i + '" scope="' + scope.scope + '"/>' + '<label for="scope_' + i + '">' + scope.scope;
- if (scope.description) {
- str += '<br/><span class="api-scope-desc">' + scope.description + '</span>';
- }
- str += '</label></li>';
- popup.append(str);
- }
- }
-
- var $win = $(window),
- dw = $win.width(),
- dh = $win.height(),
- st = $win.scrollTop(),
- dlgWd = popupDialog.outerWidth(),
- dlgHt = popupDialog.outerHeight(),
- top = (dh -dlgHt)/2 + st,
- left = (dw - dlgWd)/2;
-
- popupDialog.css({
- top: (top < 0? 0 : top) + 'px',
- left: (left < 0? 0 : left) + 'px'
- });
-
- popupDialog.find('button.api-popup-cancel').click(function() {
- popupMask.hide();
- popupDialog.hide();
- });
- popupDialog.find('button.api-popup-authbtn').click(function() {
- popupMask.hide();
- popupDialog.hide();
-
- var authSchemes = window.swaggerUi.api.authSchemes;
- var host = window.location;
- var redirectUrl = host.protocol + '//' + host.host + "/o2c.html";
- var url = null;
-
- var p = window.swaggerUi.api.authSchemes;
- for (var key in p) {
- if (p.hasOwnProperty(key)) {
- var o = p[key].grantTypes;
- for(var t in o) {
- if(o.hasOwnProperty(t) && t === 'implicit') {
- var dets = o[t];
- url = dets.loginEndpoint.url + "?response_type=token";
- window.swaggerUi.tokenName = dets.tokenName;
- }
- }
- }
- }
- var scopes = []
- var o = $('.api-popup-scopes').find('input:checked');
-
- for(k =0; k < o.length; k++) {
- scopes.push($(o[k]).attr("scope"));
- }
-
- window.enabledScopes=scopes;
-
- url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
- url += '&realm=' + encodeURIComponent(realm);
- url += '&client_id=' + encodeURIComponent(clientId);
- url += '&scope=' + encodeURIComponent(scopes);
-
- window.open(url);
- });
-
- popupMask.show();
- popupDialog.show();
- return;
-}
-
-
-function handleLogout() {
- for(key in window.authorizations.authz){
- window.authorizations.remove(key)
- }
- window.enabledScopes = null;
- $('.api-ic.ic-on').addClass('ic-off');
- $('.api-ic.ic-on').removeClass('ic-on');
-
- // set the info box
- $('.api-ic.ic-warning').addClass('ic-error');
- $('.api-ic.ic-warning').removeClass('ic-warning');
-}
-
-function initOAuth(opts) {
- var o = (opts||{});
- var errors = [];
-
- appName = (o.appName||errors.push("missing appName"));
- popupMask = (o.popupMask||$('#api-common-mask'));
- popupDialog = (o.popupDialog||$('.api-popup-dialog'));
- clientId = (o.clientId||errors.push("missing client id"));
- realm = (o.realm||errors.push("missing realm"));
-
- if(errors.length > 0){
- log("auth unable initialize oauth: " + errors);
- return;
- }
-
- $('pre code').each(function(i, e) {hljs.highlightBlock(e)});
- $('.api-ic').click(function(s) {
- if($(s.target).hasClass('ic-off'))
- handleLogin();
- else {
- handleLogout();
- }
- false;
- });
-}
-
-function onOAuthComplete(token) {
- if(token) {
- if(token.error) {
- var checkbox = $('input[type=checkbox],.secured')
- checkbox.each(function(pos){
- checkbox[pos].checked = false;
- });
- alert(token.error);
- }
- else {
- var b = token[window.swaggerUi.tokenName];
- if(b){
- // if all roles are satisfied
- var o = null;
- $.each($('.auth #api_information_panel'), function(k, v) {
- var children = v;
- if(children && children.childNodes) {
- var requiredScopes = [];
- $.each((children.childNodes), function (k1, v1){
- var inner = v1.innerHTML;
- if(inner)
- requiredScopes.push(inner);
- });
- var diff = [];
- for(var i=0; i < requiredScopes.length; i++) {
- var s = requiredScopes[i];
- if(window.enabledScopes && window.enabledScopes.indexOf(s) == -1) {
- diff.push(s);
- }
- }
- if(diff.length > 0){
- o = v.parentNode;
- $(o.parentNode).find('.api-ic.ic-on').addClass('ic-off');
- $(o.parentNode).find('.api-ic.ic-on').removeClass('ic-on');
-
- // sorry, not all scopes are satisfied
- $(o).find('.api-ic').addClass('ic-warning');
- $(o).find('.api-ic').removeClass('ic-error');
- }
- else {
- o = v.parentNode;
- $(o.parentNode).find('.api-ic.ic-off').addClass('ic-on');
- $(o.parentNode).find('.api-ic.ic-off').removeClass('ic-off');
-
- // all scopes are satisfied
- $(o).find('.api-ic').addClass('ic-info');
- $(o).find('.api-ic').removeClass('ic-warning');
- $(o).find('.api-ic').removeClass('ic-error');
- }
- }
- });
-
- window.authorizations.add("key", new ApiKeyAuthorization("Authorization", "Bearer " + b, "header"));
- }
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/swagger.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/swagger.js b/geode-web-api/src/main/webapp/docs/lib/swagger.js
deleted file mode 100644
index dcd6d65..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/swagger.js
+++ /dev/null
@@ -1,1527 +0,0 @@
-// swagger.js
-// version 2.0.30
-
-var __bind = function(fn, me){
- return function(){
- return fn.apply(me, arguments);
- };
-};
-
-log = function(){
- log.history = log.history || [];
- log.history.push(arguments);
- if(this.console){
- console.log( Array.prototype.slice.call(arguments) );
- }
-};
-
-if (!Array.prototype.indexOf) {
- Array.prototype.indexOf = function(obj, start) {
- for (var i = (start || 0), j = this.length; i < j; i++) {
- if (this[i] === obj) { return i; }
- }
- return -1;
- }
-}
-
-if (!('filter' in Array.prototype)) {
- Array.prototype.filter= function(filter, that /*opt*/) {
- var other= [], v;
- for (var i=0, n= this.length; i<n; i++)
- if (i in this && filter.call(that, v= this[i], i, this))
- other.push(v);
- return other;
- };
-}
-
-if (!('map' in Array.prototype)) {
- Array.prototype.map= function(mapper, that /*opt*/) {
- var other= new Array(this.length);
- for (var i= 0, n= this.length; i<n; i++)
- if (i in this)
- other[i]= mapper.call(that, this[i], i, this);
- return other;
- };
-}
-
-Object.keys = Object.keys || (function () {
- var hasOwnProperty = Object.prototype.hasOwnProperty,
- hasDontEnumBug = !{toString:null}.propertyIsEnumerable("toString"),
- DontEnums = [
- 'toString',
- 'toLocaleString',
- 'valueOf',
- 'hasOwnProperty',
- 'isPrototypeOf',
- 'propertyIsEnumerable',
- 'constructor'
- ],
- DontEnumsLength = DontEnums.length;
-
- return function (o) {
- if (typeof o != "object" && typeof o != "function" || o === null)
- throw new TypeError("Object.keys called on a non-object");
-
- var result = [];
- for (var name in o) {
- if (hasOwnProperty.call(o, name))
- result.push(name);
- }
-
- if (hasDontEnumBug) {
- for (var i = 0; i < DontEnumsLength; i++) {
- if (hasOwnProperty.call(o, DontEnums[i]))
- result.push(DontEnums[i]);
- }
- }
-
- return result;
- };
-})();
-
-
-var SwaggerApi = function(url, options) {
- this.url = null;
- this.debug = false;
- this.basePath = null;
- this.authorizations = null;
- this.authorizationScheme = null;
- this.info = null;
-
- options = (options||{});
- if (url)
- if (url.url)
- options = url;
- else
- this.url = url;
- else
- options = url;
-
- if (options.url != null)
- this.url = options.url;
-
- if (options.success != null)
- this.success = options.success;
-
- this.failure = options.failure != null ? options.failure : function() {};
- this.progress = options.progress != null ? options.progress : function() {};
- if (options.success != null)
- this.build();
-}
-
-SwaggerApi.prototype.build = function() {
- var _this = this;
- this.progress('fetching resource list: ' + this.url);
- var obj = {
- useJQuery: this.useJQuery,
- url: this.url,
- method: "get",
- headers: {
- accept: "application/json"
- },
- on: {
- error: function(response) {
- if (_this.url.substring(0, 4) !== 'http') {
- return _this.fail('Please specify the protocol for ' + _this.url);
- } else if (response.status === 0) {
- return _this.fail('Can\'t read from server. It may not have the appropriate access-control-origin settings.');
- } else if (response.status === 404) {
- return _this.fail('Can\'t read swagger JSON from ' + _this.url);
- } else {
- return _this.fail(response.status + ' : ' + response.statusText + ' ' + _this.url);
- }
- },
- response: function(resp) {
- var responseObj = resp.obj || JSON.parse(resp.data);
- _this.swaggerVersion = responseObj.swaggerVersion;
- if (_this.swaggerVersion === "1.2") {
- return _this.buildFromSpec(responseObj);
- } else {
- return _this.buildFrom1_1Spec(responseObj);
- }
- }
- }
- };
- var e = (typeof window !== 'undefined' ? window : exports);
- e.authorizations.apply(obj);
- new SwaggerHttp().execute(obj);
- return this;
-};
-
-SwaggerApi.prototype.buildFromSpec = function(response) {
- if (response.apiVersion != null) {
- this.apiVersion = response.apiVersion;
- }
- this.apis = {};
- this.apisArray = [];
- this.produces = response.produces;
- this.authSchemes = response.authorizations;
- if (response.info != null) {
- this.info = response.info;
- }
- var isApi = false;
- var i;
- for (i = 0; i < response.apis.length; i++) {
- var api = response.apis[i];
- if (api.operations) {
- var j;
- for (j = 0; j < api.operations.length; j++) {
- operation = api.operations[j];
- isApi = true;
- }
- }
- }
- if (response.basePath) {
- this.basePath = response.basePath;
- } else if (this.url.indexOf('?') > 0) {
- this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
- } else {
- this.basePath = this.url;
- }
- if (isApi) {
- var newName = response.resourcePath.replace(/\//g, '');
- this.resourcePath = response.resourcePath;
- res = new SwaggerResource(response, this);
- this.apis[newName] = res;
- this.apisArray.push(res);
- } else {
- var k;
- for (k = 0; k < response.apis.length; k++) {
- var resource = response.apis[k];
- res = new SwaggerResource(resource, this);
- this.apis[res.name] = res;
- this.apisArray.push(res);
- }
- }
- if (this.success) {
- this.success();
- }
- return this;
-};
-
-SwaggerApi.prototype.buildFrom1_1Spec = function(response) {
- log("This API is using a deprecated version of Swagger! Please see http://github.com/wordnik/swagger-core/wiki for more info");
- if (response.apiVersion != null)
- this.apiVersion = response.apiVersion;
- this.apis = {};
- this.apisArray = [];
- this.produces = response.produces;
- if (response.info != null) {
- this.info = response.info;
- }
- var isApi = false;
- for (var i = 0; i < response.apis.length; i++) {
- var api = response.apis[i];
- if (api.operations) {
- for (var j = 0; j < api.operations.length; j++) {
- operation = api.operations[j];
- isApi = true;
- }
- }
- }
- if (response.basePath) {
- this.basePath = response.basePath;
- } else if (this.url.indexOf('?') > 0) {
- this.basePath = this.url.substring(0, this.url.lastIndexOf('?'));
- } else {
- this.basePath = this.url;
- }
- if (isApi) {
- var newName = response.resourcePath.replace(/\//g, '');
- this.resourcePath = response.resourcePath;
- var res = new SwaggerResource(response, this);
- this.apis[newName] = res;
- this.apisArray.push(res);
- } else {
- for (k = 0; k < response.apis.length; k++) {
- resource = response.apis[k];
- res = new SwaggerResource(resource, this);
- this.apis[res.name] = res;
- this.apisArray.push(res);
- }
- }
- if (this.success) {
- this.success();
- }
- return this;
-};
-
-SwaggerApi.prototype.selfReflect = function() {
- var resource, resource_name, _ref;
- if (this.apis == null) {
- return false;
- }
- _ref = this.apis;
- for (resource_name in _ref) {
- resource = _ref[resource_name];
- if (resource.ready == null) {
- return false;
- }
- }
- this.setConsolidatedModels();
- this.ready = true;
- if (this.success != null) {
- return this.success();
- }
-};
-
-SwaggerApi.prototype.fail = function(message) {
- this.failure(message);
- throw message;
-};
-
-SwaggerApi.prototype.setConsolidatedModels = function() {
- var model, modelName, resource, resource_name, _i, _len, _ref, _ref1, _results;
- this.modelsArray = [];
- this.models = {};
- _ref = this.apis;
- for (resource_name in _ref) {
- resource = _ref[resource_name];
- for (modelName in resource.models) {
- if (this.models[modelName] == null) {
- this.models[modelName] = resource.models[modelName];
- this.modelsArray.push(resource.models[modelName]);
- }
- }
- }
- _ref1 = this.modelsArray;
- _results = [];
- for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
- model = _ref1[_i];
- _results.push(model.setReferencedModels(this.models));
- }
- return _results;
-};
-
-SwaggerApi.prototype.help = function() {
- var operation, operation_name, parameter, resource, resource_name, _i, _len, _ref, _ref1, _ref2;
- _ref = this.apis;
- for (resource_name in _ref) {
- resource = _ref[resource_name];
- log(resource_name);
- _ref1 = resource.operations;
- for (operation_name in _ref1) {
- operation = _ref1[operation_name];
- log(" " + operation.nickname);
- _ref2 = operation.parameters;
- for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
- parameter = _ref2[_i];
- log(" " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
- }
- }
- }
- return this;
-};
-
-var SwaggerResource = function(resourceObj, api) {
- var _this = this;
- this.api = api;
- this.api = this.api;
- produces = [];
- consumes = [];
- this.path = this.api.resourcePath != null ? this.api.resourcePath : resourceObj.path;
- this.description = resourceObj.description;
-
- var parts = this.path.split("/");
- this.name = parts[parts.length - 1].replace('.{format}', '');
- this.basePath = this.api.basePath;
- this.operations = {};
- this.operationsArray = [];
- this.modelsArray = [];
- this.models = {};
- this.rawModels = {};
- this.useJQuery = (typeof api.useJQuery !== 'undefined' ? api.useJQuery : null);
-
- if ((resourceObj.apis != null) && (this.api.resourcePath != null)) {
- this.addApiDeclaration(resourceObj);
- } else {
- if (this.path == null) {
- this.api.fail("SwaggerResources must have a path.");
- }
- if (this.path.substring(0, 4) === 'http') {
- this.url = this.path.replace('{format}', 'json');
- } else {
- this.url = this.api.basePath + this.path.replace('{format}', 'json');
- }
- this.api.progress('fetching resource ' + this.name + ': ' + this.url);
- obj = {
- url: this.url,
- method: "get",
- useJQuery: this.useJQuery,
- headers: {
- accept: "application/json"
- },
- on: {
- response: function(resp) {
- var responseObj = resp.obj || JSON.parse(resp.data);
- return _this.addApiDeclaration(responseObj);
- },
- error: function(response) {
- return _this.api.fail("Unable to read api '" +
- _this.name + "' from path " + _this.url + " (server returned " + response.statusText + ")");
- }
- }
- };
- var e = typeof window !== 'undefined' ? window : exports;
- e.authorizations.apply(obj);
- new SwaggerHttp().execute(obj);
- }
-}
-
-SwaggerResource.prototype.getAbsoluteBasePath = function(relativeBasePath) {
- var parts, pos, url;
- url = this.api.basePath;
- pos = url.lastIndexOf(relativeBasePath);
- if (pos === -1) {
- parts = url.split("/");
- url = parts[0] + "//" + parts[2];
- if (relativeBasePath.indexOf("/") === 0) {
- return url + relativeBasePath;
- } else {
- return url + "/" + relativeBasePath;
- }
- } else if (relativeBasePath === "/") {
- return url.substring(0, pos);
- } else {
- return url.substring(0, pos) + relativeBasePath;
- }
-};
-
-SwaggerResource.prototype.addApiDeclaration = function(response) {
- if (response.produces != null)
- this.produces = response.produces;
- if (response.consumes != null)
- this.consumes = response.consumes;
- if ((response.basePath != null) && response.basePath.replace(/\s/g, '').length > 0)
- this.basePath = response.basePath.indexOf("http") === -1 ? this.getAbsoluteBasePath(response.basePath) : response.basePath;
-
- this.addModels(response.models);
- if (response.apis) {
- for (var i = 0 ; i < response.apis.length; i++) {
- var endpoint = response.apis[i];
- this.addOperations(endpoint.path, endpoint.operations, response.consumes, response.produces);
- }
- }
- this.api[this.name] = this;
- this.ready = true;
- return this.api.selfReflect();
-};
-
-SwaggerResource.prototype.addModels = function(models) {
- if (models != null) {
- var modelName;
- for (modelName in models) {
- if (this.models[modelName] == null) {
- var swaggerModel = new SwaggerModel(modelName, models[modelName]);
- this.modelsArray.push(swaggerModel);
- this.models[modelName] = swaggerModel;
- this.rawModels[modelName] = models[modelName];
- }
- }
- var output = [];
- for (var i = 0; i < this.modelsArray.length; i++) {
- model = this.modelsArray[i];
- output.push(model.setReferencedModels(this.models));
- }
- return output;
- }
-};
-
-SwaggerResource.prototype.addOperations = function(resource_path, ops, consumes, produces) {
- if (ops) {
- output = [];
- for (var i = 0; i < ops.length; i++) {
- o = ops[i];
- consumes = this.consumes;
- produces = this.produces;
- if (o.consumes != null)
- consumes = o.consumes;
- else
- consumes = this.consumes;
-
- if (o.produces != null)
- produces = o.produces;
- else
- produces = this.produces;
- type = (o.type||o.responseClass);
-
- if (type === "array") {
- ref = null;
- if (o.items)
- ref = o.items["type"] || o.items["$ref"];
- type = "array[" + ref + "]";
- }
- responseMessages = o.responseMessages;
- method = o.method;
- if (o.httpMethod) {
- method = o.httpMethod;
- }
- if (o.supportedContentTypes) {
- consumes = o.supportedContentTypes;
- }
- if (o.errorResponses) {
- responseMessages = o.errorResponses;
- for (var j = 0; j < responseMessages.length; j++) {
- r = responseMessages[j];
- r.message = r.reason;
- r.reason = null;
- }
- }
- o.nickname = this.sanitize(o.nickname);
- op = new SwaggerOperation(o.nickname, resource_path, method, o.parameters, o.summary, o.notes, type, responseMessages, this, consumes, produces, o.authorizations);
- this.operations[op.nickname] = op;
- output.push(this.operationsArray.push(op));
- }
- return output;
- }
-};
-
-SwaggerResource.prototype.sanitize = function(nickname) {
- var op;
- op = nickname.replace(/[\s!@#$%^&*()_+=\[{\]};:<>|./?,\\'""-]/g, '_');
- //'
- op = op.replace(/((_){2,})/g, '_');
- op = op.replace(/^(_)*/g, '');
- op = op.replace(/([_])*$/g, '');
- return op;
-};
-
-SwaggerResource.prototype.help = function() {
- var op = this.operations;
- var output = [];
- var operation_name;
- for (operation_name in op) {
- operation = op[operation_name];
- var msg = " " + operation.nickname;
- for (var i = 0; i < operation.parameters; i++) {
- parameter = operation.parameters[i];
- msg.concat(" " + parameter.name + (parameter.required ? ' (required)' : '') + " - " + parameter.description);
- }
- output.push(msg);
- }
- return output;
-};
-
-var SwaggerModel = function(modelName, obj) {
- this.name = obj.id != null ? obj.id : modelName;
- this.properties = [];
- var propertyName;
- for (propertyName in obj.properties) {
- if (obj.required != null) {
- var value;
- for (value in obj.required) {
- if (propertyName === obj.required[value]) {
- obj.properties[propertyName].required = true;
- }
- }
- }
- prop = new SwaggerModelProperty(propertyName, obj.properties[propertyName]);
- this.properties.push(prop);
- }
-}
-
-SwaggerModel.prototype.setReferencedModels = function(allModels) {
- var results = [];
- for (var i = 0; i < this.properties.length; i++) {
- var property = this.properties[i];
- var type = property.type || property.dataType;
- if (allModels[type] != null)
- results.push(property.refModel = allModels[type]);
- else if ((property.refDataType != null) && (allModels[property.refDataType] != null))
- results.push(property.refModel = allModels[property.refDataType]);
- else
- results.push(void 0);
- }
- return results;
-};
-
-SwaggerModel.prototype.getMockSignature = function(modelsToIgnore) {
- var propertiesStr = [];
- for (var i = 0; i < this.properties.length; i++) {
- prop = this.properties[i];
- propertiesStr.push(prop.toString());
- }
-
- var strong = '<span class="strong">';
- var stronger = '<span class="stronger">';
- var strongClose = '</span>';
- var classOpen = strong + this.name + ' {' + strongClose;
- var classClose = strong + '}' + strongClose;
- var returnVal = classOpen + '<div>' + propertiesStr.join(',</div><div>') + '</div>' + classClose;
- if (!modelsToIgnore)
- modelsToIgnore = [];
- modelsToIgnore.push(this.name);
-
- for (var i = 0; i < this.properties.length; i++) {
- prop = this.properties[i];
- if ((prop.refModel != null) && modelsToIgnore.indexOf(prop.refModel.name) === -1) {
- returnVal = returnVal + ('<br>' + prop.refModel.getMockSignature(modelsToIgnore));
- }
- }
- return returnVal;
-};
-
-SwaggerModel.prototype.createJSONSample = function(modelsToIgnore) {
- if(sampleModels[this.name]) {
- return sampleModels[this.name];
- }
- else {
- var result = {};
- var modelsToIgnore = (modelsToIgnore||[])
- modelsToIgnore.push(this.name);
- for (var i = 0; i < this.properties.length; i++) {
- prop = this.properties[i];
- result[prop.name] = prop.getSampleValue(modelsToIgnore);
- }
- modelsToIgnore.pop(this.name);
- return result;
- }
-};
-
-var SwaggerModelProperty = function(name, obj) {
- this.name = name;
- this.dataType = obj.type || obj.dataType || obj["$ref"];
- this.isCollection = this.dataType && (this.dataType.toLowerCase() === 'array' || this.dataType.toLowerCase() === 'list' || this.dataType.toLowerCase() === 'set');
- this.descr = obj.description;
- this.required = obj.required;
- if (obj.items != null) {
- if (obj.items.type != null) {
- this.refDataType = obj.items.type;
- }
- if (obj.items.$ref != null) {
- this.refDataType = obj.items.$ref;
- }
- }
- this.dataTypeWithRef = this.refDataType != null ? (this.dataType + '[' + this.refDataType + ']') : this.dataType;
- if (obj.allowableValues != null) {
- this.valueType = obj.allowableValues.valueType;
- this.values = obj.allowableValues.values;
- if (this.values != null) {
- this.valuesString = "'" + this.values.join("' or '") + "'";
- }
- }
- if (obj["enum"] != null) {
- this.valueType = "string";
- this.values = obj["enum"];
- if (this.values != null) {
- this.valueString = "'" + this.values.join("' or '") + "'";
- }
- }
-}
-
-SwaggerModelProperty.prototype.getSampleValue = function(modelsToIgnore) {
- var result;
- if ((this.refModel != null) && (modelsToIgnore.indexOf(prop.refModel.name) === -1)) {
- result = this.refModel.createJSONSample(modelsToIgnore);
- } else {
- if (this.isCollection) {
- result = this.toSampleValue(this.refDataType);
- } else {
- result = this.toSampleValue(this.dataType);
- }
- }
- if (this.isCollection) {
- return [result];
- } else {
- return result;
- }
-};
-
-SwaggerModelProperty.prototype.toSampleValue = function(value) {
- var result;
- if (value === "integer") {
- result = 0;
- } else if (value === "boolean") {
- result = false;
- } else if (value === "double" || value === "number") {
- result = 0.0;
- } else if (value === "string") {
- result = "";
- } else {
- result = value;
- }
- return result;
-};
-
-SwaggerModelProperty.prototype.toString = function() {
- var req = this.required ? 'propReq' : 'propOpt';
- var str = '<span class="propName ' + req + '">' + this.name + '</span> (<span class="propType">' + this.dataTypeWithRef + '</span>';
- if (!this.required) {
- str += ', <span class="propOptKey">optional</span>';
- }
- str += ')';
- if (this.values != null) {
- str += " = <span class='propVals'>['" + this.values.join("' or '") + "']</span>";
- }
- if (this.descr != null) {
- str += ': <span class="propDesc">' + this.descr + '</span>';
- }
- return str;
-};
-
-var SwaggerOperation = function(nickname, path, method, parameters, summary, notes, type, responseMessages, resource, consumes, produces, authorizations) {
- var _this = this;
-
- var errors = [];
- this.nickname = (nickname||errors.push("SwaggerOperations must have a nickname."));
- this.path = (path||errors.push("SwaggerOperation " + nickname + " is missing path."));
- this.method = (method||errors.push("SwaggerOperation " + nickname + " is missing method."));
- this.parameters = parameters != null ? parameters : [];
- this.summary = summary;
- this.notes = notes;
- this.type = type;
- this.responseMessages = (responseMessages||[]);
- this.resource = (resource||errors.push("Resource is required"));
- this.consumes = consumes;
- this.produces = produces;
- this.authorizations = authorizations;
- this["do"] = __bind(this["do"], this);
-
- if (errors.length > 0)
- this.resource.api.fail(errors);
-
- this.path = this.path.replace('{format}', 'json');
- this.method = this.method.toLowerCase();
- this.isGetMethod = this.method === "get";
-
- this.resourceName = this.resource.name;
- if(typeof this.type !== 'undefined' && this.type === 'void')
- this.type = null;
- else {
- this.responseClassSignature = this.getSignature(this.type, this.resource.models);
- this.responseSampleJSON = this.getSampleJSON(this.type, this.resource.models);
- }
-
- for(var i = 0; i < this.parameters.length; i ++) {
- var param = this.parameters[i];
- // might take this away
- param.name = param.name || param.type || param.dataType;
-
- // for 1.1 compatibility
- var type = param.type || param.dataType;
- if(type === 'array') {
- type = 'array[' + (param.items.$ref ? param.items.$ref : param.items.type) + ']';
- }
- param.type = type;
-
- if(type.toLowerCase() === 'boolean') {
- param.allowableValues = {};
- param.allowableValues.values = ["true", "false"];
- }
- param.signature = this.getSignature(type, this.resource.models);
- param.sampleJSON = this.getSampleJSON(type, this.resource.models);
-
- var enumValue = param["enum"];
- if(enumValue != null) {
- param.isList = true;
- param.allowableValues = {};
- param.allowableValues.descriptiveValues = [];
-
- for(var j = 0; j < enumValue.length; j++) {
- var v = enumValue[j];
- if(param.defaultValue != null) {
- param.allowableValues.descriptiveValues.push ({
- value: String(v),
- isDefault: (v === param.defaultValue)
- });
- }
- else {
- param.allowableValues.descriptiveValues.push ({
- value: String(v),
- isDefault: false
- });
- }
- }
- }
- else if(param.allowableValues != null) {
- if(param.allowableValues.valueType === "RANGE")
- param.isRange = true;
- else
- param.isList = true;
- if(param.allowableValues != null) {
- param.allowableValues.descriptiveValues = [];
- if(param.allowableValues.values) {
- for(var j = 0; j < param.allowableValues.values.length; j++){
- var v = param.allowableValues.values[j];
- if(param.defaultValue != null) {
- param.allowableValues.descriptiveValues.push ({
- value: String(v),
- isDefault: (v === param.defaultValue)
- });
- }
- else {
- param.allowableValues.descriptiveValues.push ({
- value: String(v),
- isDefault: false
- });
- }
- }
- }
- }
- }
- }
- this.resource[this.nickname] = function(args, callback, error) {
- return _this["do"](args, callback, error);
- };
- this.resource[this.nickname].help = function() {
- return _this.help();
- };
-}
-
-SwaggerOperation.prototype.isListType = function(type) {
- if (type && type.indexOf('[') >= 0) {
- return type.substring(type.indexOf('[') + 1, type.indexOf(']'));
- } else {
- return void 0;
- }
-};
-
-SwaggerOperation.prototype.getSignature = function(type, models) {
- var isPrimitive, listType;
- listType = this.isListType(type);
- isPrimitive = ((listType != null) && models[listType]) || (models[type] != null) ? false : true;
- if (isPrimitive) {
- return type;
- } else {
- if (listType != null) {
- return models[listType].getMockSignature();
- } else {
- return models[type].getMockSignature();
- }
- }
-};
-
-SwaggerOperation.prototype.getSampleJSON = function(type, models) {
- var isPrimitive, listType, val;
- listType = this.isListType(type);
- isPrimitive = ((listType != null) && models[listType]) || (models[type] != null) ? false : true;
- val = isPrimitive ? void 0 : (listType != null ? models[listType].createJSONSample() : models[type].createJSONSample());
- if (val) {
- val = listType ? [val] : val;
- if(typeof val == "string")
- return val;
- else if(typeof val === "object") {
- var t = val;
- if(val instanceof Array && val.length > 0) {
- t = val[0];
- }
- if(t.nodeName) {
- var xmlString = new XMLSerializer().serializeToString(t);
- return this.formatXml(xmlString);
- }
- else
- return JSON.stringify(val, null, 2);
- }
- else
- return val;
- }
-};
-
-SwaggerOperation.prototype["do"] = function(args, opts, callback, error) {
- var key, param, params, possibleParams, req, requestContentType, responseContentType, value, _i, _len, _ref;
- if (args == null) {
- args = {};
- }
- if (opts == null) {
- opts = {};
- }
- requestContentType = null;
- responseContentType = null;
- if ((typeof args) === "function") {
- error = opts;
- callback = args;
- args = {};
- }
- if ((typeof opts) === "function") {
- error = callback;
- callback = opts;
- }
- if (error == null) {
- error = function(xhr, textStatus, error) {
- return log(xhr, textStatus, error);
- };
- }
- if (callback == null) {
- callback = function(response) {
- var content;
- content = null;
- if (response != null) {
- content = response.data;
- } else {
- content = "no data";
- }
- return log("default callback: " + content);
- };
- }
- params = {};
- params.headers = [];
- if (args.headers != null) {
- params.headers = args.headers;
- delete args.headers;
- }
-
- var possibleParams = [];
- for(var i = 0; i < this.parameters.length; i++) {
- var param = this.parameters[i];
- if(param.paramType === 'header') {
- if(args[param.name])
- params.headers[param.name] = args[param.name];
- }
- else if(param.paramType === 'form' || param.paramType.toLowerCase() === 'file')
- possibleParams.push(param);
- }
-
- if (args.body != null) {
- params.body = args.body;
- delete args.body;
- }
-
- if (possibleParams) {
- var key;
- for (key in possibleParams) {
- value = possibleParams[key];
- if (args[value.name]) {
- params[value.name] = args[value.name];
- }
- }
- }
-
- req = new SwaggerRequest(this.method, this.urlify(args), params, opts, callback, error, this);
- if (opts.mock != null) {
- return req;
- } else {
- return true;
- }
-};
-
-SwaggerOperation.prototype.pathJson = function() {
- return this.path.replace("{format}", "json");
-};
-
-SwaggerOperation.prototype.pathXml = function() {
- return this.path.replace("{format}", "xml");
-};
-
-SwaggerOperation.prototype.encodePathParam = function(pathParam) {
- var encParts, part, parts, _i, _len;
- pathParam = pathParam.toString();
- if (pathParam.indexOf("/") === -1) {
- return encodeURIComponent(pathParam);
- } else {
- parts = pathParam.split("/");
- encParts = [];
- for (_i = 0, _len = parts.length; _i < _len; _i++) {
- part = parts[_i];
- encParts.push(encodeURIComponent(part));
- }
- return encParts.join("/");
- }
-};
-
-SwaggerOperation.prototype.urlify = function(args) {
- var url = this.resource.basePath + this.pathJson();
- var params = this.parameters;
- for(var i = 0; i < params.length; i ++){
- var param = params[i];
- if (param.paramType === 'path') {
- if(args[param.name]) {
- // apply path params and remove from args
- var reg = new RegExp('\{' + param.name + '[^\}]*\}', 'gi');
- url = url.replace(reg, this.encodePathParam(args[param.name]));
- delete args[param.name];
- }
- else
- throw "" + param.name + " is a required path param.";
- }
- }
-
- var queryParams = "";
- for(var i = 0; i < params.length; i ++){
- var param = params[i];
- if(param.paramType === 'query') {
- if (args[param.name] !== undefined) {
- if (queryParams !== '')
- queryParams += "&";
- queryParams += encodeURIComponent(param.name) + '=' + encodeURIComponent(args[param.name]);
- }
- }
- }
- if ((queryParams != null) && queryParams.length > 0)
- url += '?' + queryParams;
- return url;
-};
-
-SwaggerOperation.prototype.supportHeaderParams = function() {
- return this.resource.api.supportHeaderParams;
-};
-
-SwaggerOperation.prototype.supportedSubmitMethods = function() {
- return this.resource.api.supportedSubmitMethods;
-};
-
-SwaggerOperation.prototype.getQueryParams = function(args) {
- return this.getMatchingParams(['query'], args);
-};
-
-SwaggerOperation.prototype.getHeaderParams = function(args) {
- return this.getMatchingParams(['header'], args);
-};
-
-SwaggerOperation.prototype.getMatchingParams = function(paramTypes, args) {
- var matchingParams = {};
- var params = this.parameters;
- for (var i = 0; i < params.length; i++) {
- param = params[i];
- if (args && args[param.name])
- matchingParams[param.name] = args[param.name];
- }
- var headers = this.resource.api.headers;
- var name;
- for (name in headers) {
- var value = headers[name];
- matchingParams[name] = value;
- }
- return matchingParams;
-};
-
-SwaggerOperation.prototype.help = function() {
- var msg = "";
- var params = this.parameters;
- for (var i = 0; i < params.length; i++) {
- var param = params[i];
- if (msg !== "")
- msg += "\n";
- msg += "* " + param.name + (param.required ? ' (required)' : '') + " - " + param.description;
- }
- return msg;
-};
-
-
-SwaggerOperation.prototype.formatXml = function(xml) {
- var contexp, formatted, indent, lastType, lines, ln, pad, reg, transitions, wsexp, _fn, _i, _len;
- reg = /(>)(<)(\/*)/g;
- wsexp = /[ ]*(.*)[ ]+\n/g;
- contexp = /(<.+>)(.+\n)/g;
- xml = xml.replace(reg, '$1\n$2$3').replace(wsexp, '$1\n').replace(contexp, '$1\n$2');
- pad = 0;
- formatted = '';
- lines = xml.split('\n');
- indent = 0;
- lastType = 'other';
- transitions = {
- 'single->single': 0,
- 'single->closing': -1,
- 'single->opening': 0,
- 'single->other': 0,
- 'closing->single': 0,
- 'closing->closing': -1,
- 'closing->opening': 0,
- 'closing->other': 0,
- 'opening->single': 1,
- 'opening->closing': 0,
- 'opening->opening': 1,
- 'opening->other': 1,
- 'other->single': 0,
- 'other->closing': -1,
- 'other->opening': 0,
- 'other->other': 0
- };
- _fn = function(ln) {
- var fromTo, j, key, padding, type, types, value;
- types = {
- single: Boolean(ln.match(/<.+\/>/)),
- closing: Boolean(ln.match(/<\/.+>/)),
- opening: Boolean(ln.match(/<[^!?].*>/))
- };
- type = ((function() {
- var _results;
- _results = [];
- for (key in types) {
- value = types[key];
- if (value) {
- _results.push(key);
- }
- }
- return _results;
- })())[0];
- type = type === void 0 ? 'other' : type;
- fromTo = lastType + '->' + type;
- lastType = type;
- padding = '';
- indent += transitions[fromTo];
- padding = ((function() {
- var _j, _ref5, _results;
- _results = [];
- for (j = _j = 0, _ref5 = indent; 0 <= _ref5 ? _j < _ref5 : _j > _ref5; j = 0 <= _ref5 ? ++_j : --_j) {
- _results.push(' ');
- }
- return _results;
- })()).join('');
- if (fromTo === 'opening->closing') {
- return formatted = formatted.substr(0, formatted.length - 1) + ln + '\n';
- } else {
- return formatted += padding + ln + '\n';
- }
- };
- for (_i = 0, _len = lines.length; _i < _len; _i++) {
- ln = lines[_i];
- _fn(ln);
- }
- return formatted;
-};
-
-var SwaggerRequest = function(type, url, params, opts, successCallback, errorCallback, operation, execution) {
- var _this = this;
- var errors = [];
- this.useJQuery = (typeof operation.useJQuery !== 'undefined' ? operation.useJQuery : null);
- this.type = (type||errors.push("SwaggerRequest type is required (get/post/put/delete/patch/options)."));
- this.url = (url||errors.push("SwaggerRequest url is required."));
- this.params = params;
- this.opts = opts;
- this.successCallback = (successCallback||errors.push("SwaggerRequest successCallback is required."));
- this.errorCallback = (errorCallback||errors.push("SwaggerRequest error callback is required."));
- this.operation = (operation||errors.push("SwaggerRequest operation is required."));
- this.execution = execution;
- this.headers = (params.headers||{});
-
- if(errors.length > 0) {
- throw errors;
- }
-
- this.type = this.type.toUpperCase();
-
- var myHeaders = {};
- var body = params.body;
- var parent = params["parent"];
- var requestContentType = "application/json";
-
- var formParams = [];
- var fileParams = [];
- var params = this.operation.parameters;
-
-
- for(var i = 0; i < params.length; i++) {
- var param = params[i];
- if(param.paramType === "form")
- formParams.push(param);
- else if(param.paramType === "file")
- fileParams.push(param);
- }
-
-
- if (body && (this.type === "POST" || this.type === "PUT" || this.type === "PATCH")) {
- if (this.opts.requestContentType) {
- requestContentType = this.opts.requestContentType;
- }
- } else {
- // if any form params, content type must be set
- if(formParams.length > 0) {
- if(fileParams.length > 0)
- requestContentType = "multipart/form-data";
- else
- requestContentType = "application/x-www-form-urlencoded";
- }
- else if (this.type != "DELETE")
- requestContentType = null;
- }
-
- if (requestContentType && this.operation.consumes) {
- if (this.operation.consumes[requestContentType] === 'undefined') {
- log("server doesn't consume " + requestContentType + ", try " + JSON.stringify(this.operation.consumes));
- if (this.requestContentType === null) {
- requestContentType = this.operation.consumes[0];
- }
- }
- }
-
- var responseContentType = null;
- if (this.opts.responseContentType) {
- responseContentType = this.opts.responseContentType;
- } else {
- responseContentType = "application/json";
- }
- if (responseContentType && this.operation.produces) {
- if (this.operation.produces[responseContentType] === 'undefined') {
- log("server can't produce " + responseContentType);
- }
- }
- if (requestContentType && requestContentType.indexOf("application/x-www-form-urlencoded") === 0) {
- var fields = {};
- var possibleParams = {};
- var values = {};
- var key;
- for(key in formParams){
- var param = formParams[key];
- values[param.name] = param;
- }
-
- var encoded = "";
- var key;
- for(key in values) {
- value = this.params[key];
- if(typeof value !== 'undefined'){
- if(encoded !== "")
- encoded += "&";
- encoded += encodeURIComponent(key) + '=' + encodeURIComponent(value);
- }
- }
- body = encoded;
- }
- var name;
- for (name in this.headers)
- myHeaders[name] = this.headers[name];
- if ((requestContentType && body !== "") || (requestContentType === "application/x-www-form-urlencoded"))
- myHeaders["Content-Type"] = requestContentType;
- if (responseContentType)
- myHeaders["Accept"] = responseContentType;
-
- if (!((this.headers != null) && (this.headers.mock != null))) {
- obj = {
- url: this.url,
- method: this.type,
- headers: myHeaders,
- body: body,
- useJQuery: this.useJQuery,
- on: {
- error: function(response) {
- return _this.errorCallback(response, _this.opts.parent);
- },
- redirect: function(response) {
- return _this.successCallback(response, _this.opts.parent);
- },
- 307: function(response) {
- return _this.successCallback(response, _this.opts.parent);
- },
- response: function(response) {
- return _this.successCallback(response, _this.opts.parent);
- }
- }
- };
- var e;
- if (typeof window !== 'undefined') {
- e = window;
- } else {
- e = exports;
- }
- status = e.authorizations.apply(obj, this.operation.authorizations);
- if (opts.mock == null) {
- if (status !== false) {
- new SwaggerHttp().execute(obj);
- } else {
- obj.canceled = true;
- }
- } else {
- return obj;
- }
- }
-};
-
-SwaggerRequest.prototype.asCurl = function() {
- var results = [];
- if(this.headers) {
- var key;
- for(key in this.headers) {
- results.push("--header \"" + key + ": " + this.headers[v] + "\"");
- }
- }
- return "curl " + (results.join(" ")) + " " + this.url;
-};
-
-/**
- * SwaggerHttp is a wrapper for executing requests
- */
-var SwaggerHttp = function() {};
-
-SwaggerHttp.prototype.execute = function(obj) {
- if(obj && (typeof obj.useJQuery === 'boolean'))
- this.useJQuery = obj.useJQuery;
- else
- this.useJQuery = this.isIE8();
-
- if(this.useJQuery)
- return new JQueryHttpClient().execute(obj);
- else
- return new ShredHttpClient().execute(obj);
-}
-
-SwaggerHttp.prototype.isIE8 = function() {
- var detectedIE = false;
- if (typeof navigator !== 'undefined' && navigator.userAgent) {
- nav = navigator.userAgent.toLowerCase();
- if (nav.indexOf('msie') !== -1) {
- var version = parseInt(nav.split('msie')[1]);
- if (version <= 8) {
- detectedIE = true;
- }
- }
- }
- return detectedIE;
-};
-
-/*
- * JQueryHttpClient lets a browser take advantage of JQuery's cross-browser magic
- */
-var JQueryHttpClient = function(options) {}
-
-JQueryHttpClient.prototype.execute = function(obj) {
- var cb = obj.on;
- var request = obj;
-
- obj.type = obj.method;
- obj.cache = false;
-
- obj.beforeSend = function(xhr) {
- var key, results;
- if (obj.headers) {
- results = [];
- var key;
- for (key in obj.headers) {
- if (key.toLowerCase() === "content-type") {
- results.push(obj.contentType = obj.headers[key]);
- } else if (key.toLowerCase() === "accept") {
- results.push(obj.accepts = obj.headers[key]);
- } else {
- results.push(xhr.setRequestHeader(key, obj.headers[key]));
- }
- }
- return results;
- }
- };
-
- obj.data = obj.body;
- obj.complete = function(response, textStatus, opts) {
- headers = {};
- headerArray = response.getAllResponseHeaders().split(":");
-
- for(var i = 0; i < headerArray.length / 2; i++)
- headers[headerArray[i] = headerArray[i+1]];
-
- out = {
- headers: headers,
- url: request.url,
- method: request.method,
- status: response.status,
- data: response.responseText,
- headers: headers
- };
-
- var contentType = (headers["content-type"]||headers["Content-Type"]||null)
-
- if(contentType != null) {
- if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
- if(response.responseText && response.responseText !== "")
- out.obj = JSON.parse(response.responseText);
- else
- out.obj = {}
- }
- }
-
- if(response.status >= 200 && response.status < 300)
- cb.response(out);
- else if(response.status === 0 || (response.status >= 400 && response.status < 599))
- cb.error(out);
- else
- return cb.response(out);
- };
-
- $.support.cors = true;
- return $.ajax(obj);
-}
-
-/*
- * ShredHttpClient is a light-weight, node or browser HTTP client
- */
-var ShredHttpClient = function(options) {
- this.options = (options||{});
- this.isInitialized = false;
-
- var identity, toString;
-
- if (typeof window !== 'undefined') {
- this.Shred = require("./shred");
- this.content = require("./shred/content");
- }
- else
- this.Shred = require("shred");
- this.shred = new this.Shred();
-}
-
-ShredHttpClient.prototype.initShred = function () {
- this.isInitialized = true;
- this.registerProcessors(this.shred);
-}
-
-ShredHttpClient.prototype.registerProcessors = function(shred) {
- var identity = function(x) {
- return x;
- };
- var toString = function(x) {
- return x.toString();
- };
-
- if (typeof window !== 'undefined') {
- this.content.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
- parser: identity,
- stringify: toString
- });
- } else {
- this.Shred.registerProcessor(["application/json; charset=utf-8", "application/json", "json"], {
- parser: identity,
- stringify: toString
- });
- }
-}
-
-ShredHttpClient.prototype.execute = function(obj) {
- if(!this.isInitialized)
- this.initShred();
-
- var cb = obj.on, res;
-
- var transform = function(response) {
- var out = {
- headers: response._headers,
- url: response.request.url,
- method: response.request.method,
- status: response.status,
- data: response.content.data
- };
-
- var contentType = (response._headers["content-type"]||response._headers["Content-Type"]||null)
-
- if(contentType != null) {
- if(contentType.indexOf("application/json") == 0 || contentType.indexOf("+json") > 0) {
- if(response.content.data && response.content.data !== "")
- out.obj = JSON.parse(response.content.data);
- else
- out.obj = {}
- }
- }
- return out;
- };
-
- res = {
- error: function(response) {
- if (obj)
- return cb.error(transform(response));
- },
- redirect: function(response) {
- if (obj)
- return cb.redirect(transform(response));
- },
- 307: function(response) {
- if (obj)
- return cb.redirect(transform(response));
- },
- response: function(response) {
- if (obj)
- return cb.response(transform(response));
- }
- };
- if (obj) {
- obj.on = res;
- }
- return this.shred.request(obj);
-};
-
-/**
- * SwaggerAuthorizations applys the correct authorization to an operation being executed
- */
-var SwaggerAuthorizations = function() {
- this.authz = {};
-};
-
-SwaggerAuthorizations.prototype.add = function(name, auth) {
- this.authz[name] = auth;
- return auth;
-};
-
-SwaggerAuthorizations.prototype.remove = function(name) {
- return delete this.authz[name];
-};
-
-SwaggerAuthorizations.prototype.apply = function(obj, authorizations) {
- status = null;
- var key;
- for (key in this.authz) {
- value = this.authz[key];
- result = value.apply(obj, authorizations);
- if (result === false)
- status = false;
- if (result === true)
- status = true;
- }
- return status;
-};
-
-/**
- * ApiKeyAuthorization allows a query param or header to be injected
- */
-var ApiKeyAuthorization = function(name, value, type) {
- this.name = name;
- this.value = value;
- this.type = type;
-};
-
-ApiKeyAuthorization.prototype.apply = function(obj, authorizations) {
- if (this.type === "query") {
- if (obj.url.indexOf('?') > 0)
- obj.url = obj.url + "&" + this.name + "=" + this.value;
- else
- obj.url = obj.url + "?" + this.name + "=" + this.value;
- return true;
- } else if (this.type === "header") {
- obj.headers[this.name] = this.value;
- return true;
- }
-};
-
-var CookieAuthorization = function(cookie) {
- this.cookie = cookie;
-}
-
-CookieAuthorization.prototype.apply = function(obj, authorizations) {
- obj.cookieJar = obj.cookieJar || CookieJar();
- obj.cookieJar.setCookie(this.cookie);
- return true;
-}
-
-/**
- * Password Authorization is a basic auth implementation
- */
-var PasswordAuthorization = function(name, username, password) {
- this.name = name;
- this.username = username;
- this.password = password;
- this._btoa = null;
- if (typeof window !== 'undefined')
- this._btoa = btoa;
- else
- this._btoa = require("btoa");
-};
-
-PasswordAuthorization.prototype.apply = function(obj, authorizations) {
- var base64encoder = this._btoa;
- obj.headers["Authorization"] = "Basic " + base64encoder(this.username + ":" + this.password);
- return true;
-};
-
-var e = (typeof window !== 'undefined' ? window : exports);
-
-var sampleModels = {};
-var cookies = {};
-
-e.SampleModels = sampleModels;
-e.SwaggerHttp = SwaggerHttp;
-e.SwaggerRequest = SwaggerRequest;
-e.authorizations = new SwaggerAuthorizations();
-e.ApiKeyAuthorization = ApiKeyAuthorization;
-e.PasswordAuthorization = PasswordAuthorization;
-e.CookieAuthorization = CookieAuthorization;
-e.JQueryHttpClient = JQueryHttpClient;
-e.ShredHttpClient = ShredHttpClient;
-e.SwaggerOperation = SwaggerOperation;
-e.SwaggerModel = SwaggerModel;
-e.SwaggerModelProperty = SwaggerModelProperty;
-e.SwaggerResource = SwaggerResource;
-e.SwaggerApi = SwaggerApi;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/underscore-min.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/underscore-min.js b/geode-web-api/src/main/webapp/docs/lib/underscore-min.js
deleted file mode 100644
index e23444c..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/underscore-min.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Underscore.js 1.3.3
-// (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Underscore is freely distributable under the MIT license.
-// Portions of Underscore are inspired or borrowed from Prototype,
-// Oliver Steele's Functional, and John Resig's Micro-Templating.
-// For all details and documentation:
-// http://documentcloud.github.com/underscore
-(function(){function r(a,c,d){if(a===c)return 0!==a||1/a==1/c;if(null==a||null==c)return a===c;a._chain&&(a=a._wrapped);c._chain&&(c=c._wrapped);if(a.isEqual&&b.isFunction(a.isEqual))return a.isEqual(c);if(c.isEqual&&b.isFunction(c.isEqual))return c.isEqual(a);var e=l.call(a);if(e!=l.call(c))return!1;switch(e){case "[object String]":return a==""+c;case "[object Number]":return a!=+a?c!=+c:0==a?1/a==1/c:a==+c;case "[object Date]":case "[object Boolean]":return+a==+c;case "[object RegExp]":return a.source==
-c.source&&a.global==c.global&&a.multiline==c.multiline&&a.ignoreCase==c.ignoreCase}if("object"!=typeof a||"object"!=typeof c)return!1;for(var f=d.length;f--;)if(d[f]==a)return!0;d.push(a);var f=0,g=!0;if("[object Array]"==e){if(f=a.length,g=f==c.length)for(;f--&&(g=f in a==f in c&&r(a[f],c[f],d)););}else{if("constructor"in a!="constructor"in c||a.constructor!=c.constructor)return!1;for(var h in a)if(b.has(a,h)&&(f++,!(g=b.has(c,h)&&r(a[h],c[h],d))))break;if(g){for(h in c)if(b.has(c,h)&&!f--)break;
-g=!f}}d.pop();return g}var s=this,I=s._,o={},k=Array.prototype,p=Object.prototype,i=k.slice,J=k.unshift,l=p.toString,K=p.hasOwnProperty,y=k.forEach,z=k.map,A=k.reduce,B=k.reduceRight,C=k.filter,D=k.every,E=k.some,q=k.indexOf,F=k.lastIndexOf,p=Array.isArray,L=Object.keys,t=Function.prototype.bind,b=function(a){return new m(a)};"undefined"!==typeof exports?("undefined"!==typeof module&&module.exports&&(exports=module.exports=b),exports._=b):s._=b;b.VERSION="1.3.3";var j=b.each=b.forEach=function(a,
-c,d){if(a!=null)if(y&&a.forEach===y)a.forEach(c,d);else if(a.length===+a.length)for(var e=0,f=a.length;e<f;e++){if(e in a&&c.call(d,a[e],e,a)===o)break}else for(e in a)if(b.has(a,e)&&c.call(d,a[e],e,a)===o)break};b.map=b.collect=function(a,c,b){var e=[];if(a==null)return e;if(z&&a.map===z)return a.map(c,b);j(a,function(a,g,h){e[e.length]=c.call(b,a,g,h)});if(a.length===+a.length)e.length=a.length;return e};b.reduce=b.foldl=b.inject=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(A&&
-a.reduce===A){e&&(c=b.bind(c,e));return f?a.reduce(c,d):a.reduce(c)}j(a,function(a,b,i){if(f)d=c.call(e,d,a,b,i);else{d=a;f=true}});if(!f)throw new TypeError("Reduce of empty array with no initial value");return d};b.reduceRight=b.foldr=function(a,c,d,e){var f=arguments.length>2;a==null&&(a=[]);if(B&&a.reduceRight===B){e&&(c=b.bind(c,e));return f?a.reduceRight(c,d):a.reduceRight(c)}var g=b.toArray(a).reverse();e&&!f&&(c=b.bind(c,e));return f?b.reduce(g,c,d,e):b.reduce(g,c)};b.find=b.detect=function(a,
-c,b){var e;G(a,function(a,g,h){if(c.call(b,a,g,h)){e=a;return true}});return e};b.filter=b.select=function(a,c,b){var e=[];if(a==null)return e;if(C&&a.filter===C)return a.filter(c,b);j(a,function(a,g,h){c.call(b,a,g,h)&&(e[e.length]=a)});return e};b.reject=function(a,c,b){var e=[];if(a==null)return e;j(a,function(a,g,h){c.call(b,a,g,h)||(e[e.length]=a)});return e};b.every=b.all=function(a,c,b){var e=true;if(a==null)return e;if(D&&a.every===D)return a.every(c,b);j(a,function(a,g,h){if(!(e=e&&c.call(b,
-a,g,h)))return o});return!!e};var G=b.some=b.any=function(a,c,d){c||(c=b.identity);var e=false;if(a==null)return e;if(E&&a.some===E)return a.some(c,d);j(a,function(a,b,h){if(e||(e=c.call(d,a,b,h)))return o});return!!e};b.include=b.contains=function(a,c){var b=false;if(a==null)return b;if(q&&a.indexOf===q)return a.indexOf(c)!=-1;return b=G(a,function(a){return a===c})};b.invoke=function(a,c){var d=i.call(arguments,2);return b.map(a,function(a){return(b.isFunction(c)?c||a:a[c]).apply(a,d)})};b.pluck=
-function(a,c){return b.map(a,function(a){return a[c]})};b.max=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.max.apply(Math,a);if(!c&&b.isEmpty(a))return-Infinity;var e={computed:-Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b>=e.computed&&(e={value:a,computed:b})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a)&&a[0]===+a[0])return Math.min.apply(Math,a);if(!c&&b.isEmpty(a))return Infinity;var e={computed:Infinity};j(a,function(a,b,h){b=c?c.call(d,a,b,h):a;b<e.computed&&
-(e={value:a,computed:b})});return e.value};b.shuffle=function(a){var b=[],d;j(a,function(a,f){d=Math.floor(Math.random()*(f+1));b[f]=b[d];b[d]=a});return b};b.sortBy=function(a,c,d){var e=b.isFunction(c)?c:function(a){return a[c]};return b.pluck(b.map(a,function(a,b,c){return{value:a,criteria:e.call(d,a,b,c)}}).sort(function(a,b){var c=a.criteria,d=b.criteria;return c===void 0?1:d===void 0?-1:c<d?-1:c>d?1:0}),"value")};b.groupBy=function(a,c){var d={},e=b.isFunction(c)?c:function(a){return a[c]};
-j(a,function(a,b){var c=e(a,b);(d[c]||(d[c]=[])).push(a)});return d};b.sortedIndex=function(a,c,d){d||(d=b.identity);for(var e=0,f=a.length;e<f;){var g=e+f>>1;d(a[g])<d(c)?e=g+1:f=g}return e};b.toArray=function(a){return!a?[]:b.isArray(a)||b.isArguments(a)?i.call(a):a.toArray&&b.isFunction(a.toArray)?a.toArray():b.values(a)};b.size=function(a){return b.isArray(a)?a.length:b.keys(a).length};b.first=b.head=b.take=function(a,b,d){return b!=null&&!d?i.call(a,0,b):a[0]};b.initial=function(a,b,d){return i.call(a,
-0,a.length-(b==null||d?1:b))};b.last=function(a,b,d){return b!=null&&!d?i.call(a,Math.max(a.length-b,0)):a[a.length-1]};b.rest=b.tail=function(a,b,d){return i.call(a,b==null||d?1:b)};b.compact=function(a){return b.filter(a,function(a){return!!a})};b.flatten=function(a,c){return b.reduce(a,function(a,e){if(b.isArray(e))return a.concat(c?e:b.flatten(e));a[a.length]=e;return a},[])};b.without=function(a){return b.difference(a,i.call(arguments,1))};b.uniq=b.unique=function(a,c,d){var d=d?b.map(a,d):a,
-e=[];a.length<3&&(c=true);b.reduce(d,function(d,g,h){if(c?b.last(d)!==g||!d.length:!b.include(d,g)){d.push(g);e.push(a[h])}return d},[]);return e};b.union=function(){return b.uniq(b.flatten(arguments,true))};b.intersection=b.intersect=function(a){var c=i.call(arguments,1);return b.filter(b.uniq(a),function(a){return b.every(c,function(c){return b.indexOf(c,a)>=0})})};b.difference=function(a){var c=b.flatten(i.call(arguments,1),true);return b.filter(a,function(a){return!b.include(c,a)})};b.zip=function(){for(var a=
-i.call(arguments),c=b.max(b.pluck(a,"length")),d=Array(c),e=0;e<c;e++)d[e]=b.pluck(a,""+e);return d};b.indexOf=function(a,c,d){if(a==null)return-1;var e;if(d){d=b.sortedIndex(a,c);return a[d]===c?d:-1}if(q&&a.indexOf===q)return a.indexOf(c);d=0;for(e=a.length;d<e;d++)if(d in a&&a[d]===c)return d;return-1};b.lastIndexOf=function(a,b){if(a==null)return-1;if(F&&a.lastIndexOf===F)return a.lastIndexOf(b);for(var d=a.length;d--;)if(d in a&&a[d]===b)return d;return-1};b.range=function(a,b,d){if(arguments.length<=
-1){b=a||0;a=0}for(var d=arguments[2]||1,e=Math.max(Math.ceil((b-a)/d),0),f=0,g=Array(e);f<e;){g[f++]=a;a=a+d}return g};var H=function(){};b.bind=function(a,c){var d,e;if(a.bind===t&&t)return t.apply(a,i.call(arguments,1));if(!b.isFunction(a))throw new TypeError;e=i.call(arguments,2);return d=function(){if(!(this instanceof d))return a.apply(c,e.concat(i.call(arguments)));H.prototype=a.prototype;var b=new H,g=a.apply(b,e.concat(i.call(arguments)));return Object(g)===g?g:b}};b.bindAll=function(a){var c=
-i.call(arguments,1);c.length==0&&(c=b.functions(a));j(c,function(c){a[c]=b.bind(a[c],a)});return a};b.memoize=function(a,c){var d={};c||(c=b.identity);return function(){var e=c.apply(this,arguments);return b.has(d,e)?d[e]:d[e]=a.apply(this,arguments)}};b.delay=function(a,b){var d=i.call(arguments,2);return setTimeout(function(){return a.apply(null,d)},b)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(i.call(arguments,1)))};b.throttle=function(a,c){var d,e,f,g,h,i,j=b.debounce(function(){h=
-g=false},c);return function(){d=this;e=arguments;f||(f=setTimeout(function(){f=null;h&&a.apply(d,e);j()},c));g?h=true:i=a.apply(d,e);j();g=true;return i}};b.debounce=function(a,b,d){var e;return function(){var f=this,g=arguments;d&&!e&&a.apply(f,g);clearTimeout(e);e=setTimeout(function(){e=null;d||a.apply(f,g)},b)}};b.once=function(a){var b=false,d;return function(){if(b)return d;b=true;return d=a.apply(this,arguments)}};b.wrap=function(a,b){return function(){var d=[a].concat(i.call(arguments,0));
-return b.apply(this,d)}};b.compose=function(){var a=arguments;return function(){for(var b=arguments,d=a.length-1;d>=0;d--)b=[a[d].apply(this,b)];return b[0]}};b.after=function(a,b){return a<=0?b():function(){if(--a<1)return b.apply(this,arguments)}};b.keys=L||function(a){if(a!==Object(a))throw new TypeError("Invalid object");var c=[],d;for(d in a)b.has(a,d)&&(c[c.length]=d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=b.methods=function(a){var c=[],d;for(d in a)b.isFunction(a[d])&&
-c.push(d);return c.sort()};b.extend=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]=b[d]});return a};b.pick=function(a){var c={};j(b.flatten(i.call(arguments,1)),function(b){b in a&&(c[b]=a[b])});return c};b.defaults=function(a){j(i.call(arguments,1),function(b){for(var d in b)a[d]==null&&(a[d]=b[d])});return a};b.clone=function(a){return!b.isObject(a)?a:b.isArray(a)?a.slice():b.extend({},a)};b.tap=function(a,b){b(a);return a};b.isEqual=function(a,b){return r(a,b,[])};b.isEmpty=
-function(a){if(a==null)return true;if(b.isArray(a)||b.isString(a))return a.length===0;for(var c in a)if(b.has(a,c))return false;return true};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=p||function(a){return l.call(a)=="[object Array]"};b.isObject=function(a){return a===Object(a)};b.isArguments=function(a){return l.call(a)=="[object Arguments]"};b.isArguments(arguments)||(b.isArguments=function(a){return!(!a||!b.has(a,"callee"))});b.isFunction=function(a){return l.call(a)=="[object Function]"};
-b.isString=function(a){return l.call(a)=="[object String]"};b.isNumber=function(a){return l.call(a)=="[object Number]"};b.isFinite=function(a){return b.isNumber(a)&&isFinite(a)};b.isNaN=function(a){return a!==a};b.isBoolean=function(a){return a===true||a===false||l.call(a)=="[object Boolean]"};b.isDate=function(a){return l.call(a)=="[object Date]"};b.isRegExp=function(a){return l.call(a)=="[object RegExp]"};b.isNull=function(a){return a===null};b.isUndefined=function(a){return a===void 0};b.has=function(a,
-b){return K.call(a,b)};b.noConflict=function(){s._=I;return this};b.identity=function(a){return a};b.times=function(a,b,d){for(var e=0;e<a;e++)b.call(d,e)};b.escape=function(a){return(""+a).replace(/&/g,"&").replace(/</g,"<").replace(/>/g,">").replace(/"/g,""").replace(/'/g,"'").replace(/\//g,"/")};b.result=function(a,c){if(a==null)return null;var d=a[c];return b.isFunction(d)?d.call(a):d};b.mixin=function(a){j(b.functions(a),function(c){M(c,b[c]=a[c])})};var N=0;b.uniqueId=
-function(a){var b=N++;return a?a+b:b};b.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var u=/.^/,n={"\\":"\\","'":"'",r:"\r",n:"\n",t:"\t",u2028:"\u2028",u2029:"\u2029"},v;for(v in n)n[n[v]]=v;var O=/\\|'|\r|\n|\t|\u2028|\u2029/g,P=/\\(\\|'|r|n|t|u2028|u2029)/g,w=function(a){return a.replace(P,function(a,b){return n[b]})};b.template=function(a,c,d){d=b.defaults(d||{},b.templateSettings);a="__p+='"+a.replace(O,function(a){return"\\"+n[a]}).replace(d.escape||
-u,function(a,b){return"'+\n_.escape("+w(b)+")+\n'"}).replace(d.interpolate||u,function(a,b){return"'+\n("+w(b)+")+\n'"}).replace(d.evaluate||u,function(a,b){return"';\n"+w(b)+"\n;__p+='"})+"';\n";d.variable||(a="with(obj||{}){\n"+a+"}\n");var a="var __p='';var print=function(){__p+=Array.prototype.join.call(arguments, '')};\n"+a+"return __p;\n",e=new Function(d.variable||"obj","_",a);if(c)return e(c,b);c=function(a){return e.call(this,a,b)};c.source="function("+(d.variable||"obj")+"){\n"+a+"}";return c};
-b.chain=function(a){return b(a).chain()};var m=function(a){this._wrapped=a};b.prototype=m.prototype;var x=function(a,c){return c?b(a).chain():a},M=function(a,c){m.prototype[a]=function(){var a=i.call(arguments);J.call(a,this._wrapped);return x(c.apply(b,a),this._chain)}};b.mixin(b);j("pop,push,reverse,shift,sort,splice,unshift".split(","),function(a){var b=k[a];m.prototype[a]=function(){var d=this._wrapped;b.apply(d,arguments);var e=d.length;(a=="shift"||a=="splice")&&e===0&&delete d[0];return x(d,
-this._chain)}});j(["concat","join","slice"],function(a){var b=k[a];m.prototype[a]=function(){return x(b.apply(this._wrapped,arguments),this._chain)}});m.prototype.chain=function(){this._chain=true;return this};m.prototype.value=function(){return this._wrapped}}).call(this);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/o2c.html
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/o2c.html b/geode-web-api/src/main/webapp/docs/o2c.html
deleted file mode 100644
index fc11548..0000000
--- a/geode-web-api/src/main/webapp/docs/o2c.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<script>
-var qp = null;
-if(window.location.hash) {
- qp = location.hash.substring(1);
-}
-else {
- qp = location.search.substring(1);
-}
-qp = qp ? JSON.parse('{"' + qp.replace(/&/g, '","').replace(/=/g,'":"') + '"}',
- function(key, value) {
- return key===""?value:decodeURIComponent(value) }
- ):{}
-window.opener.onOAuthComplete(qp);
-window.close();
-</script>
\ No newline at end of file
[08/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
index dd52a4e..06b0be9 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -32,46 +30,42 @@ import javax.naming.OperationNotSupportedException;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Defines methods that all <code>SystemMember</code> MBeans should
- * implement.
+ * Defines methods that all <code>SystemMember</code> MBeans should implement.
*
* @since GemFire 4.0
*/
-public interface SystemMemberJmx
- extends SystemMember, NotificationListener {
- /**
- * Notification type for indicating a cache got created on a member of this
- * distributed system.
+public interface SystemMemberJmx extends SystemMember, NotificationListener {
+ /**
+ * Notification type for indicating a cache got created on a member of this distributed system.
*/
public static final String NOTIF_CACHE_CREATED =
DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.created";
- /**
- * Notification type for indicating a cache is closed on a member of this
- * distributed system.
+ /**
+ * Notification type for indicating a cache is closed on a member of this distributed system.
*/
public static final String NOTIF_CACHE_CLOSED =
DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.closed";
- /**
- * Notification type for indicating a region is created in a cache on a member
- * of this distributed system.
+ /**
+ * Notification type for indicating a region is created in a cache on a member of this distributed
+ * system.
*/
public static final String NOTIF_REGION_CREATED =
DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.region.created";
- /**
- * Notification type for indicating a region was removed from a cache on a
- * member of this distributed system.
+ /**
+ * Notification type for indicating a region was removed from a cache on a member of this
+ * distributed system.
*/
public static final String NOTIF_REGION_LOST =
DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.region.lost";
-
+
/** Notification type for indicating client joined */
public static final String NOTIF_CLIENT_JOINED =
DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.client.joined";
-
+
/** Notification type for indicating client left */
public static final String NOTIF_CLIENT_LEFT =
DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.client.left";
-
+
/** Notification type for indicating client crashed */
public static final String NOTIF_CLIENT_CRASHED =
DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.client.crashed";
@@ -84,61 +78,54 @@ public interface SystemMemberJmx
public int getRefreshInterval();
/**
- * RefreshInterval is now set only through the AdminDistributedSystem property
- * refreshInterval. Attempt to set refreshInterval on SystemMemberJmx MBean
- * would result in an OperationNotSupportedException Auto-refresh is enabled
- * on demand when a call to refreshConfig is made
+ * RefreshInterval is now set only through the AdminDistributedSystem property refreshInterval.
+ * Attempt to set refreshInterval on SystemMemberJmx MBean would result in an
+ * OperationNotSupportedException Auto-refresh is enabled on demand when a call to refreshConfig
+ * is made
*
- * @param refreshInterval
- * the new refresh interval in seconds
+ * @param refreshInterval the new refresh interval in seconds
* @deprecated since 6.0 use DistributedSystemConfig.refreshInterval instead
*/
@Deprecated
public void setRefreshInterval(int refreshInterval) throws OperationNotSupportedException;
/**
- * Sets the refresh interval field.
- * Sets interval in seconds between config refreshes; zero or less turns
- * off auto refreshing. Manual refreshing has no effect on when the next
- * scheduled refresh will occur.
+ * Sets the refresh interval field. Sets interval in seconds between config refreshes; zero or
+ * less turns off auto refreshing. Manual refreshing has no effect on when the next scheduled
+ * refresh will occur.
*/
public void _setRefreshInterval(int refreshInterval);
- /**
+ /**
* Gets this member's cache.
*
* @return <code>ObjectName</code> for this member's cache
*
- * @throws AdminException
- * If this system member does not host a cache
+ * @throws AdminException If this system member does not host a cache
*/
- public ObjectName manageCache()
- throws AdminException, MalformedObjectNameException;
+ public ObjectName manageCache() throws AdminException, MalformedObjectNameException;
- /**
+ /**
* Gets all active StatisticResources for this manager.
*
* @return array of ObjectName instances
*/
- public ObjectName[] manageStats()
- throws AdminException, MalformedObjectNameException;
+ public ObjectName[] manageStats() throws AdminException, MalformedObjectNameException;
- /**
- * Gets the active StatisticResources for this manager, based on the
- * typeName as the key
+ /**
+ * Gets the active StatisticResources for this manager, based on the typeName as the key
*
* @return ObjectName of StatisticResourceJMX instance
*/
- public ObjectName[] manageStat(String statisticsTypeName)
- throws AdminException, MalformedObjectNameException;
+ public ObjectName[] manageStat(String statisticsTypeName)
+ throws AdminException, MalformedObjectNameException;
/**
- * Handles notification to refresh. Reacts by refreshing the values of this
- * GemFireManager's ConfigurationParamaters. Any other notification is
- * ignored.
+ * Handles notification to refresh. Reacts by refreshing the values of this GemFireManager's
+ * ConfigurationParamaters. Any other notification is ignored.
*
- * @param notification the JMX notification being received
- * @param hb handback object is unused
+ * @param notification the JMX notification being received
+ * @param hb handback object is unused
*/
public void handleNotification(Notification notification, Object hb);
@@ -146,83 +133,71 @@ public interface SystemMemberJmx
* Add MBean attribute definitions for each ConfigurationParameter.
*
* @param managed the mbean definition to add attributes to
- * @return a new instance of ManagedBean copied from <code>managed</code> but
- * with the new attributes added
+ * @return a new instance of ManagedBean copied from <code>managed</code> but with the new
+ * attributes added
*/
- public ManagedBean addDynamicAttributes(ManagedBean managed)
- throws AdminException;
+ public ManagedBean addDynamicAttributes(ManagedBean managed) throws AdminException;
/**
- * Implementation should handle creation of cache by extracting the details
- * from the given event object.
+ * Implementation should handle creation of cache by extracting the details from the given event
+ * object.
*
- * @param event
- * event object corresponding to the creation of the cache
+ * @param event event object corresponding to the creation of the cache
*/
public void handleCacheCreate(SystemMemberCacheEvent event);
/**
- * Implementation should handle closure of cache by extracting the details
- * from the given event object.
+ * Implementation should handle closure of cache by extracting the details from the given event
+ * object.
*
- * @param event
- * event object corresponding to the closure of the cache
+ * @param event event object corresponding to the closure of the cache
*/
public void handleCacheClose(SystemMemberCacheEvent event);
/**
- * Implementation should handle creation of region by extracting the details
- * from the given event object.
+ * Implementation should handle creation of region by extracting the details from the given event
+ * object.
*
- * @param event
- * event object corresponding to the creation of a region
+ * @param event event object corresponding to the creation of a region
*/
public void handleRegionCreate(SystemMemberRegionEvent event);
/**
- * Implementation should handle loss of region by extracting the details
- * from the given event object.
+ * Implementation should handle loss of region by extracting the details from the given event
+ * object.
*
- * @param event
- * event object corresponding to the loss of a region
+ * @param event event object corresponding to the loss of a region
*/
public void handleRegionLoss(SystemMemberRegionEvent event);
/**
* Implementation should handle client membership changes.
*
- * @param clientId
- * id of the client for whom membership change happened
- * @param eventType
- * membership change type; one of
- * {@link ClientMembershipMessage#JOINED},
- * {@link ClientMembershipMessage#LEFT},
- * {@link ClientMembershipMessage#CRASHED}
+ * @param clientId id of the client for whom membership change happened
+ * @param eventType membership change type; one of {@link ClientMembershipMessage#JOINED},
+ * {@link ClientMembershipMessage#LEFT}, {@link ClientMembershipMessage#CRASHED}
*/
public void handleClientMembership(String clientId, int eventType);
- ////////////////////// Inner Classess //////////////////////
+ ////////////////////// Inner Classess //////////////////////
/**
- * A helper class that provides implementation of the
- * <code>SystemMemberJmx</code> interface as static methods.
+ * A helper class that provides implementation of the <code>SystemMemberJmx</code> interface as
+ * static methods.
*/
public static class Helper {
private static final Logger logger = LogService.getLogger();
-
+
private static AtomicInteger notificationSequenceNumber = new AtomicInteger();
- public static int setAndReturnRefreshInterval(SystemMemberJmx member,
- int refreshInterval) {
+ public static int setAndReturnRefreshInterval(SystemMemberJmx member, int refreshInterval) {
int ret = refreshInterval;
-
+
try {
- MBeanUtil.registerRefreshNotification(
- member, // NotificationListener
- ((ManagedResource)member).getMBeanName(), // User Data
- RefreshNotificationType.SYSTEM_MEMBER_CONFIG,
- refreshInterval); // int
+ MBeanUtil.registerRefreshNotification(member, // NotificationListener
+ ((ManagedResource) member).getMBeanName(), // User Data
+ RefreshNotificationType.SYSTEM_MEMBER_CONFIG, refreshInterval); // int
} catch (RuntimeException e) {
logger.warn(e.getMessage(), e); // dead in water, print, and then ignore
@@ -230,12 +205,12 @@ public interface SystemMemberJmx
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -243,116 +218,113 @@ public interface SystemMemberJmx
logger.error(e.getMessage(), e); // dead in water, print, and then ignore
ret = 0; // zero out to avoid more exceptions
}
-
+
return ret;
}
- public static ObjectName manageCache(SystemMemberJmx member)
- throws AdminException, MalformedObjectNameException {
+ public static ObjectName manageCache(SystemMemberJmx member)
+ throws AdminException, MalformedObjectNameException {
boolean IthrewIt = false;
try {
SystemMemberCache cache = member.getCache();
if (cache == null) {
IthrewIt = true;
- throw new AdminException(LocalizedStrings.SystemMemberJmx_THIS_SYSTEM_MEMBER_DOES_NOT_HAVE_A_CACHE.toLocalizedString());
+ throw new AdminException(
+ LocalizedStrings.SystemMemberJmx_THIS_SYSTEM_MEMBER_DOES_NOT_HAVE_A_CACHE
+ .toLocalizedString());
}
-// Assert.assertTrue(cache != null); (cannot be null)
+ // Assert.assertTrue(cache != null); (cannot be null)
SystemMemberCacheJmxImpl cacheJmx = (SystemMemberCacheJmxImpl) cache;
return ObjectName.getInstance(cacheJmx.getMBeanName());
- } catch (AdminException e) {
+ } catch (AdminException e) {
if (!IthrewIt) {
- logger.warn(e.getMessage(), e);
+ logger.warn(e.getMessage(), e);
}
- throw e;
- } catch (RuntimeException e) {
+ throw e;
+ } catch (RuntimeException e) {
logger.warn(e.getMessage(), e);
- throw e;
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- logger.error(e.getMessage(), e);
- throw e;
+ logger.error(e.getMessage(), e);
+ throw e;
}
}
- public static ObjectName[] manageStats(SystemMemberJmx member)
- throws AdminException, MalformedObjectNameException {
- try {
- StatisticResource[] stats = member.getStats();
- ObjectName[] onames = new ObjectName[stats.length];
- for (int i = 0; i < stats.length; i++) {
- StatisticResourceJmxImpl stat =
- (StatisticResourceJmxImpl) stats[i];
- onames[i] = ObjectName.getInstance(stat.getMBeanName());
- }
- return onames;
- } catch (AdminException e) {
- logger.warn(e.getMessage(), e);
- throw e;
- } catch (RuntimeException e) {
- logger.warn(e.getMessage(), e);
- throw e;
- } catch (VirtualMachineError err) {
- SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
- // now, so don't let this thread continue.
- throw err;
- } catch (Error e) {
- // Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
- // _still_ a possibility that you are dealing with a cascading
- // error condition, so you also need to check to see if the JVM
- // is still usable:
- SystemFailure.checkFailure();
- logger.error(e.getMessage(), e);
- throw e;
+ public static ObjectName[] manageStats(SystemMemberJmx member)
+ throws AdminException, MalformedObjectNameException {
+ try {
+ StatisticResource[] stats = member.getStats();
+ ObjectName[] onames = new ObjectName[stats.length];
+ for (int i = 0; i < stats.length; i++) {
+ StatisticResourceJmxImpl stat = (StatisticResourceJmxImpl) stats[i];
+ onames[i] = ObjectName.getInstance(stat.getMBeanName());
}
+ return onames;
+ } catch (AdminException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
+ } catch (RuntimeException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
+ } catch (VirtualMachineError err) {
+ SystemFailure.initiateFailure(err);
+ // If this ever returns, rethrow the error. We're poisoned
+ // now, so don't let this thread continue.
+ throw err;
+ } catch (Error e) {
+ // Whenever you catch Error or Throwable, you must also
+ // catch VirtualMachineError (see above). However, there is
+ // _still_ a possibility that you are dealing with a cascading
+ // error condition, so you also need to check to see if the JVM
+ // is still usable:
+ SystemFailure.checkFailure();
+ logger.error(e.getMessage(), e);
+ throw e;
}
+ }
- public static ObjectName[] manageStat(SystemMemberJmx member, String statisticsTypeName)
- throws AdminException, MalformedObjectNameException {
+ public static ObjectName[] manageStat(SystemMemberJmx member, String statisticsTypeName)
+ throws AdminException, MalformedObjectNameException {
try {
StatisticResource[] stats = member.getStat(statisticsTypeName);
- if (stats==null)
+ if (stats == null)
return null;
else {
- ObjectName[] statNames = new ObjectName[stats.length];
- for (int i=0; i<stats.length; i++) {
+ ObjectName[] statNames = new ObjectName[stats.length];
+ for (int i = 0; i < stats.length; i++) {
StatisticResourceJmxImpl statJMX = (StatisticResourceJmxImpl) stats[i];
- statNames[i] = ObjectName.getInstance(statJMX.getMBeanName());
+ statNames[i] = ObjectName.getInstance(statJMX.getMBeanName());
}
return statNames;
}
- } catch (AdminException e) {
- logger.warn(e.getMessage(), e);
- throw e;
- } catch (RuntimeException e) {
- logger.warn(e.getMessage(), e);
+ } catch (AdminException e) {
+ logger.warn(e.getMessage(), e);
throw e;
- } catch (Error e) {
- logger.error(e.getMessage(), e);
+ } catch (RuntimeException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
+ } catch (Error e) {
+ logger.error(e.getMessage(), e);
throw e;
}
}
- public static void handleNotification(SystemMemberJmx member,
- Notification notification,
- Object hb) {
- if (RefreshNotificationType.SYSTEM_MEMBER_CONFIG.
- getType().equals(notification.getType()) &&
- ((ManagedResource)member).getMBeanName().
- equals(notification.getUserData())
- ) {
-
+ public static void handleNotification(SystemMemberJmx member, Notification notification,
+ Object hb) {
+ if (RefreshNotificationType.SYSTEM_MEMBER_CONFIG.getType().equals(notification.getType())
+ && ((ManagedResource) member).getMBeanName().equals(notification.getUserData())) {
+
try {
member.refreshConfig();
@@ -369,12 +341,12 @@ public interface SystemMemberJmx
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -385,33 +357,32 @@ public interface SystemMemberJmx
}
}
- public static ManagedBean
- addDynamicAttributes(SystemMemberJmx member, ManagedBean managed)
- throws AdminException {
+ public static ManagedBean addDynamicAttributes(SystemMemberJmx member, ManagedBean managed)
+ throws AdminException {
if (managed == null) {
- throw new IllegalArgumentException(LocalizedStrings.SystemMemberJmx_MANAGEDBEAN_IS_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.SystemMemberJmx_MANAGEDBEAN_IS_NULL.toLocalizedString());
}
-
+
member.refreshConfig(); // to get the config parms...
-
+
// need to create a new instance of ManagedBean to clean the "slate"...
ManagedBean newManagedBean = new DynamicManagedBean(managed);
ConfigurationParameter[] params = member.getConfiguration();
for (int i = 0; i < params.length; i++) {
- ConfigurationParameterJmxImpl parm =
- (ConfigurationParameterJmxImpl) params[i];
+ ConfigurationParameterJmxImpl parm = (ConfigurationParameterJmxImpl) params[i];
ConfigAttributeInfo attrInfo = new ConfigAttributeInfo(parm);
attrInfo.setName(parm.getName());
attrInfo.setDisplayName(parm.getName());
attrInfo.setDescription(parm.getDescription());
attrInfo.setType(parm.getJmxValueType().getName());
-
+
attrInfo.setIs(false);
attrInfo.setReadable(true);
attrInfo.setWriteable(parm.isModifiable());
-
+
newManagedBean.addAttribute(attrInfo);
}
return newManagedBean;
@@ -422,53 +393,45 @@ public interface SystemMemberJmx
*
* @return the notificationSequenceNumber
*/
- /*default*/static int getNextNotificationSequenceNumber() {
+ /* default */static int getNextNotificationSequenceNumber() {
return notificationSequenceNumber.incrementAndGet();
}
-
+
/**
- * Returns the cache event details extracted from the given
- * SystemMemberCacheEvent
+ * Returns the cache event details extracted from the given SystemMemberCacheEvent
*
- * @param event
- * SystemMemberCacheEvent instance
- * @return the cache event details extracted from the given
- * SystemMemberCacheEvent
+ * @param event SystemMemberCacheEvent instance
+ * @return the cache event details extracted from the given SystemMemberCacheEvent
*/
- /*default*/static String getCacheEventDetails(SystemMemberCacheEvent event) {
- String memberId = event.getMemberId();
+ /* default */static String getCacheEventDetails(SystemMemberCacheEvent event) {
+ String memberId = event.getMemberId();
Operation operation = event.getOperation();
-
- return "CacheEvent[MemberId: "+memberId+", operation: "+operation+"]";
+
+ return "CacheEvent[MemberId: " + memberId + ", operation: " + operation + "]";
}
-
+
/**
- * Returns the region event details extracted from the given
- * SystemMemberRegionEvent
+ * Returns the region event details extracted from the given SystemMemberRegionEvent
*
- * @param event
- * SystemMemberRegionEvent instance
- * @return the cache event details extracted from the given
- * SystemMemberRegionEvent
- */
- /*default*/static String getRegionEventDetails(SystemMemberRegionEvent event) {
- String memberId = event.getMemberId();
+ * @param event SystemMemberRegionEvent instance
+ * @return the cache event details extracted from the given SystemMemberRegionEvent
+ */
+ /* default */static String getRegionEventDetails(SystemMemberRegionEvent event) {
+ String memberId = event.getMemberId();
Operation operation = event.getOperation();
-
- return "RegionEvent[MemberId: " + memberId + ", operation: " + operation
- + ", region:" + event.getRegionPath() + "]";
+
+ return "RegionEvent[MemberId: " + memberId + ", operation: " + operation + ", region:"
+ + event.getRegionPath() + "]";
}
/**
* Sends the given notification.
*
- * @param notif
- * notification to send
+ * @param notif notification to send
*
- * @throws NullPointerException
- * if resource or ModelMBean for resource is null
+ * @throws NullPointerException if resource or ModelMBean for resource is null
*/
- /*default*/static void sendNotification(ManagedResource resource, Notification notif) {
+ /* default */static void sendNotification(ManagedResource resource, Notification notif) {
try {
if (MBeanUtil.isRegistered(resource.getObjectName())) {
resource.getModelMBean().sendNotification(notif);
@@ -477,17 +440,19 @@ public interface SystemMemberJmx
}
}
} catch (RuntimeOperationsException e) {
- logger.info(LocalizedMessage.create(
- LocalizedStrings.SystemMemberJmx_FAILED_TO_SEND_0_NOTIFICATION_FOR_1,
- new Object[] { "'" + notif.getType() + "'",
- "'" + notif.getMessage() + "'" }),
- e);
+ logger
+ .info(
+ LocalizedMessage.create(
+ LocalizedStrings.SystemMemberJmx_FAILED_TO_SEND_0_NOTIFICATION_FOR_1,
+ new Object[] {"'" + notif.getType() + "'", "'" + notif.getMessage() + "'"}),
+ e);
} catch (MBeanException e) {
- logger.info(LocalizedMessage.create(
- LocalizedStrings.SystemMemberJmx_FAILED_TO_SEND_0_NOTIFICATION_FOR_1,
- new Object[] { "'" + notif.getType() + "'",
- "'" + notif.getMessage() + "'" }),
- e);
+ logger
+ .info(
+ LocalizedMessage.create(
+ LocalizedStrings.SystemMemberJmx_FAILED_TO_SEND_0_NOTIFICATION_FOR_1,
+ new Object[] {"'" + notif.getType() + "'", "'" + notif.getMessage() + "'"}),
+ e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
index 2f5fca9..0241302 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -53,66 +51,59 @@ import org.apache.geode.internal.logging.LogService;
/**
* Provides MBean support for managing a SystemMember application.
* <p>
- * TODO: refactor to implement SystemMember and delegate to SystemMemberImpl.
- * Wrap all delegate calls w/ e.printStackTrace() since the HttpAdaptor devours
- * them
+ * TODO: refactor to implement SystemMember and delegate to SystemMemberImpl. Wrap all delegate
+ * calls w/ e.printStackTrace() since the HttpAdaptor devours them
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
-public class SystemMemberJmxImpl
-extends org.apache.geode.admin.internal.SystemMemberImpl
-implements SystemMemberJmx, javax.management.NotificationListener,
- org.apache.geode.admin.jmx.internal.ManagedResource {
+public class SystemMemberJmxImpl extends org.apache.geode.admin.internal.SystemMemberImpl
+ implements SystemMemberJmx, javax.management.NotificationListener,
+ org.apache.geode.admin.jmx.internal.ManagedResource {
private static final Logger logger = LogService.getLogger();
-
- /**
- * Interval in seconds between refreshes. Value less than one results in no
- * refreshing
+
+ /**
+ * Interval in seconds between refreshes. Value less than one results in no refreshing
*/
private int refreshInterval = 0;
-
+
/** The JMX object name of this managed resource */
private ObjectName objectName;
/** Reference to the cache MBean representing a Cache in the Cache VM Member */
private SystemMemberCacheJmxImpl managedSystemMemberCache;
-
+
/** collection to collect all the resources created for this member */
- private Map<StatResource, StatisticResourceJmxImpl> managedStatisticsResourcesMap = new HashMap<StatResource, StatisticResourceJmxImpl>();
+ private Map<StatResource, StatisticResourceJmxImpl> managedStatisticsResourcesMap =
+ new HashMap<StatResource, StatisticResourceJmxImpl>();
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
-
- /**
+
+ /**
* Constructs an instance of SystemMemberJmxImpl.
*
- * @param system the distributed system this SystemMember is a member of
+ * @param system the distributed system this SystemMember is a member of
* @param application the internal admin application to delegate actual work
*/
- public SystemMemberJmxImpl(AdminDistributedSystemJmxImpl system,
- ApplicationVM application)
- throws org.apache.geode.admin.AdminException {
+ public SystemMemberJmxImpl(AdminDistributedSystemJmxImpl system, ApplicationVM application)
+ throws org.apache.geode.admin.AdminException {
super(system, application);
initializeMBean();
}
-
+
/**
- * Constructs the instance of SystemMember using the corresponding
- * InternalDistributedMember instance of a DS member for the given
- * AdminDistributedSystem.
+ * Constructs the instance of SystemMember using the corresponding InternalDistributedMember
+ * instance of a DS member for the given AdminDistributedSystem.
+ *
+ * @param system Current AdminDistributedSystem instance
+ * @param member InternalDistributedMember instance for which a SystemMember instance is to be
+ * constructed.
+ * @throws AdminException if construction of SystemMember fails
*
- * @param system
- * Current AdminDistributedSystem instance
- * @param member
- * InternalDistributedMember instance for which a SystemMember
- * instance is to be constructed.
- * @throws AdminException
- * if construction of SystemMember fails
- *
* @since GemFire 6.5
*/
protected SystemMemberJmxImpl(AdminDistributedSystemJmxImpl system,
@@ -122,27 +113,25 @@ implements SystemMemberJmx, javax.management.NotificationListener,
}
/** Create and register the MBean to manage this resource */
- private void initializeMBean()
- throws org.apache.geode.admin.AdminException {
- //initialize Managed Resources for stats & cache first.
-// initializeManagedResources();
+ private void initializeMBean() throws org.apache.geode.admin.AdminException {
+ // initialize Managed Resources for stats & cache first.
+ // initializeManagedResources();
this.mbeanName = new StringBuffer("GemFire.Member:id=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(getId()))
- .append(",type=").append(MBeanUtil.makeCompliantMBeanNameProperty(getType().getName())).toString();
-
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(getId())).append(",type=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(getType().getName())).toString();
+
this.objectName =
- MBeanUtil.createMBean(this,
- addDynamicAttributes(MBeanUtil.lookupManagedBean(this)));
+ MBeanUtil.createMBean(this, addDynamicAttributes(MBeanUtil.lookupManagedBean(this)));
// Refresh Interval
- AdminDistributedSystemJmxImpl sysJmx = (AdminDistributedSystemJmxImpl)system;
+ AdminDistributedSystemJmxImpl sysJmx = (AdminDistributedSystemJmxImpl) system;
if (sysJmx.getRefreshInterval() > 0)
this.refreshInterval = sysJmx.getRefreshInterval();
}
-
+
// -------------------------------------------------------------------------
- // MBean attributes - accessors/mutators
+ // MBean attributes - accessors/mutators
// -------------------------------------------------------------------------
/**
@@ -153,31 +142,28 @@ implements SystemMemberJmx, javax.management.NotificationListener,
public int getRefreshInterval() {
return this.refreshInterval;
}
-
+
/**
- * RefreshInterval is now set only through the AdminDistributedSystem property
- * refreshInterval. Attempt to set refreshInterval on SystemMemberJmx MBean
- * would result in an OperationNotSupportedException Auto-refresh is enabled
- * on demand when a call to refreshConfig is made
+ * RefreshInterval is now set only through the AdminDistributedSystem property refreshInterval.
+ * Attempt to set refreshInterval on SystemMemberJmx MBean would result in an
+ * OperationNotSupportedException Auto-refresh is enabled on demand when a call to refreshConfig
+ * is made
*
- * @param refreshInterval
- * the new refresh interval in seconds
+ * @param refreshInterval the new refresh interval in seconds
* @deprecated since 6.0 use DistributedSystemConfig.refreshInterval instead
*/
@Deprecated
- public void setRefreshInterval(int refreshInterval)
- throws OperationNotSupportedException {
+ public void setRefreshInterval(int refreshInterval) throws OperationNotSupportedException {
throw new OperationNotSupportedException(
- LocalizedStrings.MANAGED_RESOURCE_REFRESH_INTERVAL_CANT_BE_SET_DIRECTLY.toLocalizedString());
+ LocalizedStrings.MANAGED_RESOURCE_REFRESH_INTERVAL_CANT_BE_SET_DIRECTLY
+ .toLocalizedString());
}
/**
- * Sets interval in seconds between member config refreshes; zero or less
- * turns off auto refreshing. Manual refreshing has no effect on when the next
- * scheduled refresh will occur.
+ * Sets interval in seconds between member config refreshes; zero or less turns off auto
+ * refreshing. Manual refreshing has no effect on when the next scheduled refresh will occur.
*
- * @param refreshInterval
- * the new refresh interval in seconds
+ * @param refreshInterval the new refresh interval in seconds
*/
public void _setRefreshInterval(int refreshInterval) {
boolean isRegistered = MBeanUtil.isRefreshNotificationRegistered(this,
@@ -186,12 +172,11 @@ implements SystemMemberJmx, javax.management.NotificationListener,
if (isRegistered && (getRefreshInterval() == refreshInterval))
return;
- this.refreshInterval = Helper.setAndReturnRefreshInterval(this,
- refreshInterval);
+ this.refreshInterval = Helper.setAndReturnRefreshInterval(this, refreshInterval);
}
-
+
// -------------------------------------------------------------------------
- // MBean Operations
+ // MBean Operations
// -------------------------------------------------------------------------
public void refreshConfig() throws org.apache.geode.admin.AdminException {
@@ -203,141 +188,129 @@ implements SystemMemberJmx, javax.management.NotificationListener,
super.refreshConfig();
}
-
+
/**
* Initializes Cache & Statistics managed resources.
*
- * @throws AdminException
- * if initialization of managed resources fails
+ * @throws AdminException if initialization of managed resources fails
*/
-// private void initializeManagedResources() throws AdminException {
-// try {
-// manageCache();
-// } catch (MalformedObjectNameException e) {
-// throw new AdminException(LocalizedStrings.SystemMemberJmxImpl_EXCEPTION_OCCURRED_WHILE_INITIALIZING_0_MBEANS_FOR_1.toLocalizedString(
-// new Object[] {"Cache", getId()}),
-// e);
-// } catch (AdminException ae) {
-// if (LocalizedStrings.SystemMemberJmx_THIS_SYSTEM_MEMBER_DOES_NOT_HAVE_A_CACHE.toLocalizedString().equals(ae.getMessage())) {
-// //ignore this exception for a cache-less peer
-// } else {
-// throw ae;
-// }
-// }
-// try {
-// manageStats();
-// } catch (MalformedObjectNameException e) {
-// throw new AdminException(LocalizedStrings.SystemMemberJmxImpl_EXCEPTION_OCCURRED_WHILE_INITIALIZING_0_MBEANS_FOR_1.toLocalizedString(
-// new Object[] {"Statistics", getId()}),
-// e);
-// }
-// }
-
- /**
+ // private void initializeManagedResources() throws AdminException {
+ // try {
+ // manageCache();
+ // } catch (MalformedObjectNameException e) {
+ // throw new
+ // AdminException(LocalizedStrings.SystemMemberJmxImpl_EXCEPTION_OCCURRED_WHILE_INITIALIZING_0_MBEANS_FOR_1.toLocalizedString(
+ // new Object[] {"Cache", getId()}),
+ // e);
+ // } catch (AdminException ae) {
+ // if
+ // (LocalizedStrings.SystemMemberJmx_THIS_SYSTEM_MEMBER_DOES_NOT_HAVE_A_CACHE.toLocalizedString().equals(ae.getMessage()))
+ // {
+ // //ignore this exception for a cache-less peer
+ // } else {
+ // throw ae;
+ // }
+ // }
+ // try {
+ // manageStats();
+ // } catch (MalformedObjectNameException e) {
+ // throw new
+ // AdminException(LocalizedStrings.SystemMemberJmxImpl_EXCEPTION_OCCURRED_WHILE_INITIALIZING_0_MBEANS_FOR_1.toLocalizedString(
+ // new Object[] {"Statistics", getId()}),
+ // e);
+ // }
+ // }
+
+ /**
* Gets this member's cache.
*
* @return <code>ObjectName</code> for this member's cache
*
- * @throws AdminException
- * If this system member does not host a cache
+ * @throws AdminException If this system member does not host a cache
*/
- public ObjectName manageCache()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName manageCache() throws AdminException, MalformedObjectNameException {
return Helper.manageCache(this);
}
-
- /**
+
+ /**
* Gets all active StatisticResources for this manager.
*
* @return array of ObjectName instances
*/
- public ObjectName[] manageStats()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName[] manageStats() throws AdminException, MalformedObjectNameException {
return Helper.manageStats(this);
}
-
- /**
- * Gets the active StatisticResources for this manager, based on the
- * typeName as the key
+
+ /**
+ * Gets the active StatisticResources for this manager, based on the typeName as the key
*
* @return ObjectName of StatisticResourceJMX instance
*/
- public ObjectName[] manageStat(String statisticsTypeName)
- throws AdminException, MalformedObjectNameException {
-
+ public ObjectName[] manageStat(String statisticsTypeName)
+ throws AdminException, MalformedObjectNameException {
+
return Helper.manageStat(this, statisticsTypeName);
}
-
+
// -------------------------------------------------------------------------
- // JMX Notification listener
+ // JMX Notification listener
// -------------------------------------------------------------------------
/**
- * Handles notification to refresh. Reacts by refreshing the values of this
- * SystemMember's ConfigurationParamaters. Any other notification is ignored.
- * Given notification is handled only if there is any JMX client connected to
- * the system.
+ * Handles notification to refresh. Reacts by refreshing the values of this SystemMember's
+ * ConfigurationParamaters. Any other notification is ignored. Given notification is handled only
+ * if there is any JMX client connected to the system.
*
- * @param notification
- * the JMX notification being received
- * @param hb
- * handback object is unused
+ * @param notification the JMX notification being received
+ * @param hb handback object is unused
*/
public void handleNotification(Notification notification, Object hb) {
- AdminDistributedSystemJmxImpl systemJmx =
- (AdminDistributedSystemJmxImpl) this.system;
-
+ AdminDistributedSystemJmxImpl systemJmx = (AdminDistributedSystemJmxImpl) this.system;
+
if (!systemJmx.isRmiClientCountZero()) {
Helper.handleNotification(this, notification, hb);
}
}
// -------------------------------------------------------------------------
- // Template methods overriden from superclass...
+ // Template methods overriden from superclass...
// -------------------------------------------------------------------------
/**
- * Template method for creating instance of ConfigurationParameter.
- * Overridden to return ConfigurationParameterJmxImpl.
+ * Template method for creating instance of ConfigurationParameter. Overridden to return
+ * ConfigurationParameterJmxImpl.
*/
@Override
- protected ConfigurationParameter createConfigurationParameter(String name,
- String description,
- Object value,
- Class type,
- boolean userModifiable) {
- return new ConfigurationParameterJmxImpl(
- name, description, value, type, userModifiable);
+ protected ConfigurationParameter createConfigurationParameter(String name, String description,
+ Object value, Class type, boolean userModifiable) {
+ return new ConfigurationParameterJmxImpl(name, description, value, type, userModifiable);
}
/**
- * Override createStatisticResource by instantiating StatisticResourceJmxImpl
- * if it was not created earlier otherwise returns the same instance.
+ * Override createStatisticResource by instantiating StatisticResourceJmxImpl if it was not
+ * created earlier otherwise returns the same instance.
*
- * @param stat
- * StatResource reference for which this JMX resource is to be created
+ * @param stat StatResource reference for which this JMX resource is to be created
* @return StatisticResourceJmxImpl - JMX Implementation of StatisticResource
- * @throws AdminException
- * if constructing StatisticResourceJmxImpl instance fails
+ * @throws AdminException if constructing StatisticResourceJmxImpl instance fails
*/
@Override
protected StatisticResource createStatisticResource(StatResource stat)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
StatisticResourceJmxImpl managedStatisticResource = null;
-
+
synchronized (this.managedStatisticsResourcesMap) {
- /*
- * Ensuring that a single instance of Statistic Resource is created per
- * StatResource.
+ /*
+ * Ensuring that a single instance of Statistic Resource is created per StatResource.
*/
StatisticResourceJmxImpl statisticResourceJmxImpl = managedStatisticsResourcesMap.get(stat);
if (statisticResourceJmxImpl != null) {
managedStatisticResource = statisticResourceJmxImpl;
} else {
managedStatisticResource = new StatisticResourceJmxImpl(stat, this);
- managedStatisticResource.getStatistics();//inits timer
+ managedStatisticResource.getStatistics();// inits timer
managedStatisticsResourcesMap.put(stat, managedStatisticResource);
}
}
@@ -345,18 +318,16 @@ implements SystemMemberJmx, javax.management.NotificationListener,
}
/**
- * Override createSystemMemberCache by instantiating SystemMemberCacheJmxImpl
- * if it was not created earlier.
+ * Override createSystemMemberCache by instantiating SystemMemberCacheJmxImpl if it was not
+ * created earlier.
*
- * @param vm
- * GemFireVM reference for which this JMX resource is to be created
+ * @param vm GemFireVM reference for which this JMX resource is to be created
* @return SystemMemberCacheJmxImpl - JMX Implementation of SystemMemberCache
- * @throws AdminException
- * if constructing SystemMemberCacheJmxImpl instance fails
+ * @throws AdminException if constructing SystemMemberCacheJmxImpl instance fails
*/
@Override
protected SystemMemberCache createSystemMemberCache(GemFireVM vm)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
if (managedSystemMemberCache == null) {
managedSystemMemberCache = new SystemMemberCacheJmxImpl(vm);
}
@@ -364,43 +335,43 @@ implements SystemMemberJmx, javax.management.NotificationListener,
}
// -------------------------------------------------------------------------
- // Create MBean attributes for each ConfigurationParameter
+ // Create MBean attributes for each ConfigurationParameter
// -------------------------------------------------------------------------
-
+
/**
* Add MBean attribute definitions for each ConfigurationParameter.
*
* @param managed the mbean definition to add attributes to
- * @return a new instance of ManagedBean copied from <code>managed</code> but
- * with the new attributes added
+ * @return a new instance of ManagedBean copied from <code>managed</code> but with the new
+ * attributes added
*/
- public ManagedBean addDynamicAttributes(ManagedBean managed)
- throws AdminException {
+ public ManagedBean addDynamicAttributes(ManagedBean managed) throws AdminException {
return Helper.addDynamicAttributes(this, managed);
}
// -------------------------------------------------------------------------
- // ManagedResource implementation
+ // ManagedResource implementation
// -------------------------------------------------------------------------
-
+
/** The name of the MBean that will manage this resource */
private String mbeanName;
/** The ModelMBean that is configured to manage this resource */
private ModelMBean modelMBean;
-
- public String getMBeanName() {
- return this.mbeanName;
- }
-
- public ModelMBean getModelMBean() {
- return this.modelMBean;
- }
- public void setModelMBean(ModelMBean modelMBean) {
- this.modelMBean = modelMBean;
- }
-
+
+ public String getMBeanName() {
+ return this.mbeanName;
+ }
+
+ public ModelMBean getModelMBean() {
+ return this.modelMBean;
+ }
+
+ public void setModelMBean(ModelMBean modelMBean) {
+ this.modelMBean = modelMBean;
+ }
+
public ObjectName getObjectName() {
return this.objectName;
}
@@ -408,11 +379,10 @@ implements SystemMemberJmx, javax.management.NotificationListener,
public ManagedResourceType getManagedResourceType() {
return ManagedResourceType.SYSTEM_MEMBER;
}
-
+
/**
- * Un-registers all the statistics & cache managed resource created for this
- * member. After un-registering the resource MBean instances, clears
- * managedStatisticsResourcesMap collection.
+ * Un-registers all the statistics & cache managed resource created for this member. After
+ * un-registering the resource MBean instances, clears managedStatisticsResourcesMap collection.
*/
public void cleanupResource() {
synchronized (this.managedStatisticsResourcesMap) {
@@ -425,12 +395,13 @@ implements SystemMemberJmx, javax.management.NotificationListener,
}
this.parms.clear();
- Collection<StatisticResourceJmxImpl> statisticResources = managedStatisticsResourcesMap.values();
-
+ Collection<StatisticResourceJmxImpl> statisticResources =
+ managedStatisticsResourcesMap.values();
+
for (StatisticResourceJmxImpl statisticResource : statisticResources) {
MBeanUtil.unregisterMBean(statisticResource);
}
-
+
this.managedStatisticsResourcesMap.clear();
}
MBeanUtil.unregisterMBean(managedSystemMemberCache);
@@ -438,53 +409,48 @@ implements SystemMemberJmx, javax.management.NotificationListener,
/**
- * Cleans up Managed Resources created for the client that was connected to
- * the server represented by this class.
+ * Cleans up Managed Resources created for the client that was connected to the server represented
+ * by this class.
*
- * @param clientId
- * id of the client to be removed
- * @return List of ManagedResources associated with the client of given client
- * id
+ * @param clientId id of the client to be removed
+ * @return List of ManagedResources associated with the client of given client id
*/
/*
- * This clean up is for the clients. The clients are started with a loner DM.
- * Hence the clientId is not supposed to contain '/' as per
- * InternalDistributedMember.toString().
+ * This clean up is for the clients. The clients are started with a loner DM. Hence the clientId
+ * is not supposed to contain '/' as per InternalDistributedMember.toString().
*/
public List<ManagedResource> cleanupBridgeClientResources(String clientId) {
List<ManagedResource> returnedResources = new ArrayList<ManagedResource>();
- String compatibleId = "id_"+MBeanUtil.makeCompliantMBeanNameProperty(clientId);
+ String compatibleId = "id_" + MBeanUtil.makeCompliantMBeanNameProperty(clientId);
synchronized (this.managedStatisticsResourcesMap) {
- Set<Entry<StatResource, StatisticResourceJmxImpl>> entrySet = this.managedStatisticsResourcesMap.entrySet();
-
- for (Iterator<Entry<StatResource, StatisticResourceJmxImpl>> it = entrySet.iterator(); it.hasNext();) {
+ Set<Entry<StatResource, StatisticResourceJmxImpl>> entrySet =
+ this.managedStatisticsResourcesMap.entrySet();
+
+ for (Iterator<Entry<StatResource, StatisticResourceJmxImpl>> it = entrySet.iterator(); it
+ .hasNext();) {
Entry<StatResource, StatisticResourceJmxImpl> entry = it.next();
StatisticResourceJmxImpl resource = entry.getValue();
if (resource.getMBeanName().contains(compatibleId)) {
- it.remove(); //remove matching entry
+ it.remove(); // remove matching entry
returnedResources.add(resource);
}
}
}
return returnedResources;
}
-
+
/**
* Implementation handles client membership changes.
*
- * @param clientId
- * id of the client for whom membership change happened
- * @param eventType
- * membership change type; one of
- * {@link ClientMembershipMessage#JOINED},
- * {@link ClientMembershipMessage#LEFT},
- * {@link ClientMembershipMessage#CRASHED}
+ * @param clientId id of the client for whom membership change happened
+ * @param eventType membership change type; one of {@link ClientMembershipMessage#JOINED},
+ * {@link ClientMembershipMessage#LEFT}, {@link ClientMembershipMessage#CRASHED}
*/
public void handleClientMembership(String clientId, int eventType) {
- String notifType = null;
+ String notifType = null;
List<ManagedResource> cleanedUp = null;
-
+
if (eventType == ClientMembershipMessage.LEFT) {
notifType = NOTIF_CLIENT_LEFT;
cleanedUp = cleanupBridgeClientResources(clientId);
@@ -494,96 +460,79 @@ implements SystemMemberJmx, javax.management.NotificationListener,
} else if (eventType == ClientMembershipMessage.JOINED) {
notifType = NOTIF_CLIENT_JOINED;
}
-
+
if (cleanedUp != null) {
for (ManagedResource resource : cleanedUp) {
MBeanUtil.unregisterMBean(resource);
}
}
- Helper.sendNotification(this,
- new Notification(notifType, this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- clientId));
+ Helper.sendNotification(this, new Notification(notifType, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), clientId));
}
-
+
/**
- * Implementation handles creation of cache by extracting the details from the
- * given event object and sending the
- * {@link SystemMemberJmx#NOTIF_CACHE_CREATED} notification to the connected
- * JMX Clients.
+ * Implementation handles creation of cache by extracting the details from the given event object
+ * and sending the {@link SystemMemberJmx#NOTIF_CACHE_CREATED} notification to the connected JMX
+ * Clients.
*
- * @param event
- * event object corresponding to the creation of the cache
+ * @param event event object corresponding to the creation of the cache
*/
public void handleCacheCreate(SystemMemberCacheEvent event) {
- Helper.sendNotification(this,
- new Notification(NOTIF_CACHE_CREATED, this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- Helper.getCacheEventDetails(event)));
- }
+ Helper.sendNotification(this, new Notification(NOTIF_CACHE_CREATED, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), Helper.getCacheEventDetails(event)));
+ }
/**
- * Implementation handles closure of cache by extracting the details from the
- * given event object and sending the
- * {@link SystemMemberJmx#NOTIF_CACHE_CLOSED} notification to the connected
- * JMX Clients.
+ * Implementation handles closure of cache by extracting the details from the given event object
+ * and sending the {@link SystemMemberJmx#NOTIF_CACHE_CLOSED} notification to the connected JMX
+ * Clients.
*
- * @param event
- * event object corresponding to the closure of the cache
+ * @param event event object corresponding to the closure of the cache
*/
public void handleCacheClose(SystemMemberCacheEvent event) {
- Helper.sendNotification(this,
- new Notification(NOTIF_CACHE_CLOSED, this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- Helper.getCacheEventDetails(event)));
+ Helper.sendNotification(this, new Notification(NOTIF_CACHE_CLOSED, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), Helper.getCacheEventDetails(event)));
}
/**
- * Implementation handles creation of region by extracting the details from
- * the given event object and sending the
- * {@link SystemMemberJmx#NOTIF_REGION_CREATED} notification to the connected
- * JMX Clients. Region Path is set as User Data in Notification.
+ * Implementation handles creation of region by extracting the details from the given event object
+ * and sending the {@link SystemMemberJmx#NOTIF_REGION_CREATED} notification to the connected JMX
+ * Clients. Region Path is set as User Data in Notification.
*
- * @param event
- * event object corresponding to the creation of a region
+ * @param event event object corresponding to the creation of a region
*/
public void handleRegionCreate(SystemMemberRegionEvent event) {
- Notification notification = new Notification(NOTIF_REGION_CREATED, this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- Helper.getRegionEventDetails(event));
-
+ Notification notification = new Notification(NOTIF_REGION_CREATED, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), Helper.getRegionEventDetails(event));
+
notification.setUserData(event.getRegionPath());
Helper.sendNotification(this, notification);
}
/**
- * Implementation should handle loss of region by extracting the details from
- * the given event object and sending the
- * {@link SystemMemberJmx#NOTIF_REGION_LOST} notification to the connected
- * JMX Clients. Region Path is set as User Data in Notification. Additionally,
- * it also clears the ManagedResources created for the region that is lost.
+ * Implementation should handle loss of region by extracting the details from the given event
+ * object and sending the {@link SystemMemberJmx#NOTIF_REGION_LOST} notification to the connected
+ * JMX Clients. Region Path is set as User Data in Notification. Additionally, it also clears the
+ * ManagedResources created for the region that is lost.
*
- * @param event
- * event object corresponding to the loss of a region
+ * @param event event object corresponding to the loss of a region
*/
public void handleRegionLoss(SystemMemberRegionEvent event) {
SystemMemberCacheJmxImpl cacheResource = this.managedSystemMemberCache;
-
+
if (cacheResource != null) {
- ManagedResource cleanedUp =
- cacheResource.cleanupRegionResources(event.getRegionPath());
-
+ ManagedResource cleanedUp = cacheResource.cleanupRegionResources(event.getRegionPath());
+
if (cleanedUp != null) {
MBeanUtil.unregisterMBean(cleanedUp);
}
}
-
- Notification notification = new Notification(NOTIF_REGION_LOST, this.modelMBean,
- Helper.getNextNotificationSequenceNumber(),
- Helper.getRegionEventDetails(event));
-
+
+ Notification notification = new Notification(NOTIF_REGION_LOST, this.modelMBean,
+ Helper.getNextNotificationSequenceNumber(), Helper.getRegionEventDetails(event));
+
notification.setUserData(event.getRegionPath());
Helper.sendNotification(this, notification);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
index 9ee3153..cc5621e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberRegionJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -24,75 +22,70 @@ import javax.management.ObjectName;
import javax.management.modelmbean.ModelMBean;
/**
- * MBean representation of {@link
- * org.apache.geode.admin.SystemMemberRegion}.
+ * MBean representation of {@link org.apache.geode.admin.SystemMemberRegion}.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
-public class SystemMemberRegionJmxImpl
-extends org.apache.geode.admin.internal.SystemMemberRegionImpl
-implements org.apache.geode.admin.jmx.internal.ManagedResource {
+public class SystemMemberRegionJmxImpl
+ extends org.apache.geode.admin.internal.SystemMemberRegionImpl
+ implements org.apache.geode.admin.jmx.internal.ManagedResource {
/** The object name of this managed resource */
private ObjectName objectName;
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
- /**
+ /**
* Constructs an instance of SystemMemberRegionJmxImpl.
*
- * @param cache the cache this region belongs to
- * @param region internal region to delegate real work to
+ * @param cache the cache this region belongs to
+ * @param region internal region to delegate real work to
*/
- public SystemMemberRegionJmxImpl(SystemMemberCacheImpl cache,
- Region region)
- throws org.apache.geode.admin.AdminException {
+ public SystemMemberRegionJmxImpl(SystemMemberCacheImpl cache, Region region)
+ throws org.apache.geode.admin.AdminException {
super(cache, region);
initializeMBean(cache);
}
/** Create and register the MBean to manage this resource */
private void initializeMBean(SystemMemberCacheImpl cache)
- throws org.apache.geode.admin.AdminException {
-
+ throws org.apache.geode.admin.AdminException {
+
GemFireVM vm = cache.getVM();
- this.mbeanName = new StringBuffer("GemFire.Cache:")
- .append("path=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(getFullPath()))
- .append(",name=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(cache.getName()))
- .append(",id=")
- .append(cache.getId())
- .append(",owner=")
+ this.mbeanName = new StringBuffer("GemFire.Cache:").append("path=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(getFullPath())).append(",name=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(cache.getName())).append(",id=")
+ .append(cache.getId()).append(",owner=")
.append(MBeanUtil.makeCompliantMBeanNameProperty(vm.getId().toString()))
.append(",type=Region").toString();
-
+
this.objectName = MBeanUtil.createMBean(this);
}
-
+
// -------------------------------------------------------------------------
- // ManagedResource implementation
+ // ManagedResource implementation
// -------------------------------------------------------------------------
-
+
/** The name of the MBean that will manage this resource */
private String mbeanName;
/** The ModelMBean that is configured to manage this resource */
private ModelMBean modelMBean;
-
- public String getMBeanName() {
- return this.mbeanName;
- }
-
- public ModelMBean getModelMBean() {
- return this.modelMBean;
- }
- public void setModelMBean(ModelMBean modelMBean) {
- this.modelMBean = modelMBean;
- }
-
+
+ public String getMBeanName() {
+ return this.mbeanName;
+ }
+
+ public ModelMBean getModelMBean() {
+ return this.modelMBean;
+ }
+
+ public void setModelMBean(ModelMBean modelMBean) {
+ this.modelMBean = modelMBean;
+ }
+
public ObjectName getObjectName() {
return this.objectName;
}
@@ -100,33 +93,30 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource {
public ManagedResourceType getManagedResourceType() {
return ManagedResourceType.SYSTEM_MEMBER_REGION;
}
-
+
public void cleanupResource() {}
/**
- * Checks equality of the given object with <code>this</code> based on the
- * type (Class) and the MBean Name returned by <code>getMBeanName()</code>
- * methods.
+ * Checks equality of the given object with <code>this</code> based on the type (Class) and the
+ * MBean Name returned by <code>getMBeanName()</code> methods.
*
- * @param obj
- * object to check equality with
- * @return true if the given object is if the same type and its MBean Name is
- * same as <code>this</code> object's MBean Name, false otherwise
+ * @param obj object to check equality with
+ * @return true if the given object is if the same type and its MBean Name is same as
+ * <code>this</code> object's MBean Name, false otherwise
*/
@Override
public boolean equals(Object obj) {
- if ( !(obj instanceof SystemMemberRegionJmxImpl) ) {
+ if (!(obj instanceof SystemMemberRegionJmxImpl)) {
return false;
}
-
- SystemMemberRegionJmxImpl other = (SystemMemberRegionJmxImpl) obj;
-
+
+ SystemMemberRegionJmxImpl other = (SystemMemberRegionJmxImpl) obj;
+
return this.getMBeanName().equals(other.getMBeanName());
}
/**
- * Returns hash code for <code>this</code> object which is based on the MBean
- * Name generated.
+ * Returns hash code for <code>this</code> object which is based on the MBean Name generated.
*
* @return hash code for <code>this</code> object
*/
[45/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
index e2f7f51..cb0465d 100644
--- a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
+++ b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
@@ -1,37 +1,33 @@
/*
-* 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.
-*/
+ * 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.modules.session.junit;
/**
- * 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
* <p/>
* http://www.apache.org/licenses/LICENSE-2.0
* <p/>
- * 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.
*/
import org.junit.After;
@@ -57,8 +53,7 @@ import java.util.StringTokenizer;
import java.util.logging.Logger;
public class PerTestClassLoaderRunner extends NamedRunner {
- private static final Logger LOGGER = Logger
- .getLogger(PerTestClassLoaderRunner.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(PerTestClassLoaderRunner.class.getName());
// The classpath is needed because the custom class loader looks there to find the classes.
private static String classPath;
@@ -93,8 +88,7 @@ public class PerTestClassLoaderRunner extends NamedRunner {
*
* @throws ClassNotFoundException the class not found exception
*/
- private void loadClassesWithCustomClassLoader()
- throws ClassNotFoundException {
+ private void loadClassesWithCustomClassLoader() throws ClassNotFoundException {
String classPath = System.getProperty("java.class.path");
StringTokenizer st = new StringTokenizer(classPath, ":");
List<URL> urls = new ArrayList<URL>();
@@ -111,15 +105,13 @@ public class PerTestClassLoaderRunner extends NamedRunner {
}
}
- ClassLoader classLoader = new ChildFirstClassLoader(
- urls.toArray(new URL[]{}),
- Thread.currentThread().getContextClassLoader()
- );
+ ClassLoader classLoader = new ChildFirstClassLoader(urls.toArray(new URL[] {}),
+ Thread.currentThread().getContextClassLoader());
Thread.currentThread().setContextClassLoader(classLoader);
- testClassFromClassLoader = new TestClass(classLoader
- .loadClass(getTestClass().getJavaClass().getName()));
+ testClassFromClassLoader =
+ new TestClass(classLoader.loadClass(getTestClass().getJavaClass().getName()));
// See withAfters and withBefores for the reason.
beforeFromClassLoader = classLoader.loadClass(Before.class.getName());
afterFromClassLoader = classLoader.loadClass(After.class.getName());
@@ -137,8 +129,8 @@ public class PerTestClassLoaderRunner extends NamedRunner {
// The method as parameter is from the original class and thus not found in our
// class loaded by the custom name (reflection is class loader sensitive)
// So find the same method but now in the class from the class Loader.
- Method methodFromNewlyLoadedClass = testClassFromClassLoader
- .getJavaClass().getMethod(method.getName());
+ Method methodFromNewlyLoadedClass =
+ testClassFromClassLoader.getJavaClass().getMethod(method.getName());
newMethod = new FrameworkMethod(methodFromNewlyLoadedClass);
} catch (ClassNotFoundException e) {
// Show any problem nicely as a JUnit Test failure.
@@ -155,27 +147,23 @@ public class PerTestClassLoaderRunner extends NamedRunner {
@SuppressWarnings("unchecked")
@Override
- protected Statement withAfters(FrameworkMethod method, Object target,
- Statement statement) {
+ protected Statement withAfters(FrameworkMethod method, Object target, Statement statement) {
// We now to need to search in the class from the custom loader.
// We also need to search with the annotation loaded by the custom
// class loader or otherwise we don't find any method.
List<FrameworkMethod> afters = testClassFromClassLoader
- .getAnnotatedMethods(
- (Class<? extends Annotation>) afterFromClassLoader);
+ .getAnnotatedMethods((Class<? extends Annotation>) afterFromClassLoader);
return new RunAfters(statement, afters, target);
}
@SuppressWarnings("unchecked")
@Override
- protected Statement withBefores(FrameworkMethod method, Object target,
- Statement statement) {
+ protected Statement withBefores(FrameworkMethod method, Object target, Statement statement) {
// We now to need to search in the class from the custom loader.
// We also need to search with the annotation loaded by the custom
// class loader or otherwise we don't find any method.
List<FrameworkMethod> befores = testClassFromClassLoader
- .getAnnotatedMethods(
- (Class<? extends Annotation>) beforeFromClassLoader);
+ .getAnnotatedMethods((Class<? extends Annotation>) beforeFromClassLoader);
return new RunBefores(statement, befores, target);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
index c0dfe23..204ff5e 100644
--- a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
+++ b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import java.io.DataInput;
@@ -56,7 +54,8 @@ import org.apache.geode.modules.session.catalina.internal.DeltaSessionDestroyAtt
import org.apache.geode.modules.session.catalina.internal.DeltaSessionUpdateAttributeEvent;
@SuppressWarnings("serial")
-public class DeltaSession7 extends StandardSession implements DataSerializable, Delta, GatewayDelta, Sizeable, DeltaSessionInterface {
+public class DeltaSession7 extends StandardSession
+ implements DataSerializable, Delta, GatewayDelta, Sizeable, DeltaSessionInterface {
private transient Region<String, HttpSession> operatingRegion;
@@ -72,7 +71,8 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
private transient final Object changeLock = new Object();
- private final List<DeltaSessionAttributeEvent> eventQueue = new ArrayList<DeltaSessionAttributeEvent>();
+ private final List<DeltaSessionAttributeEvent> eventQueue =
+ new ArrayList<DeltaSessionAttributeEvent>();
private transient GatewayDeltaEvent currentGatewayDeltaEvent;
@@ -87,12 +87,12 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
/**
* The string manager for this package.
*/
-// protected static StringManager STRING_MANAGER =
-// StringManager.getManager("org.apache.geode.modules.session.catalina");
+ // protected static StringManager STRING_MANAGER =
+ // StringManager.getManager("org.apache.geode.modules.session.catalina");
/**
- * Construct a new <code>Session</code> associated with no <code>Manager</code>. The <code>Manager</code> will be
- * assigned later using {@link #setOwner(Object)}.
+ * Construct a new <code>Session</code> associated with no <code>Manager</code>. The
+ * <code>Manager</code> will be assigned later using {@link #setOwner(Object)}.
*/
public DeltaSession7() {
super(null);
@@ -135,9 +135,8 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
sp = (Principal) BlobHelper.deserializeBlob(this.serializedPrincipal);
} catch (Exception e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(
- ": Serialized principal contains a byte[] that cannot be deserialized due to the following exception");
+ builder.append(this).append(
+ ": Serialized principal contains a byte[] that cannot be deserialized due to the following exception");
((DeltaSessionManager) getManager()).getLogger().warn(builder.toString(), e);
return null;
}
@@ -251,7 +250,8 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
}
// Create the update attribute message
- DeltaSessionAttributeEvent event = new DeltaSessionUpdateAttributeEvent(name, serializedValue);
+ DeltaSessionAttributeEvent event =
+ new DeltaSessionUpdateAttributeEvent(name, serializedValue);
queueAttributeEvent(event, true);
// Distribute the update
@@ -289,10 +289,8 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
value = BlobHelper.deserializeBlob((byte[]) value);
} catch (Exception e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Attribute named ")
- .append(name)
- .append(" contains a byte[] that cannot be deserialized due to the following exception");
+ builder.append(this).append(": Attribute named ").append(name).append(
+ " contains a byte[] that cannot be deserialized due to the following exception");
((DeltaSessionManager) getManager()).getLogger().warn(builder.toString(), e);
}
if (this.preferDeserializedForm) {
@@ -310,7 +308,7 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
public void invalidate() {
super.invalidate();
- //getOperatingRegion().destroy(this.id, true); // already done in super (remove)
+ // getOperatingRegion().destroy(this.id, true); // already done in super (remove)
((DeltaSessionManager) getManager()).getStatistics().incSessionsInvalidated();
}
@@ -344,7 +342,8 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
super.removeAttribute(name, false); // don't do notification since this is a replication
}
- public void applyAttributeEvents(Region<String, DeltaSessionInterface> region, List<DeltaSessionAttributeEvent> events) {
+ public void applyAttributeEvents(Region<String, DeltaSessionInterface> region,
+ List<DeltaSessionAttributeEvent> events) {
for (DeltaSessionAttributeEvent event : events) {
event.apply(this);
queueAttributeEvent(event, false);
@@ -368,7 +367,8 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
}
}
- private void queueAttributeEvent(DeltaSessionAttributeEvent event, boolean checkAddToCurrentGatewayDelta) {
+ private void queueAttributeEvent(DeltaSessionAttributeEvent event,
+ boolean checkAddToCurrentGatewayDelta) {
// Add to current gateway delta if necessary
if (checkAddToCurrentGatewayDelta) {
// If the manager has enabled gateway delta replication and is a P2P
@@ -382,7 +382,8 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
if (!isCommitEnabled()) {
List<DeltaSessionAttributeEvent> events = new ArrayList<DeltaSessionAttributeEvent>();
events.add(event);
- this.currentGatewayDeltaEvent = new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events);
+ this.currentGatewayDeltaEvent =
+ new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events);
}
}
}
@@ -398,8 +399,8 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
}
public void commit() {
- if (!isValidInternal()) throw new IllegalStateException("commit: Session " + getId() +
- " already invalidated");
+ if (!isValidInternal())
+ throw new IllegalStateException("commit: Session " + getId() + " already invalidated");
synchronized (this.changeLock) {
// Jens - there used to be a check to only perform this if the queue is
@@ -475,7 +476,8 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
// Add the events to the gateway delta region if necessary
if (this.enableGatewayDeltaReplication && this.applyRemotely) {
- setCurrentGatewayDeltaEvent(new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events));
+ setCurrentGatewayDeltaEvent(
+ new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events));
}
// Access it to set the last accessed time. End access it to set not new.
@@ -535,14 +537,15 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
}
}
- protected ConcurrentMap<String, Object> readInAttributes(final DataInput in) throws IOException, ClassNotFoundException {
+ protected ConcurrentMap<String, Object> readInAttributes(final DataInput in)
+ throws IOException, ClassNotFoundException {
return DataSerializer.readObject(in);
}
@Override
public int getSizeInBytes() {
int size = 0;
- for (Enumeration<String> e = getAttributeNames(); e.hasMoreElements(); ) {
+ for (Enumeration<String> e = getAttributeNames(); e.hasMoreElements();) {
// Don't use this.getAttribute() because we don't want to deserialize
// the value.
Object value = super.getAttribute(e.nextElement());
@@ -556,9 +559,10 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
@SuppressWarnings({"unchecked", "rawtypes"})
protected ConcurrentMap<String, byte[]> getSerializedAttributes() {
- // Iterate the values and serialize them if necessary before sending them to the server. This makes the application classes unnecessary on the server.
+ // Iterate the values and serialize them if necessary before sending them to the server. This
+ // makes the application classes unnecessary on the server.
ConcurrentMap<String, byte[]> serializedAttributes = new ConcurrentHashMap<String, byte[]>();
- for (Iterator i = this.attributes.entrySet().iterator(); i.hasNext(); ) {
+ for (Iterator i = this.attributes.entrySet().iterator(); i.hasNext();) {
Map.Entry<String, Object> entry = (Map.Entry<String, Object>) i.next();
Object value = entry.getValue();
byte[] serializedValue = value instanceof byte[] ? (byte[]) value : serialize(value);
@@ -573,9 +577,7 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
serializedValue = BlobHelper.serializeToBlob(obj);
} catch (IOException e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Object ")
- .append(obj)
+ builder.append(this).append(": Object ").append(obj)
.append(" cannot be serialized due to the following exception");
((DeltaSessionManager) getManager()).getLogger().warn(builder.toString(), e);
}
@@ -584,16 +586,10 @@ public class DeltaSession7 extends StandardSession implements DataSerializable,
@Override
public String toString() {
- return new StringBuilder().append("DeltaSession[")
- .append("id=")
- .append(getId())
- .append("; context=")
- .append(this.contextName)
- .append("; sessionRegionName=")
- .append(this.sessionRegionName)
- .append("; operatingRegionName=")
+ return new StringBuilder().append("DeltaSession[").append("id=").append(getId())
+ .append("; context=").append(this.contextName).append("; sessionRegionName=")
+ .append(this.sessionRegionName).append("; operatingRegionName=")
.append(getOperatingRegion() == null ? "unset" : getOperatingRegion().getFullPath())
- .append("]")
- .toString();
+ .append("]").toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/Tomcat7DeltaSessionManager.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/Tomcat7DeltaSessionManager.java b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/Tomcat7DeltaSessionManager.java
index 760b9bb..dd0dc41 100644
--- a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/Tomcat7DeltaSessionManager.java
+++ b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/Tomcat7DeltaSessionManager.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.catalina.LifecycleException;
@@ -32,10 +30,12 @@ public class Tomcat7DeltaSessionManager extends DeltaSessionManager {
protected LifecycleSupport lifecycle = new LifecycleSupport(this);
/**
- * Prepare for the beginning of active use of the public methods of this component. This method should be called
- * after <code>configure()</code>, and before any of the public methods of the component are utilized.
+ * Prepare for the beginning of active use of the public methods of this component. This method
+ * should be called after <code>configure()</code>, and before any of the public methods of the
+ * component are utilized.
*
- * @throws LifecycleException if this component detects a fatal error that prevents this component from being used
+ * @throws LifecycleException if this component detects a fatal error that prevents this component
+ * from being used
*/
@Override
public void startInternal() throws LifecycleException {
@@ -75,8 +75,8 @@ public class Tomcat7DeltaSessionManager extends DeltaSessionManager {
}
/**
- * Gracefully terminate the active use of the public methods of this component. This method should be the last one
- * called on a given instance of this component.
+ * Gracefully terminate the active use of the public methods of this component. This method should
+ * be the last one called on a given instance of this component.
*
* @throws LifecycleException if this component detects a fatal error that needs to be reported
*/
@@ -128,8 +128,8 @@ public class Tomcat7DeltaSessionManager extends DeltaSessionManager {
}
/**
- * Get the lifecycle listeners associated with this lifecycle. If this Lifecycle has no listeners registered, a
- * zero-length array is returned.
+ * Get the lifecycle listeners associated with this lifecycle. If this Lifecycle has no listeners
+ * registered, a zero-length array is returned.
*/
@Override
public LifecycleListener[] findLifecycleListeners() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java b/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
index a6e6a9e..a5f25eb 100644
--- a/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
+++ b/extensions/geode-modules-tomcat7/src/test/java/org/apache/geode/modules/session/Tomcat7SessionsJUnitTest.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession8.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession8.java b/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession8.java
index b0ca21d..b5e7d0c 100644
--- a/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession8.java
+++ b/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession8.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import java.io.DataInput;
@@ -57,7 +55,8 @@ import org.apache.geode.modules.session.catalina.internal.DeltaSessionUpdateAttr
@SuppressWarnings("serial")
-public class DeltaSession8 extends StandardSession implements DataSerializable, Delta, GatewayDelta, Sizeable, DeltaSessionInterface {
+public class DeltaSession8 extends StandardSession
+ implements DataSerializable, Delta, GatewayDelta, Sizeable, DeltaSessionInterface {
private transient Region<String, HttpSession> operatingRegion;
@@ -73,7 +72,8 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
private transient final Object changeLock = new Object();
- private final List<DeltaSessionAttributeEvent> eventQueue = new ArrayList<DeltaSessionAttributeEvent>();
+ private final List<DeltaSessionAttributeEvent> eventQueue =
+ new ArrayList<DeltaSessionAttributeEvent>();
private transient GatewayDeltaEvent currentGatewayDeltaEvent;
@@ -84,9 +84,10 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
private byte[] serializedPrincipal;
private final Log LOG = LogFactory.getLog(DeltaSession.class.getName());
+
/**
- * Construct a new <code>Session</code> associated with no <code>Manager</code>. The <code>Manager</code> will be
- * assigned later using {@link #setOwner(Object)}.
+ * Construct a new <code>Session</code> associated with no <code>Manager</code>. The
+ * <code>Manager</code> will be assigned later using {@link #setOwner(Object)}.
*/
public DeltaSession8() {
super(null);
@@ -127,12 +128,11 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
Principal sp = null;
try {
- sp = (Principal)BlobHelper.deserializeBlob(this.serializedPrincipal);
+ sp = (Principal) BlobHelper.deserializeBlob(this.serializedPrincipal);
} catch (Exception e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(
- ": Serialized principal contains a byte[] that cannot be deserialized due to the following exception");
+ builder.append(this).append(
+ ": Serialized principal contains a byte[] that cannot be deserialized due to the following exception");
((DeltaSessionManager) getManager()).getLogger().warn(builder.toString(), e);
return null;
}
@@ -245,7 +245,8 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
}
// Create the update attribute message
- DeltaSessionAttributeEvent event = new DeltaSessionUpdateAttributeEvent(name, serializedValue);
+ DeltaSessionAttributeEvent event =
+ new DeltaSessionUpdateAttributeEvent(name, serializedValue);
queueAttributeEvent(event, true);
// Distribute the update
@@ -283,10 +284,8 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
value = BlobHelper.deserializeBlob((byte[]) value);
} catch (Exception e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Attribute named ")
- .append(name)
- .append(" contains a byte[] that cannot be deserialized due to the following exception");
+ builder.append(this).append(": Attribute named ").append(name).append(
+ " contains a byte[] that cannot be deserialized due to the following exception");
((DeltaSessionManager) getManager()).getLogger().warn(builder.toString(), e);
}
if (this.preferDeserializedForm) {
@@ -304,7 +303,7 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
public void invalidate() {
super.invalidate();
- //getOperatingRegion().destroy(this.id, true); // already done in super (remove)
+ // getOperatingRegion().destroy(this.id, true); // already done in super (remove)
((DeltaSessionManager) getManager()).getStatistics().incSessionsInvalidated();
}
@@ -338,7 +337,8 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
super.removeAttribute(name, false); // don't do notification since this is a replication
}
- public void applyAttributeEvents(Region<String, DeltaSessionInterface> region, List<DeltaSessionAttributeEvent> events) {
+ public void applyAttributeEvents(Region<String, DeltaSessionInterface> region,
+ List<DeltaSessionAttributeEvent> events) {
for (DeltaSessionAttributeEvent event : events) {
event.apply(this);
queueAttributeEvent(event, false);
@@ -362,7 +362,8 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
}
}
- private void queueAttributeEvent(DeltaSessionAttributeEvent event, boolean checkAddToCurrentGatewayDelta) {
+ private void queueAttributeEvent(DeltaSessionAttributeEvent event,
+ boolean checkAddToCurrentGatewayDelta) {
// Add to current gateway delta if necessary
if (checkAddToCurrentGatewayDelta) {
// If the manager has enabled gateway delta replication and is a P2P
@@ -376,7 +377,8 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
if (!isCommitEnabled()) {
List<DeltaSessionAttributeEvent> events = new ArrayList<DeltaSessionAttributeEvent>();
events.add(event);
- this.currentGatewayDeltaEvent = new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events);
+ this.currentGatewayDeltaEvent =
+ new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events);
}
}
}
@@ -392,9 +394,9 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
}
public void commit() {
- if (!isValidInternal()) throw new IllegalStateException("commit: Session " + getId() +
- " already invalidated");
- // (STRING_MANAGER.getString("deltaSession.commit.ise", getId()));
+ if (!isValidInternal())
+ throw new IllegalStateException("commit: Session " + getId() + " already invalidated");
+ // (STRING_MANAGER.getString("deltaSession.commit.ise", getId()));
synchronized (this.changeLock) {
// Jens - there used to be a check to only perform this if the queue is
@@ -403,7 +405,7 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
DeltaSessionManager mgr = (DeltaSessionManager) this.manager;
if (this.enableGatewayDeltaReplication && mgr.isPeerToPeer()) {
setCurrentGatewayDeltaEvent(
- new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, this.eventQueue));
+ new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, this.eventQueue));
}
this.hasDelta = true;
this.applyRemotely = true;
@@ -470,7 +472,8 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
// Add the events to the gateway delta region if necessary
if (this.enableGatewayDeltaReplication && this.applyRemotely) {
- setCurrentGatewayDeltaEvent(new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events));
+ setCurrentGatewayDeltaEvent(
+ new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events));
}
// Access it to set the last accessed time. End access it to set not new.
@@ -534,7 +537,7 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
@Override
public int getSizeInBytes() {
int size = 0;
- for (Enumeration<String> e = getAttributeNames(); e.hasMoreElements(); ) {
+ for (Enumeration<String> e = getAttributeNames(); e.hasMoreElements();) {
// Don't use this.getAttribute() because we don't want to deserialize
// the value.
Object value = super.getAttribute(e.nextElement());
@@ -552,10 +555,8 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
serializedValue = BlobHelper.serializeToBlob(obj);
} catch (IOException e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Object ")
- .append(obj)
- .append(" cannot be serialized due to the following exception");
+ builder.append(this).append(": Object ").append(obj)
+ .append(" cannot be serialized due to the following exception");
((DeltaSessionManager) getManager()).getLogger().warn(builder.toString(), e);
}
return serializedValue;
@@ -563,24 +564,19 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
@Override
public String toString() {
- return new StringBuilder().append("DeltaSession[")
- .append("id=")
- .append(getId())
- .append("; context=")
- .append(this.contextName)
- .append("; sessionRegionName=")
- .append(this.sessionRegionName)
- .append("; operatingRegionName=")
- .append(getOperatingRegion() == null ? "unset" : getOperatingRegion().getFullPath())
- .append("]")
- .toString();
+ return new StringBuilder().append("DeltaSession[").append("id=").append(getId())
+ .append("; context=").append(this.contextName).append("; sessionRegionName=")
+ .append(this.sessionRegionName).append("; operatingRegionName=")
+ .append(getOperatingRegion() == null ? "unset" : getOperatingRegion().getFullPath())
+ .append("]").toString();
}
@SuppressWarnings({"unchecked", "rawtypes"})
protected ConcurrentMap<String, byte[]> getSerializedAttributes() {
- // Iterate the values and serialize them if necessary before sending them to the server. This makes the application classes unnecessary on the server.
+ // Iterate the values and serialize them if necessary before sending them to the server. This
+ // makes the application classes unnecessary on the server.
ConcurrentMap<String, byte[]> serializedAttributes = new ConcurrentHashMap<String, byte[]>();
- for (Iterator i = this.attributes.entrySet().iterator(); i.hasNext(); ) {
+ for (Iterator i = this.attributes.entrySet().iterator(); i.hasNext();) {
Map.Entry<String, Object> entry = (Map.Entry<String, Object>) i.next();
Object value = entry.getValue();
byte[] serializedValue = value instanceof byte[] ? (byte[]) value : serialize(value);
@@ -589,7 +585,8 @@ public class DeltaSession8 extends StandardSession implements DataSerializable,
return serializedAttributes;
}
- protected ConcurrentMap readInAttributes(final DataInput in) throws IOException, ClassNotFoundException {
+ protected ConcurrentMap readInAttributes(final DataInput in)
+ throws IOException, ClassNotFoundException {
return DataSerializer.readObject(in);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/Tomcat8DeltaSessionManager.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/Tomcat8DeltaSessionManager.java b/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/Tomcat8DeltaSessionManager.java
index e5aa1ac..16ea322 100644
--- a/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/Tomcat8DeltaSessionManager.java
+++ b/extensions/geode-modules-tomcat8/src/main/java/org/apache/geode/modules/session/catalina/Tomcat8DeltaSessionManager.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.catalina.Context;
@@ -27,10 +25,12 @@ import java.io.IOException;
public class Tomcat8DeltaSessionManager extends DeltaSessionManager {
/**
- * Prepare for the beginning of active use of the public methods of this component. This method should be called
- * after <code>configure()</code>, and before any of the public methods of the component are utilized.
+ * Prepare for the beginning of active use of the public methods of this component. This method
+ * should be called after <code>configure()</code>, and before any of the public methods of the
+ * component are utilized.
*
- * @throws LifecycleException if this component detects a fatal error that prevents this component from being used
+ * @throws LifecycleException if this component detects a fatal error that prevents this component
+ * from being used
*/
@Override
public void startInternal() throws LifecycleException {
@@ -70,8 +70,8 @@ public class Tomcat8DeltaSessionManager extends DeltaSessionManager {
}
/**
- * Gracefully terminate the active use of the public methods of this component. This method should be the last one
- * called on a given instance of this component.
+ * Gracefully terminate the active use of the public methods of this component. This method should
+ * be the last one called on a given instance of this component.
*
* @throws LifecycleException if this component detects a fatal error that needs to be reported
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
index 58b9df1..65dda1e 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/EmbeddedTomcat8.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
import java.io.File;
@@ -71,7 +69,8 @@ public class EmbeddedTomcat8 {
*/
private String webappDir = "";
- public EmbeddedTomcat8(String contextPath, int port, String jvmRoute) throws MalformedURLException {
+ public EmbeddedTomcat8(String contextPath, int port, String jvmRoute)
+ throws MalformedURLException {
this.contextPath = contextPath;
this.port = port;
@@ -79,7 +78,7 @@ public class EmbeddedTomcat8 {
container = new Tomcat();
container.setBaseDir(System.getProperty("user.dir") + "/tomcat");
- Host localHost = container.getHost();//("127.0.0.1", new File("").getAbsolutePath());
+ Host localHost = container.getHost();// ("127.0.0.1", new File("").getAbsolutePath());
localHost.setDeployOnStartup(true);
localHost.getCreateDirs();
@@ -87,8 +86,7 @@ public class EmbeddedTomcat8 {
new File(localHost.getAppBaseFile().getAbsolutePath()).mkdir();
new File(localHost.getCatalinaBase().getAbsolutePath(), "logs").mkdir();
rootContext = container.addContext("", localHost.getAppBaseFile().getAbsolutePath());
- }
- catch (Exception e) {
+ } catch (Exception e) {
throw new Error(e);
}
// Otherwise we get NPE when instantiating servlets
@@ -106,7 +104,7 @@ public class EmbeddedTomcat8 {
// create http connector
container.setPort(port);
- Connector httpConnector = container.getConnector();//((InetAddress) null, port, false);
+ Connector httpConnector = container.getConnector();// ((InetAddress) null, port, false);
// Create the JVMRoute valve for session failover
ValveBase valve = new JvmRouteBinderValve();
@@ -143,7 +141,8 @@ public class EmbeddedTomcat8 {
}
}
- public StandardWrapper addServlet(String path, String name, String clazz) throws ServletException {
+ public StandardWrapper addServlet(String path, String name, String clazz)
+ throws ServletException {
StandardWrapper servlet = (StandardWrapper) rootContext.createWrapper();
servlet.setName(name);
servlet.setServletClass(clazz);
@@ -153,7 +152,7 @@ public class EmbeddedTomcat8 {
rootContext.addServletMapping(path, name);
servlet.setParent(rootContext);
-// servlet.load();
+ // servlet.load();
return servlet;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
index 7e7eef3..15b3874 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/TestSessionsTomcat8Base.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
import static org.apache.geode.distributed.ConfigurationProperties.*;
@@ -41,7 +39,7 @@ import org.apache.geode.modules.session.catalina.DeltaSessionManager;
import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
+public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase {
protected static EmbeddedTomcat8 server;
@@ -73,8 +71,9 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
}
/**
- * Test callback functionality. This is here really just as an example. Callbacks are useful to implement per test
- * actions which can be defined within the actual test method instead of in a separate servlet class.
+ * Test callback functionality. This is here really just as an example. Callbacks are useful to
+ * implement per test actions which can be defined within the actual test method instead of in a
+ * separate servlet class.
*/
@Test
public void testCallback() throws Exception {
@@ -82,7 +81,8 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
PrintWriter out = response.getWriter();
out.write(helloWorld);
}
@@ -107,7 +107,8 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
HttpSession session = request.getSession();
response.getWriter().write(Boolean.toString(session.isNew()));
}
@@ -128,7 +129,8 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
}
/**
- * Check that our session persists. The values we pass in as query params are used to set attributes on the session.
+ * Check that our session persists. The values we pass in as query params are used to set
+ * attributes on the session.
*/
@Test
public void testSessionPersists1() throws Exception {
@@ -217,13 +219,14 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
}
/**
- * Test setting the session expiration via a property change as would happen under normal deployment conditions.
+ * Test setting the session expiration via a property change as would happen under normal
+ * deployment conditions.
*/
@Test
public void testSessionExpiration2() throws Exception {
// TestSessions only live for a minute
- sessionManager.propertyChange(
- new PropertyChangeEvent(server.getRootContext(), "sessionTimeout", new Integer(30), new Integer(1)));
+ sessionManager.propertyChange(new PropertyChangeEvent(server.getRootContext(), "sessionTimeout",
+ new Integer(30), new Integer(1)));
// Check that the value has been set to 60 seconds
assertEquals(60, sessionManager.getMaxInactiveInterval());
@@ -309,7 +312,8 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
}
/**
- * Test that multiple attribute updates, within the same request result in only the latest one being effective.
+ * Test that multiple attribute updates, within the same request result in only the latest one
+ * being effective.
*/
@Test
public void testMultipleAttributeUpdates() throws Exception {
@@ -317,7 +321,8 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
HttpSession session = request.getSession();
for (int i = 0; i < 1000; i++) {
session.setAttribute(key, Integer.toString(i));
@@ -346,7 +351,8 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
public void testCommitSessionValveInvalidSession() throws Exception {
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
HttpSession session = request.getSession();
session.invalidate();
response.getWriter().write("done");
@@ -372,7 +378,8 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
public void testExtraSessionsNotCreated() throws Exception {
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
// Do nothing with sessions
response.getWriter().write("done");
}
@@ -392,13 +399,15 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
}
/**
- * Test for issue #46 lastAccessedTime is not updated at the start of the request, but only at the end.
+ * Test for issue #46 lastAccessedTime is not updated at the start of the request, but only at the
+ * end.
*/
@Test
public void testLastAccessedTime() throws Exception {
Callback c = new Callback() {
@Override
- public void call(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ public void call(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
HttpSession session = request.getSession();
// Hack to expose the session to our test context
session.getServletContext().setAttribute("session", session);
@@ -426,7 +435,8 @@ public abstract class TestSessionsTomcat8Base extends JUnit4DistributedTestCase{
Long lastAccess = (Long) session.getAttribute("lastAccessTime");
assertTrue(
- "Last access time not set correctly: " + lastAccess.longValue() + " not <= " + session.getLastAccessedTime(),
- lastAccess.longValue() <= session.getLastAccessedTime());
+ "Last access time not set correctly: " + lastAccess.longValue() + " not <= "
+ + session.getLastAccessedTime(),
+ lastAccess.longValue() <= session.getLastAccessedTime());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
index 384689e..e475f40 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
import static org.apache.geode.distributed.ConfigurationProperties.*;
@@ -88,8 +86,8 @@ public class Tomcat8SessionsClientServerDUnitTest extends TestSessionsTomcat8Bas
pf.create("Pool Connecting to Cache Server");
/*
- * Can only retrieve the region once the container has started up
- * (and the cache has started too).
+ * Can only retrieve the region once the container has started up (and the cache has started
+ * too).
*/
region = sessionManager.getSessionCache().getSessionRegion();
sessionManager.getTheContext().setSessionTimeout(30);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
index d61e114..473bfe0 100644
--- a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
+++ b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsDUnitTest.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session;
import static org.apache.geode.distributed.ConfigurationProperties.*;
@@ -60,8 +58,8 @@ public class Tomcat8SessionsDUnitTest extends TestSessionsTomcat8Base {
server.startContainer();
/*
- * Can only retrieve the region once the container has started up
- * (and the cache has started too).
+ * Can only retrieve the region once the container has started up (and the cache has started
+ * too).
*/
region = sessionManager.getSessionCache().getSessionRegion();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/AbstractGatewayDeltaEvent.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/AbstractGatewayDeltaEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/AbstractGatewayDeltaEvent.java
index fabde8d..7d8c844 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/AbstractGatewayDeltaEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/AbstractGatewayDeltaEvent.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.gatewaydelta;
import org.apache.geode.DataSerializable;
@@ -31,8 +29,7 @@ public abstract class AbstractGatewayDeltaEvent implements GatewayDeltaEvent, Da
protected String regionName;
protected String key;
- public AbstractGatewayDeltaEvent() {
- }
+ public AbstractGatewayDeltaEvent() {}
public AbstractGatewayDeltaEvent(String regionName, String key) {
this.regionName = regionName;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDelta.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDelta.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDelta.java
index 7a3ff8e..92cde0a 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDelta.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDelta.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.gatewaydelta;
public interface GatewayDelta {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaCreateEvent.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaCreateEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaCreateEvent.java
index 3782ef5..ba9ba3f 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaCreateEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaCreateEvent.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.gatewaydelta;
import org.apache.geode.DataSerializable;
@@ -33,8 +31,7 @@ public class GatewayDeltaCreateEvent extends AbstractGatewayDeltaEvent {
private byte[] gatewayDelta;
- public GatewayDeltaCreateEvent() {
- }
+ public GatewayDeltaCreateEvent() {}
public GatewayDeltaCreateEvent(String regionName, String key, byte[] gatewayDelta) {
super(regionName, key);
@@ -74,15 +71,9 @@ public class GatewayDeltaCreateEvent extends AbstractGatewayDeltaEvent {
}
public String toString() {
- return new StringBuilder().append("GatewayDeltaCreateEvent[")
- .append("regionName=")
- .append(this.regionName)
- .append("; key=")
- .append(this.key)
- .append("; gatewayDelta=")
- .append(this.gatewayDelta)
- .append("]")
- .toString();
+ return new StringBuilder().append("GatewayDeltaCreateEvent[").append("regionName=")
+ .append(this.regionName).append("; key=").append(this.key).append("; gatewayDelta=")
+ .append(this.gatewayDelta).append("]").toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaDestroyEvent.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaDestroyEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaDestroyEvent.java
index 96d9b6c..5b8d823 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaDestroyEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaDestroyEvent.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.gatewaydelta;
import org.apache.geode.DataSerializable;
@@ -30,8 +28,7 @@ import java.io.IOException;
@SuppressWarnings("serial")
public class GatewayDeltaDestroyEvent extends AbstractGatewayDeltaEvent {
- public GatewayDeltaDestroyEvent() {
- }
+ public GatewayDeltaDestroyEvent() {}
public GatewayDeltaDestroyEvent(String regionName, String key) {
super(regionName, key);
@@ -70,13 +67,8 @@ public class GatewayDeltaDestroyEvent extends AbstractGatewayDeltaEvent {
}
public String toString() {
- return new StringBuilder().append("GatewayDeltaDestroyEvent[")
- .append("regionName=")
- .append(this.regionName)
- .append("; key=")
- .append(this.key)
- .append("]")
- .toString();
+ return new StringBuilder().append("GatewayDeltaDestroyEvent[").append("regionName=")
+ .append(this.regionName).append("; key=").append(this.key).append("]").toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEvent.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEvent.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEvent.java
index 1da0a9c..d54e90b 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEvent.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEvent.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.gatewaydelta;
import org.apache.geode.cache.Cache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEventApplicationCacheListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEventApplicationCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEventApplicationCacheListener.java
index ca58dde..33bbf3b 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEventApplicationCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaEventApplicationCacheListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.gatewaydelta;
import org.apache.geode.cache.Cache;
@@ -26,7 +24,8 @@ import org.apache.geode.internal.cache.wan.GatewaySenderEventCallbackArgument;
import java.util.Properties;
-public class GatewayDeltaEventApplicationCacheListener extends CacheListenerAdapter<String, GatewayDeltaEvent> implements Declarable {
+public class GatewayDeltaEventApplicationCacheListener
+ extends CacheListenerAdapter<String, GatewayDeltaEvent> implements Declarable {
private final Cache cache;
@@ -39,11 +38,8 @@ public class GatewayDeltaEventApplicationCacheListener extends CacheListenerAdap
EntryEventImpl eventImpl = (EntryEventImpl) event;
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
- builder.append("GatewayDeltaApplierCacheListener: Received event for ")
- .append(event.getKey())
- .append("->")
- .append(event.getNewValue())
- .append(".");
+ builder.append("GatewayDeltaApplierCacheListener: Received event for ").append(event.getKey())
+ .append("->").append(event.getNewValue()).append(".");
this.cache.getLogger().fine(builder.toString());
}
@@ -62,6 +58,5 @@ public class GatewayDeltaEventApplicationCacheListener extends CacheListenerAdap
}
}
- public void init(Properties p) {
- }
+ public void init(Properties p) {}
}
[81/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
GEODE-2014: Upgrade Swagger libraries
* Updated gradle exclusions to remove items no longer used.
* Updated distribution LICENSE file
* Corrected LICENSE file as jquery-ui is still used in pulse, updated version
* Updated rat configuration.
* This closes #271
(cherry picked from commit a6018ab)
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ee0666a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ee0666a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ee0666a3
Branch: refs/heads/feature/GEM-983
Commit: ee0666a3ca5a8807648eb44f0c844c8aefde01fe
Parents: 1d9a4ed
Author: Kevin Duling <kd...@pivotal.io>
Authored: Tue Oct 25 15:52:56 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Oct 26 09:30:04 2016 -0700
----------------------------------------------------------------------
LICENSE | 5 +--
geode-assembly/src/main/dist/LICENSE | 40 ++--------------------
geode-web-api/src/main/webapp/docs/index.html | 13 +++++++
gradle/rat.gradle | 19 ----------
4 files changed, 16 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ee0666a3/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 3f777c7..231239b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -346,11 +346,8 @@ Apache Geode bundles the following files under the MIT license:
- jQuery UI MultiSelect Widget v1.14pre
(http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/),
Copyright (c) 2011 Eric Hynds
- - jQuery UI v1.8.18 (http://jqueryui.com/about), Copyright (c) jQuery
+ - jQuery UI v1.10.2 (http://jqueryui.com/about), Copyright (c) jQuery
Foundation and other contributors, http://jquery.org
- - jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle),
- Copyright (c) 2011 Wilhelm Murdoch <wi...@gmail.com>,
- TheDrunkenEpic <http://www.thedrunkenepic.com>
- jScrollPane (http://jscrollpane.kelvinluck.com/), Copyright (c) 2010
Kelvin Luck
- matchMedia() polyfill (https://github.com/paulirish/matchMedia.js),
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ee0666a3/geode-assembly/src/main/dist/LICENSE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/LICENSE b/geode-assembly/src/main/dist/LICENSE
index 04ce74c..92e95b3 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -221,8 +221,6 @@ Apache Geode bundles the following files under the BSD 3-Clause License:
Copyright (c) 2002-2007 Marc Prud'hommeaux.
- Antlr v2.7.7 (http://www.antlr.org), Copyright (c) 2012 Terrence Parr
and Sam Harwell
- - highlight.js v7.3 (https://highlightjs.org), Copyright (c) 2006, Ivan
- Sagalaev
- JLine v2.12 (http://jline.sourceforge.net), Copyright (c) 2002-2006,
Marc Prud'hommeaux <mw...@cornell.edu>
- jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/),
@@ -597,26 +595,6 @@ Federal Courts of the Northern District of California and the state courts
of the State of California, with venue lying in Santa Clara County,
California.
----------------------------------------------------------------------------
-The ISC License (http://opensource.org/licenses/ISC)
----------------------------------------------------------------------------
-
-Apache Geode bundles the following file under the ISC license:
-
- - Shred (https://github.com/pandastrike/shred), Copyright (c) 2012-2015
- Panda Strike, LLC and Dan Yoder <da...@pandastrike.com>
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---------------------------------------------------------------------------
The JSON License (http://www.json.org/license.html)
@@ -653,16 +631,12 @@ The MIT License (http://opensource.org/licenses/mit-license.html)
Apache Geode bundles the following files under the MIT license:
- - Backbone.js v0.9.2 (http://backbonejs.org), Copyright (c) 2010-2012
- Jeremy Ashkenas, DocumentCloud Inc.
- Bootflat v1.0.1 (http://bootflat.github.io/), Copyright (c) 2014
bootflat
- Bootstrap v3.0.0 (http://getbootstrap.com/), Copyright (c) 2011-2016
Twitter, Inc.
- Font Awesome v4.0.3 (code files) (http://fontawesome.io), Copyright (c)
Dave Gandy
- - Handlebars v1.0.0 (http://handlebarsjs.com), Copyright (c) 2011, Yehuda
- Katz
- HeadJS v0.96 (http://headjs.com/), Copyright (c) 2013 Tero Piirainen
(tipiirai)
- HTML5 Shiv v3.6.2pre (https://github.com/aFarkas/html5shiv), Copyright
@@ -673,10 +647,8 @@ Apache Geode bundles the following files under the MIT license:
Copyright (c) 2011 Sencha Inc.
- JOpt Simple (http://pholser.github.io/jopt-simple/), Copyright (c)
2004-2015 Paul R. Holser, Jr.
- - jQuery JavaScript Library v1.7.2, v1.8.0 (https://jquery.com), Copyright (c)
+ - jQuery JavaScript Library v1.7.2 (https://jquery.com), Copyright (c)
jQuery Foundation and other contributors, http://jquery.org
- - jQuery BBQ v1.2.1 (http://benalman.com/projects/jquery-bbq-plugin/),
- Copyright (c) 2010, "Cowboy" Ben Alman
- jQuery.i18n.properties v1.0.x
(https://github.com/jquery-i18n-properties/jquery-i18n-properties),
Copyright (c) 2011 Nuno Miguel Correia Serra Fernandes
@@ -687,16 +659,11 @@ Apache Geode bundles the following files under the MIT license:
Brandon Aaron
- jQuery Placeholder (http://webcloud.se), Copyright (c) 2010 Daniel
Stocks
- - jQuery-slideto (https://github.com/Sleavely/jQuery-slideto), Copyright
- (c) 2015 Joakim Hedlund
- jQuery UI MultiSelect Widget v1.14pre
(http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/),
Copyright (c) 2011 Eric Hynds
- - jQuery UI v1.8.18 (http://jqueryui.com/about), Copyright (c) jQuery
+ - jQuery UI v1.10.2 (http://jqueryui.com/about), Copyright (c) jQuery
Foundation and other contributors, http://jquery.org
- - jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle),
- Copyright (c) 2011 Wilhelm Murdoch <wi...@gmail.com>,
- TheDrunkenEpic <http://www.thedrunkenepic.com>
- jScrollPane (http://jscrollpane.kelvinluck.com/), Copyright (c) 2010
Kelvin Luck
- matchMedia() polyfill (https://github.com/paulirish/matchMedia.js),
@@ -716,8 +683,6 @@ Apache Geode bundles the following files under the MIT license:
contributors
- Timeago v1.3.0 (http://timeago.yarp.com), Copyright (c) 2008-2015 Ryan
McGeary
- - Underscore (http://underscorejs.org), Copyright (c) 2009-2016 Jeremy
- Ashkenas, DocumentCloud, and Investigative Reporters & Editors
- zTree v3.5.02 (http://zTree.me/), Copyright (c) 2010 Hunter.z
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -803,7 +768,6 @@ domain:
- AOP Alliance v1.0 (http://aopalliance.sourceforge.net)
- CompactConcurrentHashSet2, derived from JSR-166 ConcurrentHashMap v1.43
(http://gee.cs.oswego.edu/dl/concurrency-interest).
- - Reset CSS (http://meyerweb.com/eric/tools/css/reset/)
- tooltip.js v1.2.6 (https://github.com/jquerytools/jquerytools)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ee0666a3/geode-web-api/src/main/webapp/docs/index.html
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/index.html b/geode-web-api/src/main/webapp/docs/index.html
index 021fbc2..99089b4 100644
--- a/geode-web-api/src/main/webapp/docs/index.html
+++ b/geode-web-api/src/main/webapp/docs/index.html
@@ -1 +1,14 @@
+<!-- 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. -->
+
<meta http-equiv="refresh" content="0; URL='/geode/swagger-ui.html'"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ee0666a3/gradle/rat.gradle
----------------------------------------------------------------------
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 990ff63..e9fc70f 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -154,7 +154,6 @@ rat {
// --- Other Licenses ---
// Public Domain http://meyerweb.com/eric/tools/css/reset/
- 'geode-web-api/src/main/webapp/docs/css/reset.css',
'geode-pulse/src/main/webapp/scripts/lib/tooltip.js',
// JSON License - permissive, used for Good, not Evil
@@ -178,12 +177,6 @@ rat {
'geode-json/src/main/java/org/json/XMLTokener.java',
// MIT License
- 'geode-web-api/src/main/webapp/docs/lib/backbone-min.js',
- 'geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js',
- 'geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js',
- 'geode-web-api/src/main/webapp/docs/lib/jquery.slideto.min.js',
- 'geode-web-api/src/main/webapp/docs/lib/jquery.wiggle.min.js',
- 'geode-web-api/src/main/webapp/docs/lib/underscore-min.js',
'geode-site/src/jbake/**',
'geode-pulse/src/main/webapp/scripts/lib/jquery.jqGrid.src.js',
'geode-pulse/src/main/webapp/scripts/lib/grid.locale-en.js',
@@ -209,23 +202,11 @@ rat {
'geode-pulse/src/main/webapp/css/jquery.ztreestyle.css',
'geode-pulse/src/main/webapp/css/jquery-ui.css',
- // MIT or ISC
- 'geode-web-api/src/main/webapp/docs/lib/shred.bundle.js',
- 'geode-web-api/src/main/webapp/docs/lib/shred/content.js',
-
// BSD License
- 'geode-web-api/src/main/webapp/docs/lib/highlight.7.3.pack.js',
'geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/jline/ANSIBuffer.java',
'geode-pulse/src/main/webapp/scripts/lib/jquery.sparkline.js',
// Apache License
- 'geode-web-api/src/main/webapp/docs/o2c.html',
- 'geode-web-api/src/main/webapp/docs/index.html',
- 'geode-web-api/src/main/webapp/docs/lib/swagger-oauth.js',
- 'geode-web-api/src/main/webapp/docs/lib/swagger.js',
- 'geode-web-api/src/main/webapp/docs/css/screen.css',
- 'geode-web-api/src/main/webapp/docs/swagger-ui.js',
- 'geode-web-api/src/main/webapp/docs/swagger-ui.min.js',
'geode-pulse/src/main/webapp/scripts/multiselect/prettify.js',
// MX4J License
[52/98] [abbrv] incubator-geode git commit: GEODE-2011 Client code
which clears pdx registry needs synchronization
Posted by ds...@apache.org.
GEODE-2011 Client code which clears pdx registry needs synchronization
We clear pdx registry in client when we re-connect to cluster. But
during that time other thread may end up using old registry while other
thread is clearing this. Thus we need to synchronize that. In current
code it happens through listener events and I modified that notification
to synchronize this.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6eb0fd39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6eb0fd39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6eb0fd39
Branch: refs/heads/feature/GEM-983
Commit: 6eb0fd398e9bff7798939df6781aa52979ef9693
Parents: 8bf3957
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Fri Oct 21 15:52:00 2016 -0700
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Fri Oct 21 15:52:00 2016 -0700
----------------------------------------------------------------------
.../cache/client/internal/EndpointManagerImpl.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6eb0fd39/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
index f594278..ec8a818 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
@@ -77,6 +77,7 @@ public class EndpointManagerImpl implements EndpointManager {
Map<ServerLocation, Endpoint> endpointMapTemp =
new HashMap<ServerLocation, Endpoint>(endpointMap);
endpoint = new Endpoint(this, ds, server, stats, memberId);
+ listener.clearPdxRegistry(endpoint);
endpointMapTemp.put(server, endpoint);
endpointMap = Collections.unmodifiableMap(endpointMapTemp);
addedEndpoint = true;
@@ -291,9 +292,21 @@ public class EndpointManagerImpl implements EndpointManager {
// logger.warn("HIGHUP:JOIN:"+endpoint.getLocation());
for (Iterator<EndpointListener> itr = endpointListeners.iterator(); itr.hasNext();) {
EndpointManager.EndpointListener listener = itr.next();
- listener.endpointNowInUse(endpoint);
+ if (!(listener instanceof PdxRegistryRecoveryListener)) {
+ listener.endpointNowInUse(endpoint);
+ }
+ }
+ }
+
+ public void clearPdxRegistry(Endpoint endpoint) {
+ for (Iterator<EndpointListener> itr = endpointListeners.iterator(); itr.hasNext();) {
+ EndpointManager.EndpointListener listener = itr.next();
+ if (listener instanceof PdxRegistryRecoveryListener) {
+ listener.endpointNowInUse(endpoint);
+ }
}
}
+
}
[40/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
index 7d280c9..8ac5dd5 100755
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
@@ -1,18 +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
+ * 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.management.internal.cli.commands;
@@ -44,8 +42,8 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.test.junit.categories.UnitTest;
/**
- * The LauncherLifecycleCommandsJUnitTest class is a test suite of test cases testing the contract and functionality of
- * the lifecycle launcher GemFire shell (Gfsh) commands.
+ * The LauncherLifecycleCommandsJUnitTest class is a test suite of test cases testing the contract
+ * and functionality of the lifecycle launcher GemFire shell (Gfsh) commands.
*
* @see org.apache.geode.management.internal.cli.commands.LauncherLifecycleCommands
* @see org.junit.Assert
@@ -86,7 +84,8 @@ public class LauncherLifecycleCommandsJUnitTest {
assertTrue(commandLine.isEmpty());
- getLauncherLifecycleCommands().addGemFirePropertyFile(commandLine, "/path/to/gemfire.properties");
+ getLauncherLifecycleCommands().addGemFirePropertyFile(commandLine,
+ "/path/to/gemfire.properties");
assertFalse(commandLine.isEmpty());
assertTrue(commandLine.contains("-DgemfirePropertyFile=/path/to/gemfire.properties"));
@@ -119,10 +118,12 @@ public class LauncherLifecycleCommandsJUnitTest {
final String propertyValue = gemfireProperties.getProperty(propertyName);
if (StringUtils.isBlank(propertyValue)) {
for (final String systemProperty : commandLine) {
- assertFalse(systemProperty.startsWith("-D" + DistributionConfig.GEMFIRE_PREFIX + "".concat(propertyName).concat("=")));
+ assertFalse(systemProperty.startsWith(
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "".concat(propertyName).concat("=")));
}
} else {
- assertTrue(commandLine.contains("-D" + DistributionConfig.GEMFIRE_PREFIX + "".concat(propertyName).concat("=").concat(propertyValue)));
+ assertTrue(commandLine.contains("-D" + DistributionConfig.GEMFIRE_PREFIX
+ + "".concat(propertyName).concat("=").concat(propertyValue)));
}
}
}
@@ -147,7 +148,7 @@ public class LauncherLifecycleCommandsJUnitTest {
gemfireProperties.setProperty(NAME, "machine");
gemfireProperties.setProperty(START_DEV_REST_API, "true");
- gemfireProperties.setProperty(HTTP_SERVICE_PORT, "8080");
+ gemfireProperties.setProperty(HTTP_SERVICE_PORT, "8080");
gemfireProperties.setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
@@ -160,10 +161,12 @@ public class LauncherLifecycleCommandsJUnitTest {
final String propertyValue = gemfireProperties.getProperty(propertyName);
if (StringUtils.isBlank(propertyValue)) {
for (final String systemProperty : commandLine) {
- assertFalse(systemProperty.startsWith("-D" + DistributionConfig.GEMFIRE_PREFIX + "".concat(propertyName).concat("=")));
+ assertFalse(systemProperty.startsWith(
+ "-D" + DistributionConfig.GEMFIRE_PREFIX + "".concat(propertyName).concat("=")));
}
} else {
- assertTrue(commandLine.contains("-D" + DistributionConfig.GEMFIRE_PREFIX + "".concat(propertyName).concat("=").concat(propertyValue)));
+ assertTrue(commandLine.contains("-D" + DistributionConfig.GEMFIRE_PREFIX
+ + "".concat(propertyName).concat("=").concat(propertyValue)));
}
}
}
@@ -202,12 +205,12 @@ public class LauncherLifecycleCommandsJUnitTest {
assertTrue(commandLine.isEmpty());
- getLauncherLifecycleCommands().addJvmArgumentsAndOptions(commandLine, new String[]{});
+ getLauncherLifecycleCommands().addJvmArgumentsAndOptions(commandLine, new String[] {});
assertTrue(commandLine.isEmpty());
getLauncherLifecycleCommands().addJvmArgumentsAndOptions(commandLine,
- new String[]{"-DmyProp=myVal", "-d64", "-server", "-Xprof"});
+ new String[] {"-DmyProp=myVal", "-d64", "-server", "-Xprof"});
assertFalse(commandLine.isEmpty());
assertEquals(4, commandLine.size());
@@ -265,8 +268,8 @@ public class LauncherLifecycleCommandsJUnitTest {
assertEquals(3, commandLine.size());
assertEquals("-Xmx1024M", commandLine.get(0));
assertEquals("-XX:+UseConcMarkSweepGC", commandLine.get(1));
- assertEquals("-XX:CMSInitiatingOccupancyFraction=" + LauncherLifecycleCommands.CMS_INITIAL_OCCUPANCY_FRACTION,
- commandLine.get(2));
+ assertEquals("-XX:CMSInitiatingOccupancyFraction="
+ + LauncherLifecycleCommands.CMS_INITIAL_OCCUPANCY_FRACTION, commandLine.get(2));
}
@Test(expected = AssertionError.class)
@@ -274,7 +277,8 @@ public class LauncherLifecycleCommandsJUnitTest {
try {
getLauncherLifecycleCommands().readPid(null);
} catch (AssertionError expected) {
- assertEquals("The file from which to read the process ID (pid) cannot be null!", expected.getMessage());
+ assertEquals("The file from which to read the process ID (pid) cannot be null!",
+ expected.getMessage());
throw expected;
}
}
@@ -282,28 +286,32 @@ public class LauncherLifecycleCommandsJUnitTest {
@Test
@SuppressWarnings("deprecation")
public void testGetClasspath() {
- assertEquals(System.getProperty("java.class.path"), getLauncherLifecycleCommands().getClasspath(null));
+ assertEquals(System.getProperty("java.class.path"),
+ getLauncherLifecycleCommands().getClasspath(null));
}
@Test
@SuppressWarnings("deprecation")
public void testGetClasspathWithUserDefinedClasspath() {
- assertEquals(System.getProperty("java.class.path") + File.pathSeparator + "/path/to/user/classes",
+ assertEquals(
+ System.getProperty("java.class.path") + File.pathSeparator + "/path/to/user/classes",
getLauncherLifecycleCommands().getClasspath("/path/to/user/classes"));
}
@Test
public void testGetSystemClasspath() {
- assertEquals(System.getProperty("java.class.path"), getLauncherLifecycleCommands().getSystemClasspath());
+ assertEquals(System.getProperty("java.class.path"),
+ getLauncherLifecycleCommands().getSystemClasspath());
}
@Test
public void testLocatorClasspathOrder() {
String userClasspath = "/path/to/user/lib/app.jar:/path/to/user/classes";
- String expectedClasspath = launcherCommands.getGemFireJarPath().concat(File.pathSeparator).concat(
- userClasspath).concat(File.pathSeparator).concat(System.getProperty("java.class.path")).concat(
- File.pathSeparator).concat(LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME);
+ String expectedClasspath = launcherCommands.getGemFireJarPath().concat(File.pathSeparator)
+ .concat(userClasspath).concat(File.pathSeparator)
+ .concat(System.getProperty("java.class.path")).concat(File.pathSeparator)
+ .concat(LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME);
String actualClasspath = launcherCommands.getLocatorClasspath(true, userClasspath);
@@ -314,9 +322,9 @@ public class LauncherLifecycleCommandsJUnitTest {
public void testServerClasspathOrder() {
String userClasspath = "/path/to/user/lib/app.jar:/path/to/user/classes";
- String expectedClasspath = launcherCommands.getGemFireJarPath().concat(File.pathSeparator).concat(
- userClasspath).concat(File.pathSeparator).concat(
- LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME);
+ String expectedClasspath = launcherCommands.getGemFireJarPath().concat(File.pathSeparator)
+ .concat(userClasspath).concat(File.pathSeparator)
+ .concat(LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME);
String actualClasspath = launcherCommands.getServerClasspath(false, userClasspath);
@@ -328,31 +336,35 @@ public class LauncherLifecycleCommandsJUnitTest {
final boolean EXCLUDE_SYSTEM_CLASSPATH = false;
final boolean INCLUDE_SYSTEM_CLASSPATH = true;
- String[] jarFilePathnames = {"/path/to/user/libs/A.jar", "/path/to/user/libs/B.jar", "/path/to/user/libs/C.jar"};
+ String[] jarFilePathnames =
+ {"/path/to/user/libs/A.jar", "/path/to/user/libs/B.jar", "/path/to/user/libs/C.jar"};
- String[] userClasspaths = {"/path/to/classes:/path/to/libs/1.jar:/path/to/libs/2.jar", "/path/to/ext/libs/1.jar:/path/to/ext/classes:/path/to/ext/lib/10.jar"};
+ String[] userClasspaths = {"/path/to/classes:/path/to/libs/1.jar:/path/to/libs/2.jar",
+ "/path/to/ext/libs/1.jar:/path/to/ext/classes:/path/to/ext/lib/10.jar"};
- String expectedClasspath = LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME.concat(File.pathSeparator).concat(
- toClasspath(userClasspaths)).concat(File.pathSeparator).concat(toClasspath(jarFilePathnames));
+ String expectedClasspath = LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME
+ .concat(File.pathSeparator).concat(toClasspath(userClasspaths)).concat(File.pathSeparator)
+ .concat(toClasspath(jarFilePathnames));
- assertEquals(expectedClasspath,
- getLauncherLifecycleCommands().toClasspath(EXCLUDE_SYSTEM_CLASSPATH, jarFilePathnames, userClasspaths));
+ assertEquals(expectedClasspath, getLauncherLifecycleCommands()
+ .toClasspath(EXCLUDE_SYSTEM_CLASSPATH, jarFilePathnames, userClasspaths));
- expectedClasspath = LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME.concat(File.pathSeparator).concat(
- toClasspath(userClasspaths)).concat(File.pathSeparator).concat(System.getProperty("java.class.path")).concat(
- File.pathSeparator).concat(toClasspath(jarFilePathnames));
+ expectedClasspath = LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME.concat(File.pathSeparator)
+ .concat(toClasspath(userClasspaths)).concat(File.pathSeparator)
+ .concat(System.getProperty("java.class.path")).concat(File.pathSeparator)
+ .concat(toClasspath(jarFilePathnames));
- assertEquals(expectedClasspath,
- getLauncherLifecycleCommands().toClasspath(INCLUDE_SYSTEM_CLASSPATH, jarFilePathnames, userClasspaths));
+ assertEquals(expectedClasspath, getLauncherLifecycleCommands()
+ .toClasspath(INCLUDE_SYSTEM_CLASSPATH, jarFilePathnames, userClasspaths));
- expectedClasspath = LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME.concat(File.pathSeparator).concat(
- System.getProperty("java.class.path"));
+ expectedClasspath = LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME.concat(File.pathSeparator)
+ .concat(System.getProperty("java.class.path"));
- assertEquals(expectedClasspath,
- getLauncherLifecycleCommands().toClasspath(INCLUDE_SYSTEM_CLASSPATH, null, (String[]) null));
+ assertEquals(expectedClasspath, getLauncherLifecycleCommands()
+ .toClasspath(INCLUDE_SYSTEM_CLASSPATH, null, (String[]) null));
- assertEquals(LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME,
- getLauncherLifecycleCommands().toClasspath(EXCLUDE_SYSTEM_CLASSPATH, null, (String[]) null));
+ assertEquals(LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME, getLauncherLifecycleCommands()
+ .toClasspath(EXCLUDE_SYSTEM_CLASSPATH, null, (String[]) null));
assertEquals(LauncherLifecycleCommands.GEMFIRE_JAR_PATHNAME,
getLauncherLifecycleCommands().toClasspath(EXCLUDE_SYSTEM_CLASSPATH, new String[0], ""));
@@ -361,16 +373,19 @@ public class LauncherLifecycleCommandsJUnitTest {
@Test
public void testToClassPathOrder() {
String userClasspathOne = "/path/to/user/lib/a.jar:/path/to/user/classes";
- String userClasspathTwo = "/path/to/user/lib/x.jar:/path/to/user/lib/y.jar:/path/to/user/lib/z.jar";
+ String userClasspathTwo =
+ "/path/to/user/lib/x.jar:/path/to/user/lib/y.jar:/path/to/user/lib/z.jar";
- String expectedClasspath = launcherCommands.getGemFireJarPath().concat(File.pathSeparator).concat(
- userClasspathOne).concat(File.pathSeparator).concat(userClasspathTwo).concat(File.pathSeparator).concat(
- System.getProperty("java.class.path")).concat(File.pathSeparator).concat(
- LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME).concat(File.pathSeparator).concat(
- LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME);
+ String expectedClasspath = launcherCommands.getGemFireJarPath().concat(File.pathSeparator)
+ .concat(userClasspathOne).concat(File.pathSeparator).concat(userClasspathTwo)
+ .concat(File.pathSeparator).concat(System.getProperty("java.class.path"))
+ .concat(File.pathSeparator).concat(LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME)
+ .concat(File.pathSeparator)
+ .concat(LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME);
String actualClasspath = launcherCommands.toClasspath(true,
- new String[]{LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME, LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME},
+ new String[] {LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME,
+ LauncherLifecycleCommands.CORE_DEPENDENCIES_JAR_PATHNAME},
userClasspathOne, userClasspathTwo);
assertEquals(expectedClasspath, actualClasspath);
@@ -378,18 +393,18 @@ public class LauncherLifecycleCommandsJUnitTest {
@Test
public void testGetJavaPathname() {
- assertEquals(IOUtils.appendToPath(System.getProperty("java.home"), "bin",
- "java" + LauncherLifecycleCommands.getExecutableSuffix()),
- getLauncherLifecycleCommands().getJdkToolPathname("java" + LauncherLifecycleCommands.getExecutableSuffix(),
- new GemFireException() {
- }));
+ assertEquals(
+ IOUtils.appendToPath(System.getProperty("java.home"), "bin",
+ "java" + LauncherLifecycleCommands.getExecutableSuffix()),
+ getLauncherLifecycleCommands().getJdkToolPathname(
+ "java" + LauncherLifecycleCommands.getExecutableSuffix(), new GemFireException() {}));
}
@Test(expected = NullPointerException.class)
public void testGetJdkToolPathnameWithNullPathnames() {
try {
- getLauncherLifecycleCommands().getJdkToolPathname((Stack<String>) null, new GemFireException() {
- });
+ getLauncherLifecycleCommands().getJdkToolPathname((Stack<String>) null,
+ new GemFireException() {});
} catch (NullPointerException expected) {
assertEquals("The JDK tool executable pathnames cannot be null!", expected.getMessage());
throw expected;
@@ -451,22 +466,23 @@ public class LauncherLifecycleCommandsJUnitTest {
try {
System.err.println(getLauncherLifecycleCommands().getJmxServiceUrlAsString("memberOne[]"));
} catch (IllegalArgumentException expected) {
- assertEquals(CliStrings.START_JCONSOLE__CONNECT_BY_MEMBER_NAME_ID_ERROR_MESSAGE, expected.getMessage());
+ assertEquals(CliStrings.START_JCONSOLE__CONNECT_BY_MEMBER_NAME_ID_ERROR_MESSAGE,
+ expected.getMessage());
throw expected;
}
}
@Test
public void testCreateServerCommandLine() throws Exception {
- ServerLauncher serverLauncher = new ServerLauncher.Builder().setCommand(
- ServerLauncher.Command.START).setDisableDefaultServer(true).setMemberName(
- "testCreateServerCommandLine").setRebalance(true)
- //.setServerBindAddress("localhost")
+ ServerLauncher serverLauncher = new ServerLauncher.Builder()
+ .setCommand(ServerLauncher.Command.START).setDisableDefaultServer(true)
+ .setMemberName("testCreateServerCommandLine").setRebalance(true)
+ // .setServerBindAddress("localhost")
.setServerPort(41214).setCriticalHeapPercentage(95.5f).setEvictionHeapPercentage(85.0f)
- .setSocketBufferSize(1024*1024).setMessageTimeToLive(93).build();
+ .setSocketBufferSize(1024 * 1024).setMessageTimeToLive(93).build();
- String[] commandLineElements = launcherCommands.createStartServerCommandLine(serverLauncher, null, null,
- new Properties(), null, false, new String[0], false, null, null);
+ String[] commandLineElements = launcherCommands.createStartServerCommandLine(serverLauncher,
+ null, null, new Properties(), null, false, new String[0], false, null, null);
assertNotNull(commandLineElements);
assertTrue(commandLineElements.length > 0);
@@ -477,14 +493,18 @@ public class LauncherLifecycleCommandsJUnitTest {
expectedCommandLineElements.add("--disable-default-server");
expectedCommandLineElements.add(serverLauncher.getMemberName().toLowerCase());
expectedCommandLineElements.add("--rebalance");
- //expectedCommandLineElements.add(String.format("--server-bind-address=%1$s", serverLauncher.getServerBindAddress().getHostName()));
- expectedCommandLineElements.add(String.format("--server-port=%1$d", serverLauncher.getServerPort()));
- expectedCommandLineElements.add(
- String.format("--critical-heap-percentage=%1$s", serverLauncher.getCriticalHeapPercentage()));
- expectedCommandLineElements.add(
- String.format("--eviction-heap-percentage=%1$s", serverLauncher.getEvictionHeapPercentage()));
- expectedCommandLineElements.add(String.format("--socket-buffer-size=%1$d", serverLauncher.getSocketBufferSize()));
- expectedCommandLineElements.add(String.format("--message-time-to-live=%1$d", serverLauncher.getMessageTimeToLive()));
+ // expectedCommandLineElements.add(String.format("--server-bind-address=%1$s",
+ // serverLauncher.getServerBindAddress().getHostName()));
+ expectedCommandLineElements
+ .add(String.format("--server-port=%1$d", serverLauncher.getServerPort()));
+ expectedCommandLineElements.add(String.format("--critical-heap-percentage=%1$s",
+ serverLauncher.getCriticalHeapPercentage()));
+ expectedCommandLineElements.add(String.format("--eviction-heap-percentage=%1$s",
+ serverLauncher.getEvictionHeapPercentage()));
+ expectedCommandLineElements
+ .add(String.format("--socket-buffer-size=%1$d", serverLauncher.getSocketBufferSize()));
+ expectedCommandLineElements
+ .add(String.format("--message-time-to-live=%1$d", serverLauncher.getMessageTimeToLive()));
for (String commandLineElement : commandLineElements) {
expectedCommandLineElements.remove(commandLineElement.toLowerCase());
@@ -496,20 +516,21 @@ public class LauncherLifecycleCommandsJUnitTest {
@Test
public void testCreateServerCommandLineWithRestAPI() throws Exception {
- ServerLauncher serverLauncher = new ServerLauncher.Builder().setCommand(
- ServerLauncher.Command.START).setDisableDefaultServer(true).setMemberName(
- "testCreateServerCommandLine").setRebalance(true)
- //.setServerBindAddress("localhost")
- .setServerPort(41214).setCriticalHeapPercentage(95.5f).setEvictionHeapPercentage(85.0f).build();
+ ServerLauncher serverLauncher = new ServerLauncher.Builder()
+ .setCommand(ServerLauncher.Command.START).setDisableDefaultServer(true)
+ .setMemberName("testCreateServerCommandLine").setRebalance(true)
+ // .setServerBindAddress("localhost")
+ .setServerPort(41214).setCriticalHeapPercentage(95.5f).setEvictionHeapPercentage(85.0f)
+ .build();
Properties gemfireProperties = new Properties();
gemfireProperties.setProperty(START_DEV_REST_API, "true");
- gemfireProperties.setProperty(HTTP_SERVICE_PORT, "8080");
- gemfireProperties.setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
+ gemfireProperties.setProperty(HTTP_SERVICE_PORT, "8080");
+ gemfireProperties.setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
- String[] commandLineElements = launcherCommands.createStartServerCommandLine(serverLauncher, null, null,
- gemfireProperties, null, false, new String[0], false, null, null);
+ String[] commandLineElements = launcherCommands.createStartServerCommandLine(serverLauncher,
+ null, null, gemfireProperties, null, false, new String[0], false, null, null);
assertNotNull(commandLineElements);
assertTrue(commandLineElements.length > 0);
@@ -520,16 +541,21 @@ public class LauncherLifecycleCommandsJUnitTest {
expectedCommandLineElements.add("--disable-default-server");
expectedCommandLineElements.add(serverLauncher.getMemberName().toLowerCase());
expectedCommandLineElements.add("--rebalance");
- //expectedCommandLineElements.add(String.format("--server-bind-address=%1$s", serverLauncher.getServerBindAddress().getHostName()));
- expectedCommandLineElements.add(String.format("--server-port=%1$d", serverLauncher.getServerPort()));
- expectedCommandLineElements.add(
- String.format("--critical-heap-percentage=%1$s", serverLauncher.getCriticalHeapPercentage()));
- expectedCommandLineElements.add(
- String.format("--eviction-heap-percentage=%1$s", serverLauncher.getEvictionHeapPercentage()));
-
- expectedCommandLineElements.add("-d" + DistributionConfig.GEMFIRE_PREFIX + "" + START_DEV_REST_API + "=" + "true");
- expectedCommandLineElements.add("-d" + DistributionConfig.GEMFIRE_PREFIX + "" + HTTP_SERVICE_PORT + "=" + "8080");
- expectedCommandLineElements.add("-d" + DistributionConfig.GEMFIRE_PREFIX + "" + HTTP_SERVICE_BIND_ADDRESS + "=" + "localhost");
+ // expectedCommandLineElements.add(String.format("--server-bind-address=%1$s",
+ // serverLauncher.getServerBindAddress().getHostName()));
+ expectedCommandLineElements
+ .add(String.format("--server-port=%1$d", serverLauncher.getServerPort()));
+ expectedCommandLineElements.add(String.format("--critical-heap-percentage=%1$s",
+ serverLauncher.getCriticalHeapPercentage()));
+ expectedCommandLineElements.add(String.format("--eviction-heap-percentage=%1$s",
+ serverLauncher.getEvictionHeapPercentage()));
+
+ expectedCommandLineElements
+ .add("-d" + DistributionConfig.GEMFIRE_PREFIX + "" + START_DEV_REST_API + "=" + "true");
+ expectedCommandLineElements
+ .add("-d" + DistributionConfig.GEMFIRE_PREFIX + "" + HTTP_SERVICE_PORT + "=" + "8080");
+ expectedCommandLineElements.add("-d" + DistributionConfig.GEMFIRE_PREFIX + ""
+ + HTTP_SERVICE_BIND_ADDRESS + "=" + "localhost");
for (String commandLineElement : commandLineElements) {
@@ -537,14 +563,14 @@ public class LauncherLifecycleCommandsJUnitTest {
}
assertTrue(String.format("Expected ([]); but was (%1$s)", expectedCommandLineElements),
- expectedCommandLineElements.isEmpty());
+ expectedCommandLineElements.isEmpty());
}
@Test
public void testReadPidWithNonExistingFile() {
assertEquals(LauncherLifecycleCommands.INVALID_PID,
- getLauncherLifecycleCommands().readPid(new File("/path/to/non_existing/pid.file")));
+ getLauncherLifecycleCommands().readPid(new File("/path/to/non_existing/pid.file")));
}
private LauncherLifecycleCommands getLauncherLifecycleCommands() {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
index 1b9f103..ec329d3 100644
--- a/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/management/internal/configuration/SharedConfigurationEndToEndDUnitTest.java
@@ -1,18 +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
+ * 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.management.internal.configuration;
@@ -104,7 +102,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
@Override
public final void preTearDownCliCommandTestBase() throws Exception {
- //shutdown everything
+ // shutdown everything
shutdownAll();
serverNames.clear();
@@ -131,13 +129,15 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
verifyAsyncEventQueueCreation();
}
- private Set<String> startServers(final HeadlessGfsh gfsh, final String locatorString, final int numServers, final String serverNamePrefix, final int startNum) throws ClassNotFoundException, IOException {
+ private Set<String> startServers(final HeadlessGfsh gfsh, final String locatorString,
+ final int numServers, final String serverNamePrefix, final int startNum)
+ throws ClassNotFoundException, IOException {
Set<String> serverNames = new HashSet<>();
final int[] serverPorts = getRandomAvailableTCPPorts(numServers);
- for (int i=0; i<numServers; i++) {
+ for (int i = 0; i < numServers; i++) {
int port = serverPorts[i];
- String serverName = serverNamePrefix+ Integer.toString(i+startNum) + "-" + port;
+ String serverName = serverNamePrefix + Integer.toString(i + startNum) + "-" + port;
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.START_SERVER);
csb.addOption(CliStrings.START_SERVER__NAME, serverName);
@@ -154,8 +154,9 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
private void doCreateCommands() throws IOException {
createRegion(REGION1, REPLICATE, null);
createRegion(REGION2, PARTITION, null);
- createIndex(INDEX1 , "AAPL", REGION1, null);
- createAndDeployJar(this.temporaryFolder.getRoot().getCanonicalPath() + File.separator + "Deploy1.jar");
+ createIndex(INDEX1, "AAPL", REGION1, null);
+ createAndDeployJar(
+ this.temporaryFolder.getRoot().getCanonicalPath() + File.separator + "Deploy1.jar");
createAsyncEventQueue("q1");
final String autoCompact = "true";
final String allowForceCompaction = "true";
@@ -165,11 +166,12 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
final String maxOplogSize = "1000";
final String queueSize = "300";
final String timeInterval = "10";
- final String writeBufferSize="100";
+ final String writeBufferSize = "100";
final String diskStoreName = "ds1";
final String diskDirs = "ds1";
-
- createDiskStore(diskStoreName, diskDirs, autoCompact, allowForceCompaction, compactionThreshold, duCritical, duWarning, maxOplogSize, queueSize, timeInterval, writeBufferSize);
+
+ createDiskStore(diskStoreName, diskDirs, autoCompact, allowForceCompaction, compactionThreshold,
+ duCritical, duWarning, maxOplogSize, queueSize, timeInterval, writeBufferSize);
}
private void executeAndVerifyCommand(final String commandString) {
@@ -179,7 +181,8 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
assertFalse(cmdResult.failedToPersist());
}
- private void createRegion(final String regionName, final RegionShortcut regionShortCut, final String group) {
+ private void createRegion(final String regionName, final RegionShortcut regionShortCut,
+ final String group) {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_REGION);
csb.addOption(CliStrings.CREATE_REGION__REGION, regionName);
csb.addOption(CliStrings.CREATE_REGION__REGIONSHORTCUT, regionShortCut.name());
@@ -204,17 +207,17 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
try {
ClassBuilder classBuilder = new ClassBuilder();
- byte[] jarBytes = classBuilder.createJarFromClassContent("com/qcdunit/QueueCommandsDUnitTestListener",
- "package com.qcdunit;" +
- "import java.util.List; import java.util.Properties;" +
- "import org.apache.geode.internal.cache.xmlcache.Declarable2; import org.apache.geode.cache.asyncqueue.AsyncEvent;" +
- "import org.apache.geode.cache.asyncqueue.AsyncEventListener;" +
- "public class QueueCommandsDUnitTestListener implements Declarable2, AsyncEventListener {" +
- "Properties props;" +
- "public boolean processEvents(List<AsyncEvent> events) { return true; }" +
- "public void close() {}" +
- "public void init(final Properties props) {this.props = props;}" +
- "public Properties getConfig() {return this.props;}}");
+ byte[] jarBytes =
+ classBuilder.createJarFromClassContent("com/qcdunit/QueueCommandsDUnitTestListener",
+ "package com.qcdunit;" + "import java.util.List; import java.util.Properties;"
+ + "import org.apache.geode.internal.cache.xmlcache.Declarable2; import org.apache.geode.cache.asyncqueue.AsyncEvent;"
+ + "import org.apache.geode.cache.asyncqueue.AsyncEventListener;"
+ + "public class QueueCommandsDUnitTestListener implements Declarable2, AsyncEventListener {"
+ + "Properties props;"
+ + "public boolean processEvents(List<AsyncEvent> events) { return true; }"
+ + "public void close() {}"
+ + "public void init(final Properties props) {this.props = props;}"
+ + "public Properties getConfig() {return this.props;}}");
FileUtils.writeByteArrayToFile(jarFile, jarBytes);
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.DEPLOY);
@@ -223,7 +226,8 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
csb = new CommandStringBuilder(CliStrings.CREATE_ASYNC_EVENT_QUEUE);
csb.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__ID, queueName);
- csb.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER, "com.qcdunit.QueueCommandsDUnitTestListener");
+ csb.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__LISTENER,
+ "com.qcdunit.QueueCommandsDUnitTestListener");
csb.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__BATCH_SIZE, "100");
csb.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__BATCHTIMEINTERVAL, "200");
csb.addOption(CliStrings.CREATE_ASYNC_EVENT_QUEUE__DISPATCHERTHREADS, "4");
@@ -242,23 +246,18 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
}
}
- private void createDiskStore(final String diskStoreName,
- final String diskDirs,
- final String autoCompact,
- final String allowForceCompaction,
- final String compactionThreshold,
- final String duCritical,
- final String duWarning,
- final String maxOplogSize,
- final String queueSize,
- final String timeInterval,
- final String writeBufferSize) {
+ private void createDiskStore(final String diskStoreName, final String diskDirs,
+ final String autoCompact, final String allowForceCompaction, final String compactionThreshold,
+ final String duCritical, final String duWarning, final String maxOplogSize,
+ final String queueSize, final String timeInterval, final String writeBufferSize) {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_DISK_STORE);
csb.addOption(CliStrings.CREATE_DISK_STORE__NAME, diskStoreName);
csb.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE, diskDirs);
csb.addOptionWithValueCheck(CliStrings.CREATE_DISK_STORE__AUTO_COMPACT, autoCompact);
- csb.addOptionWithValueCheck(CliStrings.CREATE_DISK_STORE__ALLOW_FORCE_COMPACTION, allowForceCompaction);
- csb.addOptionWithValueCheck(CliStrings.CREATE_DISK_STORE__COMPACTION_THRESHOLD, compactionThreshold);
+ csb.addOptionWithValueCheck(CliStrings.CREATE_DISK_STORE__ALLOW_FORCE_COMPACTION,
+ allowForceCompaction);
+ csb.addOptionWithValueCheck(CliStrings.CREATE_DISK_STORE__COMPACTION_THRESHOLD,
+ compactionThreshold);
csb.addOptionWithValueCheck(CliStrings.CREATE_DISK_STORE__DISK_USAGE_CRITICAL_PCT, duCritical);
csb.addOptionWithValueCheck(CliStrings.CREATE_DISK_STORE__DISK_USAGE_WARNING_PCT, duWarning);
csb.addOptionWithValueCheck(CliStrings.CREATE_DISK_STORE__MAX_OPLOG_SIZE, maxOplogSize);
@@ -267,7 +266,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
csb.addOptionWithValueCheck(CliStrings.CREATE_DISK_STORE__WRITE_BUFFER_SIZE, writeBufferSize);
executeAndVerifyCommand(csb.getCommandString());
}
-
+
private void destroyDiskStore(final String diskStoreName, final String group) {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.DESTROY_DISK_STORE);
csb.addOption(CliStrings.DESTROY_DISK_STORE__NAME, diskStoreName);
@@ -275,7 +274,8 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
executeAndVerifyCommand(csb.toString());
}
- private void createIndex(final String indexName, final String expression, final String regionName, final String group) {
+ private void createIndex(final String indexName, final String expression, final String regionName,
+ final String group) {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CREATE_INDEX);
csb.addOption(CliStrings.CREATE_INDEX__NAME, indexName);
csb.addOption(CliStrings.CREATE_INDEX__EXPRESSION, expression);
@@ -317,11 +317,12 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
}
private Object[] setup() throws IOException {
- final int [] ports = getRandomAvailableTCPPorts(3);
+ final int[] ports = getRandomAvailableTCPPorts(3);
final int locator1Port = ports[0];
final String locator1Name = "locator1-" + locator1Port;
- final String locatorLogPath = this.temporaryFolder.getRoot().getCanonicalPath() + File.separator + "locator-" + locator1Port + ".log";
+ final String locatorLogPath = this.temporaryFolder.getRoot().getCanonicalPath() + File.separator
+ + "locator-" + locator1Port + ".log";
VM locatorAndMgr = getHost(0).getVM(3);
Object[] result = (Object[]) locatorAndMgr.invoke(new SerializableCallable() {
@@ -333,8 +334,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
try {
jmxHost = InetAddress.getLocalHost().getHostName();
- }
- catch (UnknownHostException ignore) {
+ } catch (UnknownHostException ignore) {
jmxHost = "localhost";
}
@@ -356,13 +356,15 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
locatorProps.setProperty(JMX_MANAGER_PORT, String.valueOf(jmxPort));
locatorProps.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpPort));
- final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port, locatorLogFile, null, locatorProps);
+ final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator1Port,
+ locatorLogFile, null, locatorProps);
WaitCriterion wc = new WaitCriterion() {
@Override
public boolean done() {
return locator.isSharedConfigurationRunning();
}
+
@Override
public String description() {
return "Waiting for shared configuration to be started";
@@ -380,9 +382,9 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
});
HeadlessGfsh gfsh = getDefaultShell();
- String jmxHost = (String)result[1];
- int jmxPort = (Integer)result[2];
- int httpPort = (Integer)result[3];
+ String jmxHost = (String) result[1];
+ int jmxPort = (Integer) result[2];
+ int httpPort = (Integer) result[3];
connect(jmxHost, jmxPort, httpPort, gfsh);
@@ -393,7 +395,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
public Object call() {
Properties localProps = new Properties();
localProps.setProperty(MCAST_PORT, "0");
- localProps.setProperty(LOCATORS, "localhost[" + locator1Port+"]");
+ localProps.setProperty(LOCATORS, "localhost[" + locator1Port + "]");
localProps.setProperty(NAME, "DataMember");
getSystem(localProps);
Cache cache = getCache();
@@ -409,7 +411,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
locatorAndMgr.invoke(new SerializableCallable() {
@Override
public Object call() throws Exception {
- GemFireCacheImpl cache = (GemFireCacheImpl)CacheFactory.getAnyInstance();
+ GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
ShutdownAllRequest.send(cache.getDistributedSystem().getDistributionManager(), -1);
return null;
}
@@ -417,7 +419,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
locatorAndMgr.invoke(SharedConfigurationTestUtils.cleanupLocator);
- //Clean up the directories
+ // Clean up the directories
if (!serverNames.isEmpty()) {
for (String serverName : serverNames) {
final File serverDir = new File(serverName);
@@ -437,7 +439,7 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
for (String serverName : serverNames) {
assertTrue(resultAsString.contains(serverName));
}
- }
+ }
private void verifyIndexCreationOnAllMembers(final String indexName) {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.LIST_INDEX);
@@ -448,12 +450,12 @@ public class SharedConfigurationEndToEndDUnitTest extends CliCommandTestBase {
assertTrue(resultAsString.contains(serverName));
}
}
-
+
private void verifyAsyncEventQueueCreation() {
CommandStringBuilder csb = new CommandStringBuilder(CliStrings.LIST_ASYNC_EVENT_QUEUES);
CommandResult cmdResult = executeCommand(csb.toString());
String resultAsString = commandResultToString(cmdResult);
-
+
for (String serverName : serverNames) {
assertTrue(resultAsString.contains(serverName));
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
index c83cebb..4f92bfe 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
@@ -1,18 +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
+ * 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.rest.internal.web;
@@ -55,43 +53,50 @@ public class GeodeRestClient {
public final static String CONTEXT = "/geode/v1";
private int restPort = 0;
- public GeodeRestClient(int restPort){
+
+ public GeodeRestClient(int restPort) {
this.restPort = restPort;
}
- public HttpResponse doHEAD(String query, String username, String password) throws MalformedURLException {
+ public HttpResponse doHEAD(String query, String username, String password)
+ throws MalformedURLException {
HttpHead httpHead = new HttpHead(CONTEXT + query);
return doRequest(httpHead, username, password);
}
- public HttpResponse doPost(String query, String username, String password, String body) throws MalformedURLException {
+ public HttpResponse doPost(String query, String username, String password, String body)
+ throws MalformedURLException {
HttpPost httpPost = new HttpPost(CONTEXT + query);
httpPost.addHeader("content-type", "application/json");
httpPost.setEntity(new StringEntity(body, StandardCharsets.UTF_8));
return doRequest(httpPost, username, password);
}
- public HttpResponse doPut(String query, String username, String password, String body) throws MalformedURLException {
+ public HttpResponse doPut(String query, String username, String password, String body)
+ throws MalformedURLException {
HttpPut httpPut = new HttpPut(CONTEXT + query);
httpPut.addHeader("content-type", "application/json");
httpPut.setEntity(new StringEntity(body, StandardCharsets.UTF_8));
return doRequest(httpPut, username, password);
}
- public HttpResponse doGet(String uri, String username, String password) throws MalformedURLException {
+ public HttpResponse doGet(String uri, String username, String password)
+ throws MalformedURLException {
HttpGet getRequest = new HttpGet(CONTEXT + uri);
return doRequest(getRequest, username, password);
}
+
public HttpResponse doGet(String uri) throws MalformedURLException {
return doGet(uri, null, null);
}
- public HttpResponse doDelete(String uri, String username, String password) throws MalformedURLException {
+ public HttpResponse doDelete(String uri, String username, String password)
+ throws MalformedURLException {
HttpDelete httpDelete = new HttpDelete(CONTEXT + uri);
return doRequest(httpDelete, username, password);
}
- public static String getContentType(HttpResponse response){
+ public static String getContentType(HttpResponse response) {
return response.getEntity().getContentType().getValue();
}
@@ -118,14 +123,16 @@ public class GeodeRestClient {
return new JSONTokener(str.toString());
}
- private HttpResponse doRequest(HttpRequestBase request, String username, String password) throws MalformedURLException {
- HttpHost targetHost = new HttpHost(HOSTNAME,restPort, PROTOCOL);
+ private HttpResponse doRequest(HttpRequestBase request, String username, String password)
+ throws MalformedURLException {
+ HttpHost targetHost = new HttpHost(HOSTNAME, restPort, PROTOCOL);
CloseableHttpClient httpclient = HttpClients.custom().build();
HttpClientContext clientContext = HttpClientContext.create();
// if username is null, do not put in authentication
if (username != null) {
CredentialsProvider credsProvider = new BasicCredentialsProvider();
- credsProvider.setCredentials(new AuthScope(targetHost.getHostName(), targetHost.getPort()), new UsernamePasswordCredentials(username, password));
+ credsProvider.setCredentials(new AuthScope(targetHost.getHostName(), targetHost.getPort()),
+ new UsernamePasswordCredentials(username, password));
httpclient = HttpClients.custom().setDefaultCredentialsProvider(credsProvider).build();
AuthCache authCache = new BasicAuthCache();
BasicScheme basicAuth = new BasicScheme();
@@ -145,4 +152,4 @@ public class GeodeRestClient {
}
return null;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java
index b21f94c..eede038 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestFunctionTemplate.java
@@ -1,18 +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
+ * 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.rest.internal.web;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
index 4e3269e..932119d 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
@@ -1,18 +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
+ * 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.rest.internal.web;
@@ -69,10 +67,11 @@ import org.springframework.web.client.ResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
/**
- * The GemFireRestInterfaceTest class is a test suite of test cases testing the contract and functionality of the
- * GemFire Developer REST API, mixing Java clients, this test GemFire's Cache Region API, along with
- * a REST-based client, also this test using Spring's RestTemplate, testing the proper interaction, especially
- * in the case of an application domain object type having a java.util.Date property.
+ * The GemFireRestInterfaceTest class is a test suite of test cases testing the contract and
+ * functionality of the GemFire Developer REST API, mixing Java clients, this test GemFire's Cache
+ * Region API, along with a REST-based client, also this test using Spring's RestTemplate, testing
+ * the proper interaction, especially in the case of an application domain object type having a
+ * java.util.Date property.
*
* @see org.junit.Test
* @see org.junit.runner.RunWith
@@ -83,15 +82,16 @@ import org.springframework.web.client.RestTemplate;
* @see org.apache.geode.pdx.ReflectionBasedAutoSerializer
* @since Geode 1.0.0
*/
-//@RunWith(SpringJUnit4ClassRunner.class)
-//@ContextConfiguration
+// @RunWith(SpringJUnit4ClassRunner.class)
+// @ContextConfiguration
@SuppressWarnings("unused")
@Category(IntegrationTest.class)
public class RestInterfaceJUnitTest {
protected static int DEFAULT_HTTP_SERVICE_PORT = 8189;
- protected static final String REST_API_SERVICE_ENDPOINT = "http://localhost:%1$d/gemfire-api/v1/%2$s/%3$s";
+ protected static final String REST_API_SERVICE_ENDPOINT =
+ "http://localhost:%1$d/gemfire-api/v1/%2$s/%3$s";
protected static final String UTF_8 = "UTF-8";
@Autowired
@@ -117,17 +117,15 @@ public class RestInterfaceJUnitTest {
gemfireProperties = (gemfireProperties != null ? gemfireProperties : new Properties());
gemfireCache = new CacheFactory()
- //.setPdxSerializer(new ReflectionBasedAutoSerializer(Person.class.getPackage().getName().concat(".*")))
- .setPdxSerializer(new ReflectionBasedAutoSerializer(Person.class.getName().replaceAll("\\$", ".")))
- .setPdxReadSerialized(true)
- .setPdxIgnoreUnreadFields(false)
- .set("name", getClass().getSimpleName())
- .set(MCAST_PORT, "0")
- .set(LOG_LEVEL, "config")
+ // .setPdxSerializer(new
+ // ReflectionBasedAutoSerializer(Person.class.getPackage().getName().concat(".*")))
+ .setPdxSerializer(
+ new ReflectionBasedAutoSerializer(Person.class.getName().replaceAll("\\$", ".")))
+ .setPdxReadSerialized(true).setPdxIgnoreUnreadFields(false)
+ .set("name", getClass().getSimpleName()).set(MCAST_PORT, "0").set(LOG_LEVEL, "config")
.set(HTTP_SERVICE_BIND_ADDRESS, "localhost")
.set(HTTP_SERVICE_PORT, String.valueOf(getHttpServicePort()))
- .set(START_DEV_REST_API, "true")
- .create();
+ .set(START_DEV_REST_API, "true").create();
RegionFactory<String, Object> peopleRegionFactory = gemfireCache.createRegionFactory();
@@ -146,9 +144,9 @@ public class RestInterfaceJUnitTest {
protected synchronized int getHttpServicePort() {
try {
- return Integer.parseInt(StringUtils.trimWhitespace(gemfireProperties.getProperty(HTTP_SERVICE_PORT)));
- }
- catch (NumberFormatException ignore) {
+ return Integer
+ .parseInt(StringUtils.trimWhitespace(gemfireProperties.getProperty(HTTP_SERVICE_PORT)));
+ } catch (NumberFormatException ignore) {
int httpServicePort = getHttpServicePort(DEFAULT_HTTP_SERVICE_PORT);
gemfireProperties.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpServicePort));
return httpServicePort;
@@ -157,18 +155,22 @@ public class RestInterfaceJUnitTest {
private int getHttpServicePort(final int defaultHttpServicePort) {
int httpServicePort = AvailablePortHelper.getRandomAvailableTCPPort();
- return (httpServicePort > 1024 && httpServicePort < 65536 ? httpServicePort : defaultHttpServicePort);
+ return (httpServicePort > 1024 && httpServicePort < 65536 ? httpServicePort
+ : defaultHttpServicePort);
}
protected ObjectMapper getObjectMapper() {
if (objectMapper == null) {
- Jackson2ObjectMapperFactoryBean objectMapperFactoryBean = new Jackson2ObjectMapperFactoryBean();
+ Jackson2ObjectMapperFactoryBean objectMapperFactoryBean =
+ new Jackson2ObjectMapperFactoryBean();
objectMapperFactoryBean.setFailOnEmptyBeans(true);
objectMapperFactoryBean.setFeaturesToEnable(Feature.ALLOW_COMMENTS);
objectMapperFactoryBean.setFeaturesToEnable(Feature.ALLOW_SINGLE_QUOTES);
- objectMapperFactoryBean.setFeaturesToEnable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
- objectMapperFactoryBean.setFeaturesToDisable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+ objectMapperFactoryBean
+ .setFeaturesToEnable(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+ objectMapperFactoryBean
+ .setFeaturesToDisable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
objectMapperFactoryBean.setIndentOutput(true);
objectMapperFactoryBean.setSimpleDateFormat("MM/dd/yyyy");
objectMapperFactoryBean.afterPropertiesSet();
@@ -189,14 +191,16 @@ public class RestInterfaceJUnitTest {
}
protected String getAdhocQueryRestApiEndpoint(final int httpServicePort, final String query) {
- return String.format(REST_API_SERVICE_ENDPOINT, httpServicePort, "queries", String.format("adhoc?q=%1$s", query));
+ return String.format(REST_API_SERVICE_ENDPOINT, httpServicePort, "queries",
+ String.format("adhoc?q=%1$s", query));
}
protected String getRegionGetRestApiEndpoint(final Region<?, ?> region, final String key) {
return getRegionGetRestApiEndpoint(getHttpServicePort(), region, key);
}
- protected String getRegionGetRestApiEndpoint(final int httpServicePort, final Region<?, ?> region, final String key) {
+ protected String getRegionGetRestApiEndpoint(final int httpServicePort, final Region<?, ?> region,
+ final String key) {
return String.format(REST_API_SERVICE_ENDPOINT, httpServicePort, region.getName(), key);
}
@@ -213,17 +217,19 @@ public class RestInterfaceJUnitTest {
return createPerson(firstName, lastName, null);
}
- protected Person createPerson(final String firstName, final String lastName, final Date birthDate) {
+ protected Person createPerson(final String firstName, final String lastName,
+ final Date birthDate) {
return new Person(firstName, lastName, birthDate);
}
protected RestTemplate createRestTemplate() {
- MappingJackson2HttpMessageConverter httpMessageConverter = new MappingJackson2HttpMessageConverter();
+ MappingJackson2HttpMessageConverter httpMessageConverter =
+ new MappingJackson2HttpMessageConverter();
httpMessageConverter.setObjectMapper(getObjectMapper());
- return setErrorHandler(new RestTemplate(Collections.<HttpMessageConverter<?>>singletonList(
- httpMessageConverter)));
+ return setErrorHandler(
+ new RestTemplate(Collections.<HttpMessageConverter<?>>singletonList(httpMessageConverter)));
}
private RestTemplate setErrorHandler(final RestTemplate restTemplate) {
@@ -256,8 +262,7 @@ public class RestInterfaceJUnitTest {
@Override
public void handleError(final ClientHttpResponse response) throws IOException {
- System.err.printf("%1$d - %2$s%n", response.getRawStatusCode(),
- response.getStatusText());
+ System.err.printf("%1$d - %2$s%n", response.getRawStatusCode(), response.getStatusText());
System.err.println(readBody(response));
}
@@ -275,8 +280,7 @@ public class RestInterfaceJUnitTest {
}
return buffer.toString().trim();
- }
- finally {
+ } finally {
IOUtils.close(responseBodyReader);
}
}
@@ -308,20 +312,22 @@ public class RestInterfaceJUnitTest {
RestTemplate restTemplate = createRestTemplate();
- Person jonDoeResource = restTemplate.getForObject(getRegionGetRestApiEndpoint(getPeopleRegion(), key), Person.class);
+ Person jonDoeResource = restTemplate
+ .getForObject(getRegionGetRestApiEndpoint(getPeopleRegion(), key), Person.class);
assertNotNull(jonDoeResource);
assertNotSame(jonDoe, jonDoeResource);
assertEquals(jonDoe, jonDoeResource);
/*
- Object result = runQueryUsingApi(getPeopleRegion().getRegionService(), String.format("SELECT * FROM %1$s",
- getPeopleRegion().getFullPath()));
+ * Object result = runQueryUsingApi(getPeopleRegion().getRegionService(),
+ * String.format("SELECT * FROM %1$s", getPeopleRegion().getFullPath()));
+ *
+ * System.out.printf("(OQL Query using API) Person is (%1$s)%n", result);
+ */
- System.out.printf("(OQL Query using API) Person is (%1$s)%n", result);
- */
-
- String url = getAdhocQueryRestApiEndpoint(String.format("SELECT * FROM %1$s", getPeopleRegion().getFullPath()));
+ String url = getAdhocQueryRestApiEndpoint(
+ String.format("SELECT * FROM %1$s", getPeopleRegion().getFullPath()));
System.out.printf("URL (%1$s)%n", url);
@@ -338,13 +344,15 @@ public class RestInterfaceJUnitTest {
assertEquals(jonDoe, jonDoeResource);
}
- private Object runQueryUsingApi(final RegionService regionService, final String queryString) throws Exception {
+ private Object runQueryUsingApi(final RegionService regionService, final String queryString)
+ throws Exception {
return regionService.getQueryService().newQuery(queryString).execute();
}
- //@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
- //@JsonIgnoreProperties(ignoreUnknown = true)
- //@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property = "@type")
+ // @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.NONE)
+ // @JsonIgnoreProperties(ignoreUnknown = true)
+ // @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY, property =
+ // "@type")
public static class Person implements PdxSerializable {
protected static final String DEFAULT_BIRTH_DATE_FORMAT_PATTERN = "MM/dd/yyyy";
@@ -354,8 +362,7 @@ public class RestInterfaceJUnitTest {
private String firstName;
private String lastName;
- public Person() {
- }
+ public Person() {}
public Person(final String firstName, final String lastName) {
this(firstName, lastName, null);
@@ -373,7 +380,7 @@ public class RestInterfaceJUnitTest {
public void setBirthDate(final Date birthDate) {
Assert.isTrue(birthDate == null || birthDate.compareTo(Calendar.getInstance().getTime()) <= 0,
- "A Person's date of birth cannot be after today!");
+ "A Person's date of birth cannot be after today!");
this.birthDate = birthDate;
}
@@ -400,8 +407,9 @@ public class RestInterfaceJUnitTest {
}
protected String format(final Date dateTime, final String dateFormatPattern) {
- return (dateTime == null ? null : new SimpleDateFormat(StringUtils.hasText(dateFormatPattern) ? dateFormatPattern
- : DEFAULT_BIRTH_DATE_FORMAT_PATTERN).format(dateTime));
+ return (dateTime == null ? null
+ : new SimpleDateFormat(StringUtils.hasText(dateFormatPattern) ? dateFormatPattern
+ : DEFAULT_BIRTH_DATE_FORMAT_PATTERN).format(dateTime));
}
@Override
@@ -431,8 +439,8 @@ public class RestInterfaceJUnitTest {
Person that = (Person) obj;
return ObjectUtils.nullSafeEquals(this.getFirstName(), that.getFirstName())
- && ObjectUtils.nullSafeEquals(this.getLastName(), that.getLastName())
- && ObjectUtils.nullSafeEquals(this.getBirthDate(), that.getBirthDate());
+ && ObjectUtils.nullSafeEquals(this.getLastName(), that.getLastName())
+ && ObjectUtils.nullSafeEquals(this.getBirthDate(), that.getBirthDate());
}
@Override
@@ -447,7 +455,7 @@ public class RestInterfaceJUnitTest {
@Override
public String toString() {
return String.format("{ @type = %1$s, firstName = %2$s, lastName = %3$s, birthDate = %4$s }",
- getClass().getName(), getFirstName(), getLastName(), format(getBirthDate()));
+ getClass().getName(), getFirstName(), getLastName(), format(getBirthDate()));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index 5f66f3b..fc9ae95 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -1,18 +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
+ * 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.rest.internal.web;
@@ -38,19 +36,22 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.test.junit.categories.SecurityTest;
-@Category({ IntegrationTest.class, SecurityTest.class })
+@Category({IntegrationTest.class, SecurityTest.class})
public class RestSecurityIntegrationTest {
protected static final String REGION_NAME = "AuthRegion";
private static int restPort = AvailablePortHelper.getRandomAvailableTCPPort();
- static Properties properties = new Properties() {{
- setProperty(SampleSecurityManager.SECURITY_JSON, "org/apache/geode/management/internal/security/clientServer.json");
- setProperty(SECURITY_MANAGER, SampleSecurityManager.class.getName());
- setProperty(START_DEV_REST_API, "true");
- setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
- setProperty(HTTP_SERVICE_PORT, restPort + "");
- }};
+ static Properties properties = new Properties() {
+ {
+ setProperty(SampleSecurityManager.SECURITY_JSON,
+ "org/apache/geode/management/internal/security/clientServer.json");
+ setProperty(SECURITY_MANAGER, SampleSecurityManager.class.getName());
+ setProperty(START_DEV_REST_API, "true");
+ setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
+ setProperty(HTTP_SERVICE_PORT, restPort + "");
+ }
+ };
@ClassRule
public static ServerStarter serverStarter = new ServerStarter(properties);
@@ -79,8 +80,10 @@ public class RestSecurityIntegrationTest {
assertEquals(401, restClient.getCode(response));
response = restClient.doPost("/functions/AddFreeItemsToOrder", "dataReader", "1234567", json);
assertEquals(403, restClient.getCode(response));
- response = restClient.doPost("/functions/AddFreeItemsToOrder?onRegion=" + REGION_NAME, "dataWriter", "1234567", json);
- // because we're only testing the security of the endpoint, not the endpoint functionality, a 500 is acceptable
+ response = restClient.doPost("/functions/AddFreeItemsToOrder?onRegion=" + REGION_NAME,
+ "dataWriter", "1234567", json);
+ // because we're only testing the security of the endpoint, not the endpoint functionality, a
+ // 500 is acceptable
assertEquals(500, restClient.getCode(response));
}
@@ -102,7 +105,8 @@ public class RestSecurityIntegrationTest {
response = restClient.doGet("/queries/adhoc?q=", "stranger", "1234567");
assertEquals(403, restClient.getCode(response));
response = restClient.doGet("/queries/adhoc?q=", "dataReader", "1234567");
- // because we're only testing the security of the endpoint, not the endpoint functionality, a 500 is acceptable
+ // because we're only testing the security of the endpoint, not the endpoint functionality, a
+ // 500 is acceptable
assertEquals(500, restClient.getCode(response));
}
@@ -113,24 +117,28 @@ public class RestSecurityIntegrationTest {
response = restClient.doPost("/queries?id=0&q=", "stranger", "1234567", "");
assertEquals(403, restClient.getCode(response));
response = restClient.doPost("/queries?id=0&q=", "dataReader", "1234567", "");
- // because we're only testing the security of the endpoint, not the endpoint functionality, a 500 is acceptable
+ // because we're only testing the security of the endpoint, not the endpoint functionality, a
+ // 500 is acceptable
assertEquals(500, restClient.getCode(response));
}
@Test
public void testPostQuery2() throws Exception {
- HttpResponse response = restClient.doPost("/queries/id", "unknown-user", "1234567", "{\"id\" : \"foo\"}");
+ HttpResponse response =
+ restClient.doPost("/queries/id", "unknown-user", "1234567", "{\"id\" : \"foo\"}");
assertEquals(401, restClient.getCode(response));
response = restClient.doPost("/queries/id", "stranger", "1234567", "{\"id\" : \"foo\"}");
assertEquals(403, restClient.getCode(response));
response = restClient.doPost("/queries/id", "dataReader", "1234567", "{\"id\" : \"foo\"}");
- // because we're only testing the security of the endpoint, not the endpoint functionality, a 500 is acceptable
+ // because we're only testing the security of the endpoint, not the endpoint functionality, a
+ // 500 is acceptable
assertEquals(500, restClient.getCode(response));
}
@Test
public void testPutQuery() throws Exception {
- HttpResponse response = restClient.doPut("/queries/id", "unknown-user", "1234567", "{\"id\" : \"foo\"}");
+ HttpResponse response =
+ restClient.doPut("/queries/id", "unknown-user", "1234567", "{\"id\" : \"foo\"}");
assertEquals(401, restClient.getCode(response));
response = restClient.doPut("/queries/id", "stranger", "1234567", "{\"id\" : \"foo\"}");
assertEquals(403, restClient.getCode(response));
@@ -162,8 +170,8 @@ public class RestSecurityIntegrationTest {
}
/**
- * This test should always return an OK, whether the user is known or unknown. A phishing script should not be
- * able to determine whether a user/password combination is good
+ * This test should always return an OK, whether the user is known or unknown. A phishing script
+ * should not be able to determine whether a user/password combination is good
*/
@Test
public void testPing() throws Exception {
@@ -290,7 +298,8 @@ public class RestSecurityIntegrationTest {
@Test
public void deleteRegionKey() throws Exception {
// Test an unknown user - 401 error
- HttpResponse response = restClient.doDelete("/" + REGION_NAME + "/key1", "unknown-user", "1234567");
+ HttpResponse response =
+ restClient.doDelete("/" + REGION_NAME + "/key1", "unknown-user", "1234567");
assertEquals(401, restClient.getCode(response));
// Test a user with insufficient rights - 403
@@ -308,15 +317,18 @@ public class RestSecurityIntegrationTest {
@Test
public void postRegionKey() throws Exception {
// Test an unknown user - 401 error
- HttpResponse response = restClient.doPost("/" + REGION_NAME + "?key9", "unknown", "1234567", "{ \"key9\" : \"foo\" }");
+ HttpResponse response = restClient.doPost("/" + REGION_NAME + "?key9", "unknown", "1234567",
+ "{ \"key9\" : \"foo\" }");
assertEquals(401, restClient.getCode(response));
// Test a user with insufficient rights - 403
- response = restClient.doPost("/" + REGION_NAME + "?key9", "dataReader", "1234567", "{ \"key9\" : \"foo\" }");
+ response = restClient.doPost("/" + REGION_NAME + "?key9", "dataReader", "1234567",
+ "{ \"key9\" : \"foo\" }");
assertEquals(403, restClient.getCode(response));
// Test an authorized user - 200
- response = restClient.doPost("/" + REGION_NAME + "?key9", "dataWriter", "1234567", "{ \"key9\" : \"foo\" }");
+ response = restClient.doPost("/" + REGION_NAME + "?key9", "dataWriter", "1234567",
+ "{ \"key9\" : \"foo\" }");
assertEquals(201, restClient.getCode(response));
}
@@ -326,30 +338,40 @@ public class RestSecurityIntegrationTest {
@Test
public void putRegionKey() throws Exception {
- String json = "{\"@type\":\"com.gemstone.gemfire.web.rest.domain.Order\",\"purchaseOrderNo\":1121,\"customerId\":1012,\"description\":\"Order for XYZ Corp\",\"orderDate\":\"02/10/2014\",\"deliveryDate\":\"02/20/2014\",\"contact\":\"Jelly Bean\",\"email\":\"jelly.bean@example.com\",\"phone\":\"01-2048096\",\"items\":[{\"itemNo\":1,\"description\":\"Product-100\",\"quantity\":12,\"unitPrice\":5,\"totalPrice\":60}],\"totalPrice\":225}";
- String casJSON = "{\"@old\":{\"@type\":\"com.gemstone.gemfire.web.rest.domain.Order\",\"purchaseOrderNo\":1121,\"customerId\":1012,\"description\":\"Order for XYZ Corp\",\"orderDate\":\"02/10/2014\",\"deliveryDate\":\"02/20/2014\",\"contact\":\"Jelly Bean\",\"email\":\"jelly.bean@example.com\",\"phone\":\"01-2048096\",\"items\":[{\"itemNo\":1,\"description\":\"Product-100\",\"quantity\":12,\"unitPrice\":5,\"totalPrice\":60}],\"totalPrice\":225},\"@new \":{\"@type\":\"com.gemstone.gemfire.web.rest.domain.Order\",\"purchaseOrderNo\":1121,\"customerId\":1013,\"description\":\"Order for New Corp\",\"orderDate\":\"02/10/2014\",\"deliveryDate\":\"02/25/2014\",\"contact\":\"Vanilla Bean\",\"email\":\"vanillabean@example.com\",\"phone\":\"01-2048096\",\"items\":[{\"itemNo\":12345,\"description\":\"part 123\",\"quantity\":12,\"unitPrice\":29.99,\"totalPrice\":149.95}],\"totalPrice\":149.95}}";
+ String json =
+ "{\"@type\":\"com.gemstone.gemfire.web.rest.domain.Order\",\"purchaseOrderNo\":1121,\"customerId\":1012,\"description\":\"Order for XYZ Corp\",\"orderDate\":\"02/10/2014\",\"deliveryDate\":\"02/20/2014\",\"contact\":\"Jelly Bean\",\"email\":\"jelly.bean@example.com\",\"phone\":\"01-2048096\",\"items\":[{\"itemNo\":1,\"description\":\"Product-100\",\"quantity\":12,\"unitPrice\":5,\"totalPrice\":60}],\"totalPrice\":225}";
+ String casJSON =
+ "{\"@old\":{\"@type\":\"com.gemstone.gemfire.web.rest.domain.Order\",\"purchaseOrderNo\":1121,\"customerId\":1012,\"description\":\"Order for XYZ Corp\",\"orderDate\":\"02/10/2014\",\"deliveryDate\":\"02/20/2014\",\"contact\":\"Jelly Bean\",\"email\":\"jelly.bean@example.com\",\"phone\":\"01-2048096\",\"items\":[{\"itemNo\":1,\"description\":\"Product-100\",\"quantity\":12,\"unitPrice\":5,\"totalPrice\":60}],\"totalPrice\":225},\"@new \":{\"@type\":\"com.gemstone.gemfire.web.rest.domain.Order\",\"purchaseOrderNo\":1121,\"customerId\":1013,\"description\":\"Order for New Corp\",\"orderDate\":\"02/10/2014\",\"deliveryDate\":\"02/25/2014\",\"contact\":\"Vanilla Bean\",\"email\":\"vanillabean@example.com\",\"phone\":\"01-2048096\",\"items\":[{\"itemNo\":12345,\"description\":\"part 123\",\"quantity\":12,\"unitPrice\":29.99,\"totalPrice\":149.95}],\"totalPrice\":149.95}}";
// Test an unknown user - 401 error
- HttpResponse response = restClient.doPut("/" + REGION_NAME + "/key1?op=PUT", "unknown-user", "1234567", "{ \"key9\" : \"foo\" }");
+ HttpResponse response = restClient.doPut("/" + REGION_NAME + "/key1?op=PUT", "unknown-user",
+ "1234567", "{ \"key9\" : \"foo\" }");
assertEquals(401, restClient.getCode(response));
- response = restClient.doPut("/" + REGION_NAME + "/key1?op=CAS", "unknown-user", "1234567", "{ \"key9\" : \"foo\" }");
+ response = restClient.doPut("/" + REGION_NAME + "/key1?op=CAS", "unknown-user", "1234567",
+ "{ \"key9\" : \"foo\" }");
assertEquals(401, restClient.getCode(response));
- response = restClient.doPut("/" + REGION_NAME + "/key1?op=REPLACE", "unknown-user", "1234567", "{ \"@old\" : \"value1\", \"@new\" : \"CASvalue\" }");
+ response = restClient.doPut("/" + REGION_NAME + "/key1?op=REPLACE", "unknown-user", "1234567",
+ "{ \"@old\" : \"value1\", \"@new\" : \"CASvalue\" }");
assertEquals(401, restClient.getCode(response));
- response = restClient.doPut("/" + REGION_NAME + "/key1?op=PUT", "dataReader", "1234567", "{ \"key1\" : \"foo\" }");
+ response = restClient.doPut("/" + REGION_NAME + "/key1?op=PUT", "dataReader", "1234567",
+ "{ \"key1\" : \"foo\" }");
assertEquals(403, restClient.getCode(response));
- response = restClient.doPut("/" + REGION_NAME + "/key1?op=REPLACE", "dataReader", "1234567", "{ \"key1\" : \"foo\" }");
+ response = restClient.doPut("/" + REGION_NAME + "/key1?op=REPLACE", "dataReader", "1234567",
+ "{ \"key1\" : \"foo\" }");
assertEquals(403, restClient.getCode(response));
- response = restClient.doPut("/" + REGION_NAME + "/key1?op=CAS", "dataReader", "1234567", casJSON);
+ response =
+ restClient.doPut("/" + REGION_NAME + "/key1?op=CAS", "dataReader", "1234567", casJSON);
assertEquals(403, restClient.getCode(response));
- response = restClient.doPut("/" + REGION_NAME + "/key1?op=PUT", "key1User", "1234567", "{ \"key1\" : \"foo\" }");
+ response = restClient.doPut("/" + REGION_NAME + "/key1?op=PUT", "key1User", "1234567",
+ "{ \"key1\" : \"foo\" }");
assertEquals(200, restClient.getCode(response));
- response = restClient.doPut("/" + REGION_NAME + "/key1?op=REPLACE", "key1User", "1234567", json);
+ response =
+ restClient.doPut("/" + REGION_NAME + "/key1?op=REPLACE", "key1User", "1234567", json);
assertEquals(200, restClient.getCode(response));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
index b2bb040..67714ec 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/AddFreeItemToOrders.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -38,12 +36,12 @@ import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.pdx.PdxInstance;
/**
- * Gemfire function to add free items in the existing order
- * if the total price for that order is greater then the argument
+ * Gemfire function to add free items in the existing order if the total price for that order is
+ * greater then the argument
*/
-public class AddFreeItemToOrders implements Function {
-
+public class AddFreeItemToOrders implements Function {
+
public void execute(FunctionContext context) {
Cache c = null;
@@ -52,83 +50,91 @@ public class AddFreeItemToOrders implements Function {
List<Object> keys = new ArrayList<Object>();
List<Object> argsList = new ArrayList<Object>();
Object[] argsArray = null;
-
+
if (context.getArguments() instanceof Boolean) {
-
+
} else if (context.getArguments() instanceof String) {
String arg = (String) context.getArguments();
- }else if(context.getArguments() instanceof Vector ) {
-
- }else if (context.getArguments() instanceof Object[]) {
+ } else if (context.getArguments() instanceof Vector) {
+
+ } else if (context.getArguments() instanceof Object[]) {
argsArray = (Object[]) context.getArguments();
argsList = Arrays.asList(argsArray);
- }else {
+ } else {
System.out.println("AddFreeItemToOrders : Invalid Arguments");
}
-
+
try {
c = CacheFactory.getAnyInstance();
- ((GemFireCacheImpl)c).getCacheConfig().setPdxReadSerialized(true);
+ ((GemFireCacheImpl) c).getCacheConfig().setPdxReadSerialized(true);
r = c.getRegion("orders");
} catch (CacheClosedException ex) {
vals.add("NoCacheFoundResult");
context.getResultSender().lastResult(vals);
}
- String oql = "SELECT DISTINCT entry.key FROM /orders.entries entry WHERE entry.value.totalPrice > $1";
+ String oql =
+ "SELECT DISTINCT entry.key FROM /orders.entries entry WHERE entry.value.totalPrice > $1";
Object queryArgs[] = new Object[1];
queryArgs[0] = argsList.get(0);
-
+
final Query query = c.getQueryService().newQuery(oql);
SelectResults result = null;
try {
result = (SelectResults) query.execute(queryArgs);
int resultSize = result.size();
-
- if (result instanceof Collection<?>)
+
+ if (result instanceof Collection<?>)
for (Object item : result) {
keys.add(item);
}
} catch (FunctionDomainException e) {
- if(c != null)
- c.getLogger().info("Caught FunctionDomainException while executing function AddFreeItemToOrders: " + e.getMessage());
-
+ if (c != null)
+ c.getLogger()
+ .info("Caught FunctionDomainException while executing function AddFreeItemToOrders: "
+ + e.getMessage());
+
} catch (TypeMismatchException e) {
- if(c != null)
- c.getLogger().info("Caught TypeMismatchException while executing function AddFreeItemToOrders: " + e.getMessage());
+ if (c != null)
+ c.getLogger()
+ .info("Caught TypeMismatchException while executing function AddFreeItemToOrders: "
+ + e.getMessage());
} catch (NameResolutionException e) {
- if(c != null)
- c.getLogger().info("Caught NameResolutionException while executing function AddFreeItemToOrders: " + e.getMessage());
+ if (c != null)
+ c.getLogger()
+ .info("Caught NameResolutionException while executing function AddFreeItemToOrders: "
+ + e.getMessage());
} catch (QueryInvocationTargetException e) {
- if(c != null)
- c.getLogger().info("Caught QueryInvocationTargetException while executing function AddFreeItemToOrders" + e.getMessage());
+ if (c != null)
+ c.getLogger().info(
+ "Caught QueryInvocationTargetException while executing function AddFreeItemToOrders"
+ + e.getMessage());
}
-
- //class has to be in classpath.
+
+ // class has to be in classpath.
try {
- Item it = (Item)(argsList.get(1));
- for(Object key : keys)
- {
+ Item it = (Item) (argsList.get(1));
+ for (Object key : keys) {
Object obj = r.get(key);
- if(obj instanceof PdxInstance) {
- PdxInstance pi = (PdxInstance)obj;
- Order receivedOrder = (Order)pi.getObject();
+ if (obj instanceof PdxInstance) {
+ PdxInstance pi = (PdxInstance) obj;
+ Order receivedOrder = (Order) pi.getObject();
receivedOrder.addItem(it);
-
+
r.put(key, receivedOrder);
}
}
-
+
context.getResultSender().lastResult("success");
-
- }catch (ClassCastException e) {
-
+
+ } catch (ClassCastException e) {
+
context.getResultSender().lastResult("failure");
- }catch (Exception e) {
+ } catch (Exception e) {
context.getResultSender().lastResult("failure");
}
-
+
}
public String getId() {
[07/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
index 3418c21..1a46f24 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
@@ -1,18 +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
+ * 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;
@@ -41,42 +39,39 @@ import org.apache.geode.internal.cache.UserSpecifiedRegionAttributes;
import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
import org.apache.geode.internal.i18n.LocalizedStrings;
-/** Creates instances of {@link RegionAttributes}. An <code>AttributesFactory</code>
- * instance maintains state for creating <code>RegionAttributes</code> instances.
- * The setter methods are used to change the settings that will be used for
- * creating the next attributes instance with the {@link #create}
- * method. If you create a factory with the default constructor, then the
- * factory is set up to create attributes with all default settings. You can
- * also create a factory by providing a <code>RegionAttributes</code>, which
- * will set up the new factory with the settings provided in that attributes
- * instance.
+/**
+ * Creates instances of {@link RegionAttributes}. An <code>AttributesFactory</code> instance
+ * maintains state for creating <code>RegionAttributes</code> instances. The setter methods are used
+ * to change the settings that will be used for creating the next attributes instance with the
+ * {@link #create} method. If you create a factory with the default constructor, then the factory is
+ * set up to create attributes with all default settings. You can also create a factory by providing
+ * a <code>RegionAttributes</code>, which will set up the new factory with the settings provided in
+ * that attributes instance.
*
- * <p>Once a <code>RegionAttributes</code> is created, it can only be modified
- * after it has been used to create a <code>Region</code>, and then only by
- * using an {@link AttributesMutator} obtained from the region.
+ * <p>
+ * Once a <code>RegionAttributes</code> is created, it can only be modified after it has been used
+ * to create a <code>Region</code>, and then only by using an {@link AttributesMutator} obtained
+ * from the region.
*
* <h3>Attributes</h3>
* <h4>Callbacks</h4>
* <dl>
* <dt>{@link CacheLoader} [<em>default:</em> <code>null</code>, meaning no loader]</dt>
- * <dd>User-implemented plug-in for loading data on cache misses.<br>
- * {@link #setCacheLoader} {@link RegionAttributes#getCacheLoader}
- * {@link AttributesMutator#setCacheLoader}</dd>
+ * <dd>User-implemented plug-in for loading data on cache misses.<br>
+ * {@link #setCacheLoader} {@link RegionAttributes#getCacheLoader}
+ * {@link AttributesMutator#setCacheLoader}</dd>
*
* <dt>{@link CacheWriter} [<em>default:</em> <code>null</code>, meaning no writer]</dt>
- * <dd>User-implemented plug-in for intercepting cache modifications, e.g.
- * for writing to an external data source.<br>
- * {@link #setCacheWriter} {@link RegionAttributes#getCacheWriter}
- * {@link AttributesMutator#setCacheWriter}</dd>
+ * <dd>User-implemented plug-in for intercepting cache modifications, e.g. for writing to an
+ * external data source.<br>
+ * {@link #setCacheWriter} {@link RegionAttributes#getCacheWriter}
+ * {@link AttributesMutator#setCacheWriter}</dd>
*
* <dt>{@link CacheListener} [<em>default:</em> <code>null</code>, meaning no listener ]</dt>
- * <dd>User-implemented plug-in for receiving and handling cache related events.<br>
- * {@link #addCacheListener} {@link #initCacheListeners}
- * {@link #initCacheListeners}
- * {@link RegionAttributes#getCacheListeners}
- * {@link AttributesMutator#initCacheListeners}
- * {@link AttributesMutator#addCacheListener}
- * {@link AttributesMutator#removeCacheListener}</dd>
+ * <dd>User-implemented plug-in for receiving and handling cache related events.<br>
+ * {@link #addCacheListener} {@link #initCacheListeners} {@link #initCacheListeners}
+ * {@link RegionAttributes#getCacheListeners} {@link AttributesMutator#initCacheListeners}
+ * {@link AttributesMutator#addCacheListener} {@link AttributesMutator#removeCacheListener}</dd>
* </dl>
* <h4>Expiration</h4>
* <dl>
@@ -106,96 +101,80 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* </dl>
* <h4>Distribution</h4>
* <dl>
- * <dt>{@link Scope}[<em>default:</em> {@link Scope#DISTRIBUTED_NO_ACK}]
- * </dt>
- * <dd>Properties of distribution for the region, including whether it is
- * distributed at all, whether acknowledgements are required, and whether
- * distributed synchronization is required. <br>
+ * <dt>{@link Scope}[<em>default:</em> {@link Scope#DISTRIBUTED_NO_ACK}]</dt>
+ * <dd>Properties of distribution for the region, including whether it is distributed at all,
+ * whether acknowledgements are required, and whether distributed synchronization is required. <br>
* {@link #setScope} {@link RegionAttributes#getScope}</dd>
*
* <dt>EarlyAck [<em>default:</em> <code>false</code>]</dt>
- * <dd>Whether or not acks required by <code>Scope.DISTRIBUTED_ACK</code>
- * are sent after an operation is processed. If <code>true</code>
- * then remote caches will ACK before processing an operation sent
- * by the cache that has set earlyAck to <code>true</code>.
- * Note that this attribute is only meaningful on the cache that
- * is initiating an operation; it does not matter what it is set to
- * on the cache that receives the operation.<br>
- * {@link #setEarlyAck} {@link RegionAttributes#getEarlyAck}</dd>
-
+ * <dd>Whether or not acks required by <code>Scope.DISTRIBUTED_ACK</code> are sent after an
+ * operation is processed. If <code>true</code> then remote caches will ACK before processing an
+ * operation sent by the cache that has set earlyAck to <code>true</code>. Note that this attribute
+ * is only meaningful on the cache that is initiating an operation; it does not matter what it is
+ * set to on the cache that receives the operation.<br>
+ * {@link #setEarlyAck} {@link RegionAttributes#getEarlyAck}</dd>
+ *
* <dt>{@link SubscriptionAttributes} [<em>default:</em> {@link InterestPolicy#DEFAULT}]</dt>
- * <dd>How will the region in this cache subscribe to other distributed
- * instances of this region.
- * <br>
- * {@link #setSubscriptionAttributes} {@link RegionAttributes#getSubscriptionAttributes}</dd>
+ * <dd>How will the region in this cache subscribe to other distributed instances of this region.
+ * <br>
+ * {@link #setSubscriptionAttributes} {@link RegionAttributes#getSubscriptionAttributes}</dd>
*
* <dt>EnableAsyncConflation [<em>default:</em> <code>false</code>]</dt>
- * <dd>Whether or not conflation is enabled for sending
- * messages to async peers. Async peers are those whose
- * <code>async-distribution-timeout</code> gemfire.property is greater
- * than zero. AsyncConflation is ignored if the scope is
- * <code>DISTRIBUTED_ACK</code> or <code>GLOBAL</code>.
- * Conflation is only done on entry update operations. It is done
- * by dropping the earlier update from the message queue.
- * {@link #setEnableAsyncConflation} {@link RegionAttributes#getEnableAsyncConflation}</dd>
+ * <dd>Whether or not conflation is enabled for sending messages to async peers. Async peers are
+ * those whose <code>async-distribution-timeout</code> gemfire.property is greater than zero.
+ * AsyncConflation is ignored if the scope is <code>DISTRIBUTED_ACK</code> or <code>GLOBAL</code>.
+ * Conflation is only done on entry update operations. It is done by dropping the earlier update
+ * from the message queue. {@link #setEnableAsyncConflation}
+ * {@link RegionAttributes#getEnableAsyncConflation}</dd>
* <dt>poolName [<em>default:</em> <code>null</code>, meaning no pool]</dt>
- * <dd>Whether or not this region is a client that is to use
- * connections from the named pool to communicate with servers.
- * If <code>null</code>, then it is not a client.
- * If <code>non-null</code>, then the named pool will be used.
- * {@link #setPoolName} {@link RegionAttributes#getPoolName}</dd>
+ * <dd>Whether or not this region is a client that is to use connections from the named pool to
+ * communicate with servers. If <code>null</code>, then it is not a client. If
+ * <code>non-null</code>, then the named pool will be used. {@link #setPoolName}
+ * {@link RegionAttributes#getPoolName}</dd>
*
*
* <dt>EnableSubscriptionConflation [<em>default:</em> <code>false</code>]</dt>
- * <dd>Whether or not conflation is enabled for sending
- * messages from a cache server to its clients. Note: This parameter
- * is only valid for cache server to client communication. It has no
- * effect in peer to peer communication.
- * If <code>true</code>, messages will be conflated before they are
- * sent from a cache server to its clients. Only the latest value
- * will be sent.
- * Note that this attribute is only meaningful in a client server
- * topology.
- * {@link #setEnableSubscriptionConflation} {@link RegionAttributes#getEnableSubscriptionConflation}</dd>
+ * <dd>Whether or not conflation is enabled for sending messages from a cache server to its clients.
+ * Note: This parameter is only valid for cache server to client communication. It has no effect in
+ * peer to peer communication. If <code>true</code>, messages will be conflated before they are sent
+ * from a cache server to its clients. Only the latest value will be sent. Note that this attribute
+ * is only meaningful in a client server topology. {@link #setEnableSubscriptionConflation}
+ * {@link RegionAttributes#getEnableSubscriptionConflation}</dd>
* <dt>Publisher [<em>default:</em> <code>false</code>]</dt>
- * <dd>Whether or not a region is a publisher. Publishers are regions
- * that will have distributed write operations done on them.
- * If a publisher is also a replicate then it will be used
- * as the preferred source for initializing other replicates.
- * {@link #setPublisher} {@link RegionAttributes#getPublisher}</dd>
+ * <dd>Whether or not a region is a publisher. Publishers are regions that will have distributed
+ * write operations done on them. If a publisher is also a replicate then it will be used as the
+ * preferred source for initializing other replicates. {@link #setPublisher}
+ * {@link RegionAttributes#getPublisher}</dd>
* <dt>isCloningEnabled [<em>default:</em> <code>false</code>]</dt>
- * <dd>Whether or not value is cloned before appling <code>Delta</code>s
- * If <code>false</code>, value will not be cloned
- * {@link #setCloningEnabled} {@link RegionAttributes#getCloningEnabled()}</dd></dt>
+ * <dd>Whether or not value is cloned before appling <code>Delta</code>s If <code>false</code>,
+ * value will not be cloned {@link #setCloningEnabled}
+ * {@link RegionAttributes#getCloningEnabled()}</dd></dt>
* </dl>
- * <h4>Storage (see also <a href="package-summary.html#storage">package summary
- * </a>)</h4>
+ * <h4>Storage (see also <a href="package-summary.html#storage">package summary </a>)</h4>
* <dl>
* <dt>{@link DataPolicy} [<em>default:</em> <code>DataPolicy.NORMAL</code>]</dt>
- * <dd>Specifies the data storage policy.<br>
- * {@link #setDataPolicy} {@link RegionAttributes#getDataPolicy}</dd>
+ * <dd>Specifies the data storage policy.<br>
+ * {@link #setDataPolicy} {@link RegionAttributes#getDataPolicy}</dd>
*
* <dt>{@link MirrorType} [<em>default:</em> <code>MirrorType.NONE</code>]</dt>
- * <dd><em>Deprecated</em>, use DataPolicy instead.</dd>
+ * <dd><em>Deprecated</em>, use DataPolicy instead.</dd>
*
* <dt>{@link #setEvictionAttributes(EvictionAttributes) EvictionAttributes}</dt>
- * <dd>{@link EvictionAttributes} are the replacement for the deprecated and removed CapacityController interface.
- * EvictionAttributes describe the {@link EvictionAlgorithm} and the {@link EvictionAction}
- * as well as the various conditions under which the algorithm perform the action
- * e.g. when the maximum number of entries has been reached or
- * the maximum percentage of JVM heap has been consumed.
- * Setting <code>EvictionAttributes</code> installs an eviction controller
- * on the Region instantiated with the associated RegionAttributes </dd>
+ * <dd>{@link EvictionAttributes} are the replacement for the deprecated and removed
+ * CapacityController interface. EvictionAttributes describe the {@link EvictionAlgorithm} and the
+ * {@link EvictionAction} as well as the various conditions under which the algorithm perform the
+ * action e.g. when the maximum number of entries has been reached or the maximum percentage of JVM
+ * heap has been consumed. Setting <code>EvictionAttributes</code> installs an eviction controller
+ * on the Region instantiated with the associated RegionAttributes</dd>
*
* <dt>KeyConstraint [<em>default:</em> <code>null</code>, meaning no constraint]</dt>
- * <dd>The Class to constrain the keys to in the region.<br>
- * {@link #setKeyConstraint} {@link RegionAttributes#getKeyConstraint}</dd>
+ * <dd>The Class to constrain the keys to in the region.<br>
+ * {@link #setKeyConstraint} {@link RegionAttributes#getKeyConstraint}</dd>
*
* <dt>ValueConstraint [<em>default:</em> <code>null</code>, meaning no constraint]</dt>
- * <dd>The Class to constrain the values to in the region. In addition to the
- * utility of this for applications in general, a <code>valueConstraint</code>
- * is helpful for compiling queries.<br>
- * {@link #setValueConstraint} {@link RegionAttributes#getValueConstraint}</dd>
+ * <dd>The Class to constrain the values to in the region. In addition to the utility of this for
+ * applications in general, a <code>valueConstraint</code> is helpful for compiling queries.<br>
+ * {@link #setValueConstraint} {@link RegionAttributes#getValueConstraint}</dd>
*
* <dt>InitialCapacity [<em>default:</em> <code>16</code>]</dt>
* <dd>The initial capacity of the map used for storing the entries. <br>
@@ -204,156 +183,137 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* <dt>LoadFactor [<em>default:</em> <code>0.75</code>]</dt>
* <dd>The load factor of the map used for storing the entries. <br>
- * {@link java.util.HashMap} {@link #setLoadFactor}
- * {@link RegionAttributes#getLoadFactor}</dd>
+ * {@link java.util.HashMap} {@link #setLoadFactor} {@link RegionAttributes#getLoadFactor}</dd>
*
* <dt>ConcurrencyLevel [<em>default:</em> <code>16</code>]</dt>
- * <dd>The allowed concurrency among updates to values in the region is guided
- * by the <tt>concurrencyLevel</tt>, which is used as a hint for internal
- * sizing. The actual concurrency will vary. Ideally, you should choose a value
- * to accommodate as many threads as will ever concurrently modify values in the
- * region. Using a significantly higher value than you need can waste space and
- * time, and a significantly lower value can lead to thread contention. But
- * overestimates and underestimates within an order of magnitude do not usually
- * have much noticeable impact. A value of one is appropriate when it is known
- * that only one thread will modify and all others will only read. <br>
- * {@link #setConcurrencyLevel} {@link RegionAttributes#getConcurrencyLevel}
- * </dd>
+ * <dd>The allowed concurrency among updates to values in the region is guided by the
+ * <tt>concurrencyLevel</tt>, which is used as a hint for internal sizing. The actual concurrency
+ * will vary. Ideally, you should choose a value to accommodate as many threads as will ever
+ * concurrently modify values in the region. Using a significantly higher value than you need can
+ * waste space and time, and a significantly lower value can lead to thread contention. But
+ * overestimates and underestimates within an order of magnitude do not usually have much noticeable
+ * impact. A value of one is appropriate when it is known that only one thread will modify and all
+ * others will only read. <br>
+ * {@link #setConcurrencyLevel} {@link RegionAttributes#getConcurrencyLevel}</dd>
*
* <dt>ConcurrencyChecksEnabled [<em>default:</em> <code>false</code>]</dt>
- * <dd>Enables a distributed versioning algorithm that detects concurrency
- * conflicts in regions and ensures that changes to an
- * entry are not applied in a different order in other members. This can
- * cause operations to be conflated, so that some cache listeners may see
- * an event while others do not, but it guarantees that the system will
- * be consistent.
- * </dd>
+ * <dd>Enables a distributed versioning algorithm that detects concurrency conflicts in regions and
+ * ensures that changes to an entry are not applied in a different order in other members. This can
+ * cause operations to be conflated, so that some cache listeners may see an event while others do
+ * not, but it guarantees that the system will be consistent.</dd>
*
* <dt>StatisticsEnabled [<em>default:</em> <code>false</code>]</dt>
- * <dd>Whether statistics are enabled for this region. The default is disabled,
- * which conserves on memory. <br>
- * {@link #setStatisticsEnabled} {@link RegionAttributes#getStatisticsEnabled}
- * </dd>
+ * <dd>Whether statistics are enabled for this region. The default is disabled, which conserves on
+ * memory. <br>
+ * {@link #setStatisticsEnabled} {@link RegionAttributes#getStatisticsEnabled}</dd>
*
* <dt>IgnoreJTA [<em>default:</em> <code>false</code>]</dt>
- * <dd>Whether JTA transactions are ignored for this region. The
- * default is to look for and join JTA transactions for operations
- * performed on a region.
+ * <dd>Whether JTA transactions are ignored for this region. The default is to look for and join JTA
+ * transactions for operations performed on a region.
*
* <dt>DiskStoreName [<em>default:</em> <code>null</code>, meaning no disk store]</dt>
- * <dd>If not <code>null</code> then this region will write its data
- * to the named {@link DiskStore}.<br>
- * {@link #setDiskStoreName} {@link RegionAttributes#getDiskStoreName}</dd>
+ * <dd>If not <code>null</code> then this region will write its data to the named
+ * {@link DiskStore}.<br>
+ * {@link #setDiskStoreName} {@link RegionAttributes#getDiskStoreName}</dd>
*
* <dt>DiskSynchronous [<em>default:</em> <code>true</code>]</dt>
- * <dd>If <code>true</code> then any writes to disk done for this region
- * will be done synchronously. This means that they will be in the file system
- * buffer before the operation doing the write returns.<br>
- * If <code>false</code> then any writes to disk done for this region
- * will be done asynchronously. This means that they are queued up to be written
- * and when they are actually written to the file system buffer is determined
- * by the region's {@link DiskStore} configuration.
- * Asynchronous writes will be conflated if the same entry is written while a
- * previous operation for the same entry is still in the queue.<br>
- * {@link #setDiskSynchronous} {@link RegionAttributes#isDiskSynchronous}</dd>
-
+ * <dd>If <code>true</code> then any writes to disk done for this region will be done synchronously.
+ * This means that they will be in the file system buffer before the operation doing the write
+ * returns.<br>
+ * If <code>false</code> then any writes to disk done for this region will be done asynchronously.
+ * This means that they are queued up to be written and when they are actually written to the file
+ * system buffer is determined by the region's {@link DiskStore} configuration. Asynchronous writes
+ * will be conflated if the same entry is written while a previous operation for the same entry is
+ * still in the queue.<br>
+ * {@link #setDiskSynchronous} {@link RegionAttributes#isDiskSynchronous}</dd>
+ *
* <dt>PersistBackup [<em>default:</em> <code>false</code>]</dt>
- * <dd>Whether or not a persistent backup should be made of the
- * region.<br>
- * {@link #setPersistBackup} {@link RegionAttributes#getPersistBackup}</dd>
- * <dd><em>Deprecated</em>, use {@link DataPolicy#PERSISTENT_REPLICATE} or {@link DataPolicy#PERSISTENT_PARTITION} instead.</dd>
+ * <dd>Whether or not a persistent backup should be made of the region.<br>
+ * {@link #setPersistBackup} {@link RegionAttributes#getPersistBackup}</dd>
+ * <dd><em>Deprecated</em>, use {@link DataPolicy#PERSISTENT_REPLICATE} or
+ * {@link DataPolicy#PERSISTENT_PARTITION} instead.</dd>
*
- * <dt>DiskWriteAttributes [<em>default:</em> Asynchronously write to
- * disk every second (a <code>timeInterval</code> of 1000 and a
- * <code>byteThreshold</codE> of 0). <code>rollOplogs</code> is set to true and
- * <code>maxOplogSize</code> is set to 1024 MB]</dt>
- * <dd>How region data should be written to disk. Determines
- * whether data should be written synchronously or asynchronously.
- * Data that is written asynchronously can be written at a certain
- * {@linkplain DiskWriteAttributes#getTimeInterval time interval}
- * or once a certain number of {@linkplain
- * DiskWriteAttributes#getBytesThreshold bytes of data} have been
- * enqueued.<br>
- * {@link DiskWriteAttributes} {@link #setDiskWriteAttributes} {@link RegionAttributes#getDiskWriteAttributes}</dd>
- * <dd><em>Deprecated</em>, use {@link #setDiskStoreName} and {@link #setDiskSynchronous} instead.</dd>
+ * <dt>DiskWriteAttributes [<em>default:</em> Asynchronously write to disk every second (a
+ * <code>timeInterval</code> of 1000 and a <code>byteThreshold</codE> of 0). <code>rollOplogs</code>
+ * is set to true and <code>maxOplogSize</code> is set to 1024 MB]</dt>
+ * <dd>How region data should be written to disk. Determines whether data should be written
+ * synchronously or asynchronously. Data that is written asynchronously can be written at a certain
+ * {@linkplain DiskWriteAttributes#getTimeInterval time interval} or once a certain number of
+ * {@linkplain DiskWriteAttributes#getBytesThreshold bytes of data} have been enqueued.<br>
+ * {@link DiskWriteAttributes} {@link #setDiskWriteAttributes}
+ * {@link RegionAttributes#getDiskWriteAttributes}</dd>
+ * <dd><em>Deprecated</em>, use {@link #setDiskStoreName} and {@link #setDiskSynchronous}
+ * instead.</dd>
*
- * <dt>DiskDirs [<em>default:</em> Current working directory (<code>user.dir</code> {@linkplain System#getProperties system property})]</dt>
- * <dd>The directories to which the region's data are written. If
- * multiple directories are used, GemFire will attempt to distribute the
- * data evenly among them. <br>
- * {@link #setDiskDirs} {@link RegionAttributes#getDiskDirs}</dd>
- * <dd><em>Deprecated</em>, use {@link #setDiskStoreName} instead.</dd>
+ * <dt>DiskDirs [<em>default:</em> Current working directory (<code>user.dir</code>
+ * {@linkplain System#getProperties system property})]</dt>
+ * <dd>The directories to which the region's data are written. If multiple directories are used,
+ * GemFire will attempt to distribute the data evenly among them. <br>
+ * {@link #setDiskDirs} {@link RegionAttributes#getDiskDirs}</dd>
+ * <dd><em>Deprecated</em>, use {@link #setDiskStoreName} instead.</dd>
*
* <dt>DiskDirSizes [<em>default:</em> 10240 MB]</dt>
- * <dd> The size of the directory to which region's data is written.<br>
+ * <dd>The size of the directory to which region's data is written.<br>
* {@link #setDiskDirsAndSizes} {@link RegionAttributes#getDiskDirSizes}</dd>
* <dd><em>Deprecated</em>, use {@link #setDiskStoreName} instead.</dd>
*
*
- * <dt>{@link PartitionAttributes} [<em>default:</em> <code>null</code>, meaning no region partitioning]</dt>
- * <dd>How region data is partitioned among the members of the
- * distributed system.
- * <br>
- * {@link #setPartitionAttributes} {@link RegionAttributes#getPartitionAttributes}</dd>
+ * <dt>{@link PartitionAttributes} [<em>default:</em> <code>null</code>, meaning no region
+ * partitioning]</dt>
+ * <dd>How region data is partitioned among the members of the distributed system. <br>
+ * {@link #setPartitionAttributes} {@link RegionAttributes#getPartitionAttributes}</dd>
*
* <dt>{@link MembershipAttributes} [<em>default:</em> no required roles]</dt>
- * <dd>How access to the region is affected when one or more required roles
- * are missing from the region membership.
- * <br>
- * {@link #setMembershipAttributes} {@link RegionAttributes#getMembershipAttributes}</dd>
- * <dd><em>Deprecated</em>, this API is scheduled to be removed</dd>
- * </dt>
+ * <dd>How access to the region is affected when one or more required roles are missing from the
+ * region membership. <br>
+ * {@link #setMembershipAttributes} {@link RegionAttributes#getMembershipAttributes}</dd>
+ * <dd><em>Deprecated</em>, this API is scheduled to be removed</dd></dt>
* </dl>
*
* <h4>Locking</h4>
* <dl>
* <dt>LockGrantor [<em>default:</em> <code>false</code>]</dt>
- * <dd>Should this process become lock grantor for the region?</dd><br>
- * {@link #setLockGrantor} {@link RegionAttributes#isLockGrantor}
- * {@link Region#becomeLockGrantor}
+ * <dd>Should this process become lock grantor for the region?</dd><br>
+ * {@link #setLockGrantor} {@link RegionAttributes#isLockGrantor} {@link Region#becomeLockGrantor}
* </dl>
*
* <h4>Querying</h4>
* <dl>
* <dt>IndexMaintenanceSynchronous [<em>default:</em> <code>false</code>]</dt>
- * <dd>Are indexes built over in this region updated
- * synchronously when the underlying data is
- * modified?</dd><br>
- * {@link #setIndexMaintenanceSynchronous} {@link
- * RegionAttributes#getIndexMaintenanceSynchronous}
+ * <dd>Are indexes built over in this region updated synchronously when the underlying data is
+ * modified?</dd><br>
+ * {@link #setIndexMaintenanceSynchronous} {@link RegionAttributes#getIndexMaintenanceSynchronous}
* </dl>
*
- * <p>Note that the RegionAttributes are not distributed with the region.
+ * <p>
+ * Note that the RegionAttributes are not distributed with the region.
*
- * <a name="compatibility"><h3>Compatibility Rules</h3>
- * <h4>RegionAttributes Creation Constraints</h4>
- * If any of the following compatibility rules are violated when
- * {@link #create}</code> is called then an
- * {@link IllegalStateException} is thrown.
+ * <a name="compatibility">
+ * <h3>Compatibility Rules</h3>
+ * <h4>RegionAttributes Creation Constraints</h4> If any of the following compatibility rules are
+ * violated when {@link #create}</code> is called then an {@link IllegalStateException} is thrown.
* See {@link #validateAttributes}.
*
- * <a name="creationConstraints"><h3>Creation Constraints</h3>
+ * <a name="creationConstraints">
+ * <h3>Creation Constraints</h3>
* <h4>Region Creation Constraints on RegionAttributes</h4>
*
- * If any of the following rules are violated when {@link
- * Region#createSubregion createSubregion} or {@link Cache#createRegion
- * createRegion} are called, then an
- * <code>IllegalStateException</code> is thrown.
+ * If any of the following rules are violated when {@link Region#createSubregion createSubregion} or
+ * {@link Cache#createRegion createRegion} are called, then an <code>IllegalStateException</code> is
+ * thrown.
*
* <ul>
* <li>A region with <code>Scope.LOCAL</code> can only have subregions with
* <code>Scope.LOCAL</code>.</li>
- * <li><code>Scope.GLOBAL</code> is illegal if there is any other cache in
- * the distributed system that has the same region with
- * <code>Scope.DISTRIBUTED_NO_ACK</code> or <code>Scope.DISTRIBUTED_ACK</code>.
- * </li>
- * <li><code>Scope.DISTRIBUTED_ACK</code> is illegal if there is any other
- * cache in the distributed system that has the same region with
- * <code>Scope.DISTRIBUTED_NO_ACK</code> or <code>Scope.GLOBAL</code>.
- * </li>
- * <li><code>Scope.DISTRIBUTED_NO_ACK</code> is illegal if there is any other
- * cache in the distributed system that has the same region with
- * <code>Scope.DISTRIBUTED_ACK</code> or <code>Scope.GLOBAL</code>.</li>
+ * <li><code>Scope.GLOBAL</code> is illegal if there is any other cache in the distributed system
+ * that has the same region with <code>Scope.DISTRIBUTED_NO_ACK</code> or
+ * <code>Scope.DISTRIBUTED_ACK</code>.</li>
+ * <li><code>Scope.DISTRIBUTED_ACK</code> is illegal if there is any other cache in the distributed
+ * system that has the same region with <code>Scope.DISTRIBUTED_NO_ACK</code> or
+ * <code>Scope.GLOBAL</code>.</li>
+ * <li><code>Scope.DISTRIBUTED_NO_ACK</code> is illegal if there is any other cache in the
+ * distributed system that has the same region with <code>Scope.DISTRIBUTED_ACK</code> or
+ * <code>Scope.GLOBAL</code>.</li>
* </ul>
*
* @see RegionAttributes
@@ -361,130 +321,126 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* @see Region#createSubregion(String, RegionAttributes)
*
* @since GemFire 3.0
- * @deprecated as of 6.5 use {@link Cache#createRegionFactory(RegionShortcut)} or {@link ClientCache#createClientRegionFactory(ClientRegionShortcut)} instead.
+ * @deprecated as of 6.5 use {@link Cache#createRegionFactory(RegionShortcut)} or
+ * {@link ClientCache#createClientRegionFactory(ClientRegionShortcut)} instead.
*/
@SuppressWarnings("synthetic-access")
-public class AttributesFactory<K,V> {
- private final RegionAttributesImpl<K,V> regionAttributes = new RegionAttributesImpl<K,V>();
+public class AttributesFactory<K, V> {
+ private final RegionAttributesImpl<K, V> regionAttributes = new RegionAttributesImpl<K, V>();
/**
* The default disk synchronous write setting
- * <p>Current value: <code>true</code> each.
+ * <p>
+ * Current value: <code>true</code> each.
+ *
* @since GemFire 6.5
*/
public static final boolean DEFAULT_DISK_SYNCHRONOUS = true;
-
+
/**
- * Creates a new instance of AttributesFactory ready to create a
- * <code>RegionAttributes</code> with default settings.
+ * Creates a new instance of AttributesFactory ready to create a <code>RegionAttributes</code>
+ * with default settings.
*/
- public AttributesFactory() {
- }
+ public AttributesFactory() {}
/**
- * Creates a new instance of AttributesFactory ready to create a
- * <code>RegionAttributes</code> with the same settings as those in the
- * specified <code>RegionAttributes</code>.
+ * Creates a new instance of AttributesFactory ready to create a <code>RegionAttributes</code>
+ * with the same settings as those in the specified <code>RegionAttributes</code>.
*
- * @param regionAttributes
- * the <code>RegionAttributes</code> used to initialize this
- * AttributesFactory
+ * @param regionAttributes the <code>RegionAttributes</code> used to initialize this
+ * AttributesFactory
*/
@SuppressWarnings("deprecation")
- public AttributesFactory(RegionAttributes<K,V> regionAttributes) {
+ public AttributesFactory(RegionAttributes<K, V> regionAttributes) {
synchronized (this.regionAttributes) {
- this.regionAttributes.cacheListeners = new ArrayList<CacheListener<K,V>>(Arrays.asList(regionAttributes.getCacheListeners()));
+ this.regionAttributes.cacheListeners =
+ new ArrayList<CacheListener<K, V>>(Arrays.asList(regionAttributes.getCacheListeners()));
}
this.regionAttributes.cacheLoader = regionAttributes.getCacheLoader();
this.regionAttributes.cacheWriter = regionAttributes.getCacheWriter();
- this.regionAttributes.regionTimeToLive = regionAttributes
- .getRegionTimeToLive().getTimeout();
- this.regionAttributes.regionTimeToLiveExpirationAction = regionAttributes
- .getRegionTimeToLive().getAction();
- this.regionAttributes.regionIdleTimeout = regionAttributes
- .getRegionIdleTimeout().getTimeout();
- this.regionAttributes.regionIdleTimeoutExpirationAction = regionAttributes
- .getRegionIdleTimeout().getAction();
-
- this.regionAttributes.entryTimeToLive = regionAttributes
- .getEntryTimeToLive().getTimeout();
- this.regionAttributes.entryTimeToLiveExpirationAction = regionAttributes
- .getEntryTimeToLive().getAction();
- this.regionAttributes.customEntryTimeToLive = regionAttributes
- .getCustomEntryTimeToLive();
- this.regionAttributes.entryIdleTimeout = regionAttributes
- .getEntryIdleTimeout().getTimeout();
- this.regionAttributes.entryIdleTimeoutExpirationAction = regionAttributes
- .getEntryIdleTimeout().getAction();
- this.regionAttributes.customEntryIdleTimeout = regionAttributes
- .getCustomEntryIdleTimeout();
-
+ this.regionAttributes.regionTimeToLive = regionAttributes.getRegionTimeToLive().getTimeout();
+ this.regionAttributes.regionTimeToLiveExpirationAction =
+ regionAttributes.getRegionTimeToLive().getAction();
+ this.regionAttributes.regionIdleTimeout = regionAttributes.getRegionIdleTimeout().getTimeout();
+ this.regionAttributes.regionIdleTimeoutExpirationAction =
+ regionAttributes.getRegionIdleTimeout().getAction();
+
+ this.regionAttributes.entryTimeToLive = regionAttributes.getEntryTimeToLive().getTimeout();
+ this.regionAttributes.entryTimeToLiveExpirationAction =
+ regionAttributes.getEntryTimeToLive().getAction();
+ this.regionAttributes.customEntryTimeToLive = regionAttributes.getCustomEntryTimeToLive();
+ this.regionAttributes.entryIdleTimeout = regionAttributes.getEntryIdleTimeout().getTimeout();
+ this.regionAttributes.entryIdleTimeoutExpirationAction =
+ regionAttributes.getEntryIdleTimeout().getAction();
+ this.regionAttributes.customEntryIdleTimeout = regionAttributes.getCustomEntryIdleTimeout();
+
this.regionAttributes.scope = regionAttributes.getScope();
this.regionAttributes.dataPolicy = regionAttributes.getDataPolicy();
this.regionAttributes.statisticsEnabled = regionAttributes.getStatisticsEnabled();
this.regionAttributes.ignoreJTA = regionAttributes.getIgnoreJTA();
this.regionAttributes.keyConstraint = regionAttributes.getKeyConstraint();
- this.regionAttributes.valueConstraint = regionAttributes
- .getValueConstraint();
- this.regionAttributes.initialCapacity = regionAttributes
- .getInitialCapacity();
+ this.regionAttributes.valueConstraint = regionAttributes.getValueConstraint();
+ this.regionAttributes.initialCapacity = regionAttributes.getInitialCapacity();
this.regionAttributes.loadFactor = regionAttributes.getLoadFactor();
- this.regionAttributes.concurrencyLevel = regionAttributes
- .getConcurrencyLevel();
+ this.regionAttributes.concurrencyLevel = regionAttributes.getConcurrencyLevel();
this.regionAttributes.concurrencyChecksEnabled = regionAttributes.getConcurrencyChecksEnabled();
this.regionAttributes.earlyAck = regionAttributes.getEarlyAck();
this.regionAttributes.diskStoreName = regionAttributes.getDiskStoreName();
if (this.regionAttributes.diskStoreName == null) {
- this.regionAttributes.diskWriteAttributes = regionAttributes
- .getDiskWriteAttributes();
+ this.regionAttributes.diskWriteAttributes = regionAttributes.getDiskWriteAttributes();
this.regionAttributes.diskDirs = regionAttributes.getDiskDirs();
this.regionAttributes.diskSizes = regionAttributes.getDiskDirSizes();
}
this.regionAttributes.diskSynchronous = regionAttributes.isDiskSynchronous();
- this.regionAttributes.indexMaintenanceSynchronous = regionAttributes
- .getIndexMaintenanceSynchronous();
- this.regionAttributes.partitionAttributes = regionAttributes
- .getPartitionAttributes();
- this.regionAttributes.evictionAttributes = (EvictionAttributesImpl)regionAttributes
- .getEvictionAttributes();
+ this.regionAttributes.indexMaintenanceSynchronous =
+ regionAttributes.getIndexMaintenanceSynchronous();
+ this.regionAttributes.partitionAttributes = regionAttributes.getPartitionAttributes();
+ this.regionAttributes.evictionAttributes =
+ (EvictionAttributesImpl) regionAttributes.getEvictionAttributes();
this.regionAttributes.membershipAttributes = regionAttributes.getMembershipAttributes();
this.regionAttributes.subscriptionAttributes = regionAttributes.getSubscriptionAttributes();
- this.regionAttributes.evictionAttributes = (EvictionAttributesImpl) regionAttributes.getEvictionAttributes();
+ this.regionAttributes.evictionAttributes =
+ (EvictionAttributesImpl) regionAttributes.getEvictionAttributes();
this.regionAttributes.publisher = regionAttributes.getPublisher();
this.regionAttributes.enableAsyncConflation = regionAttributes.getEnableAsyncConflation();
- this.regionAttributes.enableSubscriptionConflation = regionAttributes.getEnableSubscriptionConflation();
+ this.regionAttributes.enableSubscriptionConflation =
+ regionAttributes.getEnableSubscriptionConflation();
this.regionAttributes.poolName = regionAttributes.getPoolName();
this.regionAttributes.isCloningEnabled = regionAttributes.getCloningEnabled();
this.regionAttributes.multicastEnabled = regionAttributes.getMulticastEnabled();
- this.regionAttributes.gatewaySenderIds = new CopyOnWriteArraySet<String>(regionAttributes.getGatewaySenderIds());
- this.regionAttributes.asyncEventQueueIds = new CopyOnWriteArraySet<String>(regionAttributes.getAsyncEventQueueIds());
+ this.regionAttributes.gatewaySenderIds =
+ new CopyOnWriteArraySet<String>(regionAttributes.getGatewaySenderIds());
+ this.regionAttributes.asyncEventQueueIds =
+ new CopyOnWriteArraySet<String>(regionAttributes.getAsyncEventQueueIds());
this.regionAttributes.isLockGrantor = regionAttributes.isLockGrantor(); // fix for bug 47067
if (regionAttributes instanceof UserSpecifiedRegionAttributes) {
- this.regionAttributes.setIndexes(((UserSpecifiedRegionAttributes<K,V>) regionAttributes).getIndexes());
+ this.regionAttributes
+ .setIndexes(((UserSpecifiedRegionAttributes<K, V>) regionAttributes).getIndexes());
}
if (regionAttributes instanceof UserSpecifiedRegionAttributes) {
- // Selectively set has* fields to true, propigating those non-default
+ // Selectively set has* fields to true, propigating those non-default
// (aka user specified) fields as such
- UserSpecifiedRegionAttributes<K,V> nonDefault = (UserSpecifiedRegionAttributes<K,V>) regionAttributes;
+ UserSpecifiedRegionAttributes<K, V> nonDefault =
+ (UserSpecifiedRegionAttributes<K, V>) regionAttributes;
this.regionAttributes.initHasFields(nonDefault);
this.regionAttributes.requiresPoolName = nonDefault.requiresPoolName;
} else {
// Set all fields to false, essentially starting with a new set of defaults
this.regionAttributes.setAllHasFields(false);
-
-
-
-//
-// // Special Partitioned Region handling by
-// // pretending the user didn't explicitly ask for the default scope
-// if (AbstractRegion.DEFAULT_SCOPE.equals(this.regionAttributes.getScope())) {
-// this.regionAttributes.setHasScope(false);
-// }
- }
-
+
+
+
+ //
+ // // Special Partitioned Region handling by
+ // // pretending the user didn't explicitly ask for the default scope
+ // if (AbstractRegion.DEFAULT_SCOPE.equals(this.regionAttributes.getScope())) {
+ // this.regionAttributes.setHasScope(false);
+ // }
+ }
+
this.regionAttributes.compressor = regionAttributes.getCompressor();
this.regionAttributes.offHeap = regionAttributes.getOffHeap();
}
@@ -494,12 +450,10 @@ public class AttributesFactory<K,V> {
/**
* Sets the cache loader for the next <code>RegionAttributes</code> created.
*
- * @param cacheLoader
- * the cache loader or null if no loader
+ * @param cacheLoader the cache loader or null if no loader
* @throws IllegalStateException if this region has a {@link #setPoolName pool name set}
*/
- public void setCacheLoader(CacheLoader<K,V> cacheLoader)
- {
+ public void setCacheLoader(CacheLoader<K, V> cacheLoader) {
this.regionAttributes.cacheLoader = cacheLoader;
this.regionAttributes.setHasCacheLoader(true);
}
@@ -507,28 +461,28 @@ public class AttributesFactory<K,V> {
/**
* Sets the cache writer for the next <code>RegionAttributes</code> created.
*
- * @param cacheWriter
- * the cache writer or null if no cache writer
+ * @param cacheWriter the cache writer or null if no cache writer
* @throws IllegalStateException if this region has a {@link #setPoolName pool name set}
*/
- public void setCacheWriter(CacheWriter<K,V> cacheWriter)
- {
+ public void setCacheWriter(CacheWriter<K, V> cacheWriter) {
this.regionAttributes.cacheWriter = cacheWriter;
this.regionAttributes.setHasCacheWriter(true);
}
- /** Sets the CacheListener for the next <code>RegionAttributes</code> created.
- * Any existing cache listeners on this factory are removed.
+ /**
+ * Sets the CacheListener for the next <code>RegionAttributes</code> created. Any existing cache
+ * listeners on this factory are removed.
+ *
* @param aListener a user defined CacheListener, null if no listener
* @deprecated as of GemFire 5.0, use {@link #addCacheListener} instead.
*/
@Deprecated
- public void setCacheListener(CacheListener<K,V> aListener) {
- ArrayList<CacheListener<K,V>> col;
+ public void setCacheListener(CacheListener<K, V> aListener) {
+ ArrayList<CacheListener<K, V>> col;
if (aListener == null) {
col = null;
} else {
- col = new ArrayList<CacheListener<K,V>>(1);
+ col = new ArrayList<CacheListener<K, V>>(1);
col.add(aListener);
}
synchronized (this.regionAttributes) {
@@ -536,36 +490,44 @@ public class AttributesFactory<K,V> {
}
this.regionAttributes.setHasCacheListeners(true);
}
+
/**
* Adds a cache listener to the end of the list of cache listeners on this factory.
+ *
* @param aListener the cache listener to add to the factory.
* @throws IllegalArgumentException if <code>aListener</code> is null
* @since GemFire 5.0
*/
- public void addCacheListener(CacheListener<K,V> aListener) {
+ public void addCacheListener(CacheListener<K, V> aListener) {
if (aListener == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_ADDCACHELISTENER_PARAMETER_WAS_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_ADDCACHELISTENER_PARAMETER_WAS_NULL
+ .toLocalizedString());
}
synchronized (this.regionAttributes) {
this.regionAttributes.addCacheListener(aListener);
}
}
+
/**
* Removes all cache listeners and then adds each listener in the specified array.
+ *
* @param newListeners a possibly null or empty array of listeners to add to this factory.
* @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
* @since GemFire 5.0
*/
- public void initCacheListeners(CacheListener<K,V>[] newListeners) {
+ public void initCacheListeners(CacheListener<K, V>[] newListeners) {
synchronized (this.regionAttributes) {
if (newListeners == null || newListeners.length == 0) {
this.regionAttributes.cacheListeners = null;
} else {
- List<CacheListener<K,V>> nl = Arrays.asList(newListeners);
+ List<CacheListener<K, V>> nl = Arrays.asList(newListeners);
if (nl.contains(null)) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_INITCACHELISTENERS_PARAMETER_HAD_A_NULL_ELEMENT.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_INITCACHELISTENERS_PARAMETER_HAD_A_NULL_ELEMENT
+ .toLocalizedString());
}
- this.regionAttributes.cacheListeners = new ArrayList<CacheListener<K,V>>(nl);
+ this.regionAttributes.cacheListeners = new ArrayList<CacheListener<K, V>>(nl);
}
}
this.regionAttributes.setHasCacheListeners(true);
@@ -576,126 +538,107 @@ public class AttributesFactory<K,V> {
/**
* Sets the idleTimeout expiration attributes for region entries for the next
- * <code>RegionAttributes</code> created.
- * Default is 0 which indicates no expiration of this type.
+ * <code>RegionAttributes</code> created. Default is 0 which indicates no expiration of this type.
*
- * @param idleTimeout
- * the idleTimeout ExpirationAttributes for entries in this region
- * @throws IllegalArgumentException
- * if idleTimeout is null
+ * @param idleTimeout the idleTimeout ExpirationAttributes for entries in this region
+ * @throws IllegalArgumentException if idleTimeout is null
*/
- public void setEntryIdleTimeout(ExpirationAttributes idleTimeout)
- {
+ public void setEntryIdleTimeout(ExpirationAttributes idleTimeout) {
if (idleTimeout == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_IDLETIMEOUT_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_IDLETIMEOUT_MUST_NOT_BE_NULL.toLocalizedString());
}
this.regionAttributes.entryIdleTimeout = idleTimeout.getTimeout();
- this.regionAttributes.entryIdleTimeoutExpirationAction = idleTimeout
- .getAction();
+ this.regionAttributes.entryIdleTimeoutExpirationAction = idleTimeout.getAction();
this.regionAttributes.setHasEntryIdleTimeout(true);
}
/**
- * Sets the idleTimeout CustomExpiry for the next <code>RegionAttributes</code>
- * created.
+ * Sets the idleTimeout CustomExpiry for the next <code>RegionAttributes</code> created.
*
* @param custom the CustomExpiry to use; null means none will be used.
*/
- public void setCustomEntryIdleTimeout(CustomExpiry<K,V> custom) {
+ public void setCustomEntryIdleTimeout(CustomExpiry<K, V> custom) {
this.regionAttributes.customEntryIdleTimeout = custom;
this.regionAttributes.setHasCustomEntryIdleTimeout(true);
}
-
+
/**
* Sets the timeToLive expiration attributes for region entries for the next
- * <code>RegionAttributes</code> created.
- * Default is 0 which indicates no expiration of this type.
+ * <code>RegionAttributes</code> created. Default is 0 which indicates no expiration of this type.
*
- * @param timeToLive
- * the timeToLive ExpirationAttributes for entries in this region
- * @throws IllegalArgumentException
- * if timeToLive is null
+ * @param timeToLive the timeToLive ExpirationAttributes for entries in this region
+ * @throws IllegalArgumentException if timeToLive is null
*/
- public void setEntryTimeToLive(ExpirationAttributes timeToLive)
- {
+ public void setEntryTimeToLive(ExpirationAttributes timeToLive) {
if (timeToLive == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_TIMETOLIVE_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_TIMETOLIVE_MUST_NOT_BE_NULL.toLocalizedString());
}
this.regionAttributes.entryTimeToLive = timeToLive.getTimeout();
- this.regionAttributes.entryTimeToLiveExpirationAction = timeToLive
- .getAction();
+ this.regionAttributes.entryTimeToLiveExpirationAction = timeToLive.getAction();
this.regionAttributes.setHasEntryTimeToLive(true);
}
/**
- * Sets the custom timeToLive for the next <code>RegionAttributes</code>
- * created.
+ * Sets the custom timeToLive for the next <code>RegionAttributes</code> created.
*
- * @param custom the CustomExpiry to use, none if the default for the region
- * is to be used.
+ * @param custom the CustomExpiry to use, none if the default for the region is to be used.
*/
- public void setCustomEntryTimeToLive(CustomExpiry<K,V> custom) {
+ public void setCustomEntryTimeToLive(CustomExpiry<K, V> custom) {
this.regionAttributes.customEntryTimeToLive = custom;
this.regionAttributes.setHasCustomEntryTimeToLive(true);
}
-
+
/**
- * Sets the idleTimeout expiration attributes for the region itself for the
- * next <code>RegionAttributes</code> created.
- * Default is 0 which indicates no expiration of this type is set.
+ * Sets the idleTimeout expiration attributes for the region itself for the next
+ * <code>RegionAttributes</code> created. Default is 0 which indicates no expiration of this type
+ * is set.
*
- * @param idleTimeout
- * the ExpirationAttributes for this region idleTimeout
- * @throws IllegalArgumentException
- * if idleTimeout is null
+ * @param idleTimeout the ExpirationAttributes for this region idleTimeout
+ * @throws IllegalArgumentException if idleTimeout is null
*/
- public void setRegionIdleTimeout(ExpirationAttributes idleTimeout)
- {
+ public void setRegionIdleTimeout(ExpirationAttributes idleTimeout) {
if (idleTimeout == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_IDLETIMEOUT_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_IDLETIMEOUT_MUST_NOT_BE_NULL.toLocalizedString());
}
this.regionAttributes.regionIdleTimeout = idleTimeout.getTimeout();
- this.regionAttributes.regionIdleTimeoutExpirationAction = idleTimeout
- .getAction();
+ this.regionAttributes.regionIdleTimeoutExpirationAction = idleTimeout.getAction();
this.regionAttributes.setHasRegionIdleTimeout(true);
}
-
+
/**
- * Sets the timeToLive expiration attributes for the region itself for the
- * next <code>RegionAttributes</code> created.
- * Default is 0 i.e. no expiration of this type.
+ * Sets the timeToLive expiration attributes for the region itself for the next
+ * <code>RegionAttributes</code> created. Default is 0 i.e. no expiration of this type.
*
- * @param timeToLive
- * the ExpirationAttributes for this region timeToLive
- * @throws IllegalArgumentException
- * if timeToLive is null
+ * @param timeToLive the ExpirationAttributes for this region timeToLive
+ * @throws IllegalArgumentException if timeToLive is null
*/
- public void setRegionTimeToLive(ExpirationAttributes timeToLive)
- {
+ public void setRegionTimeToLive(ExpirationAttributes timeToLive) {
if (timeToLive == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_TIMETOLIVE_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_TIMETOLIVE_MUST_NOT_BE_NULL.toLocalizedString());
}
this.regionAttributes.regionTimeToLive = timeToLive.getTimeout();
- this.regionAttributes.regionTimeToLiveExpirationAction = timeToLive
- .getAction();
+ this.regionAttributes.regionTimeToLiveExpirationAction = timeToLive.getAction();
this.regionAttributes.setHasRegionTimeToLive(true);
}
// DISTRIBUTION ATTRIBUTES
/**
- * Sets the scope for the next <code>RegionAttributes</code> created.
- * Default scope is DISTRIBUTED_NO_ACK. Refer gemfire documentation for more details on this.
- * @param scopeType
- * the type of Scope to use for the region
- * @throws IllegalArgumentException
- * if scopeType is null
+ * Sets the scope for the next <code>RegionAttributes</code> created. Default scope is
+ * DISTRIBUTED_NO_ACK. Refer gemfire documentation for more details on this.
+ *
+ * @param scopeType the type of Scope to use for the region
+ * @throws IllegalArgumentException if scopeType is null
*/
- public void setScope(Scope scopeType)
- {
+ public void setScope(Scope scopeType) {
if (scopeType == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_SCOPETYPE_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_SCOPETYPE_MUST_NOT_BE_NULL.toLocalizedString());
}
this.regionAttributes.setScope(scopeType);
}
@@ -703,24 +646,25 @@ public class AttributesFactory<K,V> {
// STORAGE ATTRIBUTES
/**
- * Sets the EvictionController for the next <code>RegionAttributes</code>
- * created. Use one of the creation methods on {@link EvictionAttributes} e.g.
- * {@link EvictionAttributes#createLRUHeapAttributes()} to create the desired
- * instance for this <code>AttributesFactory</code>
+ * Sets the EvictionController for the next <code>RegionAttributes</code> created. Use one of the
+ * creation methods on {@link EvictionAttributes} e.g.
+ * {@link EvictionAttributes#createLRUHeapAttributes()} to create the desired instance for this
+ * <code>AttributesFactory</code>
*
- * @param evictAttrs
- * Explains how and when eviction occurs in the Region.
+ * @param evictAttrs Explains how and when eviction occurs in the Region.
*/
- public void setEvictionAttributes(EvictionAttributes evictAttrs) {
- if (evictAttrs != null) {
- this.regionAttributes.evictionAttributes = (EvictionAttributesImpl) evictAttrs;
- } else {
- this.regionAttributes.evictionAttributes = new EvictionAttributesImpl();
- }
- this.regionAttributes.setHasEvictionAttributes(true);
- }
-
- /** Sets the mirror type for the next <code>RegionAttributes</code> created.
+ public void setEvictionAttributes(EvictionAttributes evictAttrs) {
+ if (evictAttrs != null) {
+ this.regionAttributes.evictionAttributes = (EvictionAttributesImpl) evictAttrs;
+ } else {
+ this.regionAttributes.evictionAttributes = new EvictionAttributesImpl();
+ }
+ this.regionAttributes.setHasEvictionAttributes(true);
+ }
+
+ /**
+ * Sets the mirror type for the next <code>RegionAttributes</code> created.
+ *
* @param mirrorType The type of mirroring to use for the region
* @throws IllegalArgumentException if mirrorType is null
* @deprecated use {@link #setDataPolicy} instead.
@@ -728,7 +672,8 @@ public class AttributesFactory<K,V> {
@Deprecated
public void setMirrorType(MirrorType mirrorType) {
if (mirrorType == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_MIRRORTYPE_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_MIRRORTYPE_MUST_NOT_BE_NULL.toLocalizedString());
}
DataPolicy dp = mirrorType.getDataPolicy();
if (dp.withReplication()) {
@@ -745,19 +690,24 @@ public class AttributesFactory<K,V> {
}
}
}
- /** Sets the data policy for the next <code>RegionAttributes</code> created.
- * Default data policy is 'Normal'. Please refer gemfire documentation for more details on this.
+
+ /**
+ * Sets the data policy for the next <code>RegionAttributes</code> created. Default data policy is
+ * 'Normal'. Please refer gemfire documentation for more details on this.
+ *
* @param dataPolicy The data policy to use for the region
* @throws IllegalArgumentException if dataPolicy is null
*/
public void setDataPolicy(DataPolicy dataPolicy) {
if (dataPolicy == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_DATAPOLICY_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_DATAPOLICY_MUST_NOT_BE_NULL.toLocalizedString());
}
if (this.regionAttributes.partitionAttributes != null) {
- if ( !PartitionedRegionHelper.ALLOWED_DATA_POLICIES.contains(dataPolicy) ) {
- throw new IllegalStateException( LocalizedStrings.AttributesFactory_DATA_POLICIES_OTHER_THAN_0_ARE_NOT_SUPPORTED_FOR_PARTITIONED_REGIONS
- .toLocalizedString(PartitionedRegionHelper.ALLOWED_DATA_POLICIES));
+ if (!PartitionedRegionHelper.ALLOWED_DATA_POLICIES.contains(dataPolicy)) {
+ throw new IllegalStateException(
+ LocalizedStrings.AttributesFactory_DATA_POLICIES_OTHER_THAN_0_ARE_NOT_SUPPORTED_FOR_PARTITIONED_REGIONS
+ .toLocalizedString(PartitionedRegionHelper.ALLOWED_DATA_POLICIES));
}
}
this.regionAttributes.setDataPolicy(dataPolicy);
@@ -765,32 +715,38 @@ public class AttributesFactory<K,V> {
- /** Sets the key constraint for the next <code>RegionAttributes</code> created.
- * Keys in the region will be constrained to this class (or subclass).
- * Any attempt to store a key of an incompatible type in the region will
- * cause a <code>ClassCastException</code> to be thrown.
+ /**
+ * Sets the key constraint for the next <code>RegionAttributes</code> created. Keys in the region
+ * will be constrained to this class (or subclass). Any attempt to store a key of an incompatible
+ * type in the region will cause a <code>ClassCastException</code> to be thrown.
+ *
* @param keyConstraint The Class to constrain the keys to, or null if no constraint
- * @throws IllegalArgumentException if <code>keyConstraint</code> is a class
- * denoting a primitive type
+ * @throws IllegalArgumentException if <code>keyConstraint</code> is a class denoting a primitive
+ * type
*/
public void setKeyConstraint(Class<K> keyConstraint) {
if (keyConstraint != null && keyConstraint.isPrimitive())
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_KEYCONSTRAINT_MUST_NOT_BE_A_PRIMITIVE_TYPE.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_KEYCONSTRAINT_MUST_NOT_BE_A_PRIMITIVE_TYPE
+ .toLocalizedString());
this.regionAttributes.keyConstraint = keyConstraint;
this.regionAttributes.setHasKeyConstraint(true);
}
- /** Sets the value constraint for the next <code>RegionAttributes</code> created.
- * Values in the region will be constrained to this class (or subclass).
- * Any attempt to store a value of an incompatible type in the region will
- * cause a <code>ClassCastException</code> to be thrown.
+ /**
+ * Sets the value constraint for the next <code>RegionAttributes</code> created. Values in the
+ * region will be constrained to this class (or subclass). Any attempt to store a value of an
+ * incompatible type in the region will cause a <code>ClassCastException</code> to be thrown.
+ *
* @param valueConstraint The Class to constrain the values to, or null if no constraint
- * @throws IllegalArgumentException if <code>valueConstraint</code> is a class
- * denoting a primitive type
+ * @throws IllegalArgumentException if <code>valueConstraint</code> is a class denoting a
+ * primitive type
*/
public void setValueConstraint(Class<V> valueConstraint) {
if (valueConstraint != null && valueConstraint.isPrimitive())
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_VALUECONSTRAINT_MUST_NOT_BE_A_PRIMITIVE_TYPE.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_VALUECONSTRAINT_MUST_NOT_BE_A_PRIMITIVE_TYPE
+ .toLocalizedString());
this.regionAttributes.valueConstraint = valueConstraint;
this.regionAttributes.setHasValueConstraint(true);
}
@@ -798,52 +754,57 @@ public class AttributesFactory<K,V> {
// MAP ATTRIBUTES
- /** Sets the entry initial capacity for the next <code>RegionAttributes</code>
- * created. This value
- * is used in initializing the map that holds the entries.
- * Default is 16.
+ /**
+ * Sets the entry initial capacity for the next <code>RegionAttributes</code> created. This value
+ * is used in initializing the map that holds the entries. Default is 16.
+ *
* @param initialCapacity the initial capacity of the entry map
* @throws IllegalArgumentException if initialCapacity is negative.
* @see java.util.HashMap
*/
public void setInitialCapacity(int initialCapacity) {
if (initialCapacity < 0)
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_INITIALCAPACITY_MUST_BE_0.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_INITIALCAPACITY_MUST_BE_0.toLocalizedString());
this.regionAttributes.initialCapacity = initialCapacity;
this.regionAttributes.setHasInitialCapacity(true);
}
- /** Sets the entry load factor for the next <code>RegionAttributes</code>
- * created. This value is
- * used in initializing the map that holds the entries.
- * Default is 0.75.
+ /**
+ * Sets the entry load factor for the next <code>RegionAttributes</code> created. This value is
+ * used in initializing the map that holds the entries. Default is 0.75.
+ *
* @param loadFactor the load factor of the entry map
* @throws IllegalArgumentException if loadFactor is nonpositive
* @see java.util.HashMap
*/
public void setLoadFactor(float loadFactor) {
if (loadFactor <= 0)
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_LOADFACTOR_MUST_BE_0_VALUE_IS_0.toLocalizedString(new Float(loadFactor)));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_LOADFACTOR_MUST_BE_0_VALUE_IS_0
+ .toLocalizedString(new Float(loadFactor)));
this.regionAttributes.loadFactor = loadFactor;
this.regionAttributes.setHasLoadFactor(true);
}
- /** Sets the concurrency level of the next <code>RegionAttributes</code>
- * created. This value is used in initializing the map that holds the entries.
- * Default is 16.
+ /**
+ * Sets the concurrency level of the next <code>RegionAttributes</code> created. This value is
+ * used in initializing the map that holds the entries. Default is 16.
+ *
* @param concurrencyLevel the concurrency level of the entry map
* @throws IllegalArgumentException if concurrencyLevel is nonpositive
*/
public void setConcurrencyLevel(int concurrencyLevel) {
if (concurrencyLevel <= 0)
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_CONCURRENCYLEVEL_MUST_BE_0.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_CONCURRENCYLEVEL_MUST_BE_0.toLocalizedString());
this.regionAttributes.concurrencyLevel = concurrencyLevel;
this.regionAttributes.setHasConcurrencyLevel(true);
}
-
+
/**
- * Enables or disabled concurrent modification checks. Concurrency checks are enabled
- * by default.
+ * Enables or disabled concurrent modification checks. Concurrency checks are enabled by default.
+ *
* @since GemFire 7.0
* @param concurrencyChecksEnabled whether to perform concurrency checks on operations
*/
@@ -853,8 +814,7 @@ public class AttributesFactory<K,V> {
}
/**
- * Sets whether or not a persistent backup should be made of the
- * region.
+ * Sets whether or not a persistent backup should be made of the region.
*
* @since GemFire 3.2
* @deprecated as of GemFire 5.0, use {@link DataPolicy#PERSISTENT_REPLICATE} instead
@@ -880,18 +840,19 @@ public class AttributesFactory<K,V> {
}
}
}
+
/**
* Sets whether or not acks are sent after an operation is processed.
*
* @since GemFire 4.1
- * @deprecated This setting no longer has any effect.
+ * @deprecated This setting no longer has any effect.
*/
@Deprecated
public void setEarlyAck(boolean earlyAck) {
this.regionAttributes.earlyAck = earlyAck;
this.regionAttributes.setHasEarlyAck(true);
}
-
+
/**
* Sets whether or not this region should be considered a publisher.
*
@@ -900,14 +861,13 @@ public class AttributesFactory<K,V> {
*/
@Deprecated
public void setPublisher(boolean v) {
-// this.regionAttributes.publisher = v;
-// this.regionAttributes.setHasPublisher(true);
+ // this.regionAttributes.publisher = v;
+ // this.regionAttributes.setHasPublisher(true);
}
/**
- * Sets whether or not conflation is enabled for sending messages
- * to async peers.
- * Default value is false.
+ * Sets whether or not conflation is enabled for sending messages to async peers. Default value is
+ * false.
*
* @since GemFire 4.2.3
*/
@@ -915,12 +875,11 @@ public class AttributesFactory<K,V> {
this.regionAttributes.enableAsyncConflation = enableAsyncConflation;
this.regionAttributes.setHasEnableAsyncConflation(true);
}
-
+
/**
- * Sets whether or not conflation is enabled for sending messages
- * from a cache server to its clients.
- * Default is false.
+ * Sets whether or not conflation is enabled for sending messages from a cache server to its
+ * clients. Default is false.
*
* @since GemFire 5.0
*/
@@ -931,37 +890,41 @@ public class AttributesFactory<K,V> {
/**
* adds a gateway sender to the end of list of gateway senders on this factory
+ *
* @param gatewaySenderId
* @throws IllegalArgumentException if <code>gatewaySender</code> is null
* @since GemFire 7.0
*/
public void addGatewaySenderId(String gatewaySenderId) {
if (gatewaySenderId == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_GATEWAY_SENDER_ID_IS_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_GATEWAY_SENDER_ID_IS_NULL.toLocalizedString());
}
synchronized (this.regionAttributes) {
this.regionAttributes.addGatewaySenderId(gatewaySenderId);
}
}
-
+
/**
* Adds a AsyncEventQueue to the end of list of async event queues on this factory
+ *
* @param asyncEventQueueId
* @throws IllegalArgumentException if <code>gatewaySender</code> is null
* @since GemFire 7.0
*/
public void addAsyncEventQueueId(String asyncEventQueueId) {
if (asyncEventQueueId == null) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_GATEWAY_SENDER_ID_IS_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_GATEWAY_SENDER_ID_IS_NULL.toLocalizedString());
}
synchronized (this.regionAttributes) {
this.regionAttributes.addAsyncEventQueueId(asyncEventQueueId);
}
}
-
+
/**
- * Sets whether or not conflation is enabled for sending messages
- * from a cache server to its clients.
+ * Sets whether or not conflation is enabled for sending messages from a cache server to its
+ * clients.
*
* @since GemFire 5.0
* @deprecated as of 5.7 use {@link #setEnableSubscriptionConflation} instead.
@@ -972,11 +935,11 @@ public class AttributesFactory<K,V> {
}
/**
- * Sets whether or not conflation is enabled for sending messages
- * from a cache server to its clients.
+ * Sets whether or not conflation is enabled for sending messages from a cache server to its
+ * clients.
*
* @deprecated as of GemFire 5.0, use {@link #setEnableSubscriptionConflation}
- */
+ */
@Deprecated
public void setEnableConflation(boolean enableBridgeConflation) {
setEnableSubscriptionConflation(enableBridgeConflation);
@@ -993,8 +956,9 @@ public class AttributesFactory<K,V> {
@Deprecated
public void setDiskWriteAttributes(DiskWriteAttributes attrs) {
if (this.regionAttributes.getDiskStoreName() != null) {
- throw new IllegalStateException(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
- .toLocalizedString(new Object[] {"setDiskWriteAttributes", this.regionAttributes.getDiskStoreName()}));
+ throw new IllegalStateException(
+ LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1.toLocalizedString(
+ new Object[] {"setDiskWriteAttributes", this.regionAttributes.getDiskStoreName()}));
}
this.regionAttributes.diskWriteAttributes = attrs;
this.regionAttributes.setHasDiskWriteAttributes(true);
@@ -1005,8 +969,7 @@ public class AttributesFactory<K,V> {
}
/**
- * Sets the directories with
- * the default size of 10240 MB to which the region's data is written
+ * Sets the directories with the default size of 10240 MB to which the region's data is written
*
* @throws GemFireIOException if a directory does not exist
*
@@ -1016,13 +979,14 @@ public class AttributesFactory<K,V> {
@Deprecated
public void setDiskDirs(File[] diskDirs) {
if (this.regionAttributes.getDiskStoreName() != null) {
- throw new IllegalStateException(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
- .toLocalizedString(new Object[] {"setDiskDirs", this.regionAttributes.getDiskStoreName()}));
+ throw new IllegalStateException(
+ LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1.toLocalizedString(
+ new Object[] {"setDiskDirs", this.regionAttributes.getDiskStoreName()}));
}
DiskStoreFactoryImpl.checkIfDirectoriesExist(diskDirs);
this.regionAttributes.diskDirs = diskDirs;
this.regionAttributes.diskSizes = new int[diskDirs.length];
- for (int i=0; i < diskDirs.length; i++) {
+ for (int i = 0; i < diskDirs.length; i++) {
this.regionAttributes.diskSizes[i] = DiskStoreFactory.DEFAULT_DISK_DIR_SIZE;
}
if (!this.regionAttributes.hasDiskWriteAttributes()
@@ -1035,65 +999,72 @@ public class AttributesFactory<K,V> {
}
/**
- * Sets the DiskStore name attribute.
- * This causes the region to use the {@link DiskStore}.
+ * Sets the DiskStore name attribute. This causes the region to use the {@link DiskStore}.
+ *
* @param name the name of the diskstore
* @since GemFire 6.5
*/
public void setDiskStoreName(String name) {
- if (this.regionAttributes.hasDiskDirs() || this.regionAttributes.hasDiskWriteAttributes()) {
- throw new IllegalStateException(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
- .toLocalizedString(new Object[] {"setDiskDirs or setDiskWriteAttributes", name}));
+ if (this.regionAttributes.hasDiskDirs() || this.regionAttributes.hasDiskWriteAttributes()) {
+ throw new IllegalStateException(
+ LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
+ .toLocalizedString(new Object[] {"setDiskDirs or setDiskWriteAttributes", name}));
}
this.regionAttributes.diskStoreName = name;
this.regionAttributes.setHasDiskStoreName(true);
}
-
+
/**
- * Sets whether or not the writing to the disk is synchronous.
- * Default is true.
+ * Sets whether or not the writing to the disk is synchronous. Default is true.
*
- * @param isSynchronous
- * boolean if true indicates synchronous writes
+ * @param isSynchronous boolean if true indicates synchronous writes
* @since GemFire 6.5
*/
@SuppressWarnings("deprecation")
- public void setDiskSynchronous(boolean isSynchronous)
- {
+ public void setDiskSynchronous(boolean isSynchronous) {
this.regionAttributes.diskSynchronous = isSynchronous;
this.regionAttributes.setHasDiskSynchronous(true);
if (this.regionAttributes.hasDiskWriteAttributes()) {
- DiskWriteAttributesFactory dwaf = new DiskWriteAttributesFactory(this.regionAttributes.diskWriteAttributes);
+ DiskWriteAttributesFactory dwaf =
+ new DiskWriteAttributesFactory(this.regionAttributes.diskWriteAttributes);
dwaf.setSynchronous(isSynchronous);
this.regionAttributes.diskWriteAttributes = dwaf.create();
} else {
if (isSynchronous) {
- this.regionAttributes.diskWriteAttributes = DiskWriteAttributesImpl.getDefaultSyncInstance();
+ this.regionAttributes.diskWriteAttributes =
+ DiskWriteAttributesImpl.getDefaultSyncInstance();
} else {
- this.regionAttributes.diskWriteAttributes = DiskWriteAttributesImpl.getDefaultAsyncInstance();
+ this.regionAttributes.diskWriteAttributes =
+ DiskWriteAttributesImpl.getDefaultAsyncInstance();
}
}
}
/**
- * Sets the directories to which the region's data is written and also set their sizes in megabytes
+ * Sets the directories to which the region's data is written and also set their sizes in
+ * megabytes
*
- * @throws IllegalArgumentException if a dir does not exist or the length of the size array
- * does not match to the length of the dir array or the given length is not a valid positive number
+ * @throws IllegalArgumentException if a dir does not exist or the length of the size array does
+ * not match to the length of the dir array or the given length is not a valid positive
+ * number
*
* @since GemFire 5.1
* @deprecated as of 6.5 use {@link DiskStoreFactory#setDiskDirsAndSizes} instead
*/
@Deprecated
- public void setDiskDirsAndSizes(File[] diskDirs,int[] diskSizes) {
+ public void setDiskDirsAndSizes(File[] diskDirs, int[] diskSizes) {
if (this.regionAttributes.getDiskStoreName() != null) {
- throw new IllegalStateException(LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1
- .toLocalizedString(new Object[] {"setDiskDirsAndSizes", this.regionAttributes.getDiskStoreName()}));
+ throw new IllegalStateException(
+ LocalizedStrings.DiskStore_Deprecated_API_0_Cannot_Mix_With_DiskStore_1.toLocalizedString(
+ new Object[] {"setDiskDirsAndSizes", this.regionAttributes.getDiskStoreName()}));
}
DiskStoreFactoryImpl.checkIfDirectoriesExist(diskDirs);
this.regionAttributes.diskDirs = diskDirs;
- if(diskSizes.length != this.regionAttributes.diskDirs.length) {
- throw new IllegalArgumentException(LocalizedStrings.AttributesFactory_NUMBER_OF_DISKSIZES_IS_0_WHICH_IS_NOT_EQUAL_TO_NUMBER_OF_DISK_DIRS_WHICH_IS_1.toLocalizedString(new Object[] {Integer.valueOf(diskSizes.length), Integer.valueOf(diskDirs.length)}));
+ if (diskSizes.length != this.regionAttributes.diskDirs.length) {
+ throw new IllegalArgumentException(
+ LocalizedStrings.AttributesFactory_NUMBER_OF_DISKSIZES_IS_0_WHICH_IS_NOT_EQUAL_TO_NUMBER_OF_DISK_DIRS_WHICH_IS_1
+ .toLocalizedString(new Object[] {Integer.valueOf(diskSizes.length),
+ Integer.valueOf(diskDirs.length)}));
}
DiskStoreFactoryImpl.verifyNonNegativeDirSize(diskSizes);
this.regionAttributes.diskSizes = diskSizes;
@@ -1107,37 +1078,39 @@ public class AttributesFactory<K,V> {
}
/**
- * Sets the <code>PartitionAttributes</code> that describe how the
- * region is partitioned among members of the distributed system. This
- * also establishes a data policy of {@link DataPolicy#PARTITION PARTITION},
- * if the data policy has not already been set.
+ * Sets the <code>PartitionAttributes</code> that describe how the region is partitioned among
+ * members of the distributed system. This also establishes a data policy of
+ * {@link DataPolicy#PARTITION PARTITION}, if the data policy has not already been set.
*
* @since GemFire 5.0
*/
public void setPartitionAttributes(PartitionAttributes partition) {
if (partition != null) {
- if (! this.regionAttributes.hasDataPolicy()) {
- this.regionAttributes.dataPolicy = PartitionedRegionHelper.DEFAULT_DATA_POLICY;
- }
- else if ( !PartitionedRegionHelper.ALLOWED_DATA_POLICIES.contains(this.regionAttributes.dataPolicy) ) {
- throw new IllegalStateException(LocalizedStrings.AttributesFactory_DATA_POLICY_0_IS_NOT_ALLOWED_FOR_A_PARTITIONED_REGION_DATAPOLICIES_OTHER_THAN_1_ARE_NOT_ALLOWED
- .toLocalizedString(new Object[] {this.regionAttributes.dataPolicy, PartitionedRegionHelper.ALLOWED_DATA_POLICIES}));
+ if (!this.regionAttributes.hasDataPolicy()) {
+ this.regionAttributes.dataPolicy = PartitionedRegionHelper.DEFAULT_DATA_POLICY;
+ } else if (!PartitionedRegionHelper.ALLOWED_DATA_POLICIES
+ .contains(this.regionAttributes.dataPolicy)) {
+ throw new IllegalStateException(
+ LocalizedStrings.AttributesFactory_DATA_POLICY_0_IS_NOT_ALLOWED_FOR_A_PARTITIONED_REGION_DATAPOLICIES_OTHER_THAN_1_ARE_NOT_ALLOWED
+ .toLocalizedString(new Object[] {this.regionAttributes.dataPolicy,
+ PartitionedRegionHelper.ALLOWED_DATA_POLICIES}));
}
- if (this.regionAttributes.hasPartitionAttributes()
+ if (this.regionAttributes.hasPartitionAttributes()
&& this.regionAttributes.partitionAttributes instanceof PartitionAttributesImpl
&& partition instanceof PartitionAttributesImpl) {
// Make a copy and call merge on it to prevent bug 51616
- PartitionAttributesImpl copy = ((PartitionAttributesImpl) this.regionAttributes.partitionAttributes).copy();
+ PartitionAttributesImpl copy =
+ ((PartitionAttributesImpl) this.regionAttributes.partitionAttributes).copy();
copy.merge((PartitionAttributesImpl) partition);
this.regionAttributes.partitionAttributes = copy;
} else {
this.regionAttributes.partitionAttributes = partition;
this.regionAttributes.setHasPartitionAttributes(true);
}
-
- ((PartitionAttributesImpl) this.regionAttributes.partitionAttributes).setOffHeap(this.regionAttributes.offHeap);
- }
- else {
+
+ ((PartitionAttributesImpl) this.regionAttributes.partitionAttributes)
+ .setOffHeap(this.regionAttributes.offHeap);
+ } else {
this.regionAttributes.partitionAttributes = null;
this.regionAttributes.setHasPartitionAttributes(false);
}
@@ -1145,11 +1118,11 @@ public class AttributesFactory<K,V> {
protected void setBucketRegion(boolean b) {
this.regionAttributes.isBucketRegion = b;
- }
-
+ }
+
/**
- * Sets the <code>MembershipAttributes</code> that describe the membership
- * roles required for reliable access to the region.
+ * Sets the <code>MembershipAttributes</code> that describe the membership roles required for
+ * reliable access to the region.
*
* @deprecated this API is scheduled to be removed
*/
@@ -1159,8 +1132,8 @@ public class AttributesFactory<K,V> {
}
/**
- * Sets the <code>SubscriptionAttributes</code> that describe how the region
- * will subscribe to other distributed cache instances of the region.
+ * Sets the <code>SubscriptionAttributes</code> that describe how the region will subscribe to
+ * other distributed cache instances of the region.
*
* @since GemFire 5.0
*/
@@ -1170,9 +1143,8 @@ public class AttributesFactory<K,V> {
}
/**
- * Set how indexes on the region should be maintained. It will be either synchronous
- * or asynchronous.
- * Default is true.
+ * Set how indexes on the region should be maintained. It will be either synchronous or
+ * asynchronous. Default is true.
*/
public void setIndexMaintenanceSynchronous(boolean synchronous) {
this.regionAttributes.indexMaintenanceSynchronous = synchronous;
@@ -1180,8 +1152,9 @@ public class AttributesFactory<K,V> {
}
// STATISTICS
- /** Sets whether statistics are enabled for this region and its entries.
- * Default is false.
+ /**
+ * Sets whether statistics are enabled for this region and its entries. Default is false.
+ *
* @param statisticsEnabled whether statistics are enabled
*/
public void setStatisticsEnabled(boolean statisticsEnabled) {
@@ -1190,8 +1163,8 @@ public class AttributesFactory<K,V> {
}
/**
- * Sets the flag telling a region to ignore JTA transactions.
- * Default is false.
+ * Sets the flag telling a region to ignore JTA transactions. Default is false.
+ *
* @since GemFire 5.0
*/
public void setIgnoreJTA(boolean flag) {
@@ -1199,8 +1172,9 @@ public class AttributesFactory<K,V> {
this.regionAttributes.setHasIgnoreJTA(true);
}
- /** Sets whether this region should become lock grantor.
- * Default value is false.
+ /**
+ * Sets whether this region should become lock grantor. Default value is false.
+ *
* @param isLockGrantor whether this region should become lock grantor
*/
public void setLockGrantor(boolean isLockGrantor) {
@@ -1208,22 +1182,22 @@ public class AttributesFactory<K,V> {
this.regionAttributes.setHasIsLockGrantor(true);
}
- /** Sets whether distributed operations on this region should attempt
- to use multicast. Multicast must also be enabled in the
- cache's DistributedSystem (see
- <a href=../distributed/DistributedSystem.html#mcast-port">"mcast-port"</a>).
- Default is false.
- @since GemFire 5.0
- @see RegionAttributes#getMulticastEnabled
+ /**
+ * Sets whether distributed operations on this region should attempt to use multicast. Multicast
+ * must also be enabled in the cache's DistributedSystem (see <a
+ * href=../distributed/DistributedSystem.html#mcast-port">"mcast-port"</a>). Default is false.
+ *
+ * @since GemFire 5.0
+ * @see RegionAttributes#getMulticastEnabled
*/
public void setMulticastEnabled(boolean value) {
this.regionAttributes.multicastEnabled = value;
this.regionAttributes.setHasMulticastEnabled(true);
- }
+ }
+
/**
- * Sets cloning on region.
- * Default is false.
- * Note: off-heap regions always behave as if cloning is enabled.
+ * Sets cloning on region. Default is false. Note: off-heap regions always behave as if cloning is
+ * enabled.
*
* @param cloningEnable
* @since GemFire 6.1
@@ -1234,21 +1208,20 @@ public class AttributesFactory<K,V> {
this.regionAttributes.setHasCloningEnabled(true);
}
-
+
/**
- * Sets the pool name attribute.
- * This causes regions that use these attributes
- * to be a client region which communicates with the
- * servers that the connection pool communicates with.
- * <p>If this attribute is set to <code>null</code> or <code>""</code>
- * then the connection pool is disabled causing regions that use these attributes
- * to be communicate with peers instead of servers.
- * <p>The named connection pool must exist on the cache at the time these
- * attributes are used to create a region. See {@link PoolManager#createFactory}
- * for how to create a connection pool.
- * @param name the name of the connection pool to use; if <code>null</code>
- * or <code>""</code> then the connection pool is disabled for regions
- * using these attributes.
+ * Sets the pool name attribute. This causes regions that use these attributes to be a client
+ * region which communicates with the servers that the connection pool communicates with.
+ * <p>
+ * If this attribute is set to <code>null</code> or <code>""</code> then the connection pool is
+ * disabled causing regions that use these attributes to be communicate with peers instead of
+ * servers.
+ * <p>
+ * The named connection pool must exist on the cache at the time these attributes are used to
+ * create a region. See {@link PoolManager#createFactory} for how to create a connection pool.
+ *
+ * @param name the name of the connection pool to use; if <code>null</code> or <code>""</code>
+ * then the connection pool is disabled for regions using these attributes.
* @since GemFire 5.7
*/
public void setPoolName(String name) {
@@ -1258,18 +1231,19 @@ public class AttributesFactory<K,V> {
}
this.regionAttributes.poolName = nm;
this.regionAttributes.setHasPoolName(true);
-
+
}
-
+
/**
* Sets this region's compressor for compressing entry values.
+ *
* @since GemFire 8.0
* @param compressor a compressor.
*/
public void setCompressor(Compressor compressor) {
this.regionAttributes.compressor = compressor;
this.regionAttributes.setHasCompressor(true);
-
+
// Cloning must be enabled when a compressor is set
if (compressor != null) {
setCloningEnabled(true);
@@ -1278,56 +1252,62 @@ public class AttributesFactory<K,V> {
/**
* Enables this region's usage of off-heap memory if true.
+ *
* @since Geode 1.0
* @param offHeap boolean flag to enable off-heap memory
*/
public void setOffHeap(boolean offHeap) {
this.regionAttributes.offHeap = offHeap;
this.regionAttributes.setHasOffHeap(true);
-
+
if (this.regionAttributes.partitionAttributes != null) {
((PartitionAttributesImpl) this.regionAttributes.partitionAttributes).setOffHeap(offHeap);
}
}
-
+
// FACTORY METHOD
- /** Creates a <code>RegionAttributes</code> with the current settings.
+ /**
+ * Creates a <code>RegionAttributes</code> with the current settings.
+ *
* @return the newly created <code>RegionAttributes</code>
* @throws IllegalStateException if the current settings violate the
- * <a href="#compatibility">compatibility rules</a>
+ * <a href="#compatibility">compatibility rules</a>
* @deprecated as of GemFire 5.0, use {@link #create} instead
*/
@Deprecated
- public RegionAttributes<K,V> createRegionAttributes() {
+ public RegionAttributes<K, V> createRegionAttributes() {
return create();
}
- /** Creates a <code>RegionAttributes</code> with the current settings.
+
+ /**
+ * Creates a <code>RegionAttributes</code> with the current settings.
+ *
* @return the newly created <code>RegionAttributes</code>
* @throws IllegalStateException if the current settings violate the
- * <a href="#compatibility">compatibility rules</a>
+ * <a href="#compatibility">compatibility rules</a>
* @since GemFire 5.0
*/
@SuppressWarnings("unchecked")
- public RegionAttributes<K,V> create() {
- if (this.regionAttributes.hasDataPolicy() &&
- this.regionAttributes.dataPolicy.withPartitioning() &&
- this.regionAttributes.partitionAttributes == null) {
+ public RegionAttributes<K, V> create() {
+ if (this.regionAttributes.hasDataPolicy() && this.regionAttributes.dataPolicy.withPartitioning()
+ && this.regionAttributes.partitionAttributes == null) {
this.regionAttributes.partitionAttributes = (new PartitionAttributesFactory()).create();
- // fix bug #52033 by invoking setOffHeap now (localMaxMemory may now be the temporary placeholder for off-heap until DistributedSystem is created
- ((PartitionAttributesImpl)this.regionAttributes.partitionAttributes).setOffHeap(this.regionAttributes.getOffHeap());
+ // fix bug #52033 by invoking setOffHeap now (localMaxMemory may now be
<TRUNCATED>
[44/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
index aa8ad99..a276728 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.gatewaydelta;
import org.apache.geode.cache.Cache;
@@ -33,7 +31,8 @@ import org.apache.geode.internal.cache.LocalRegion;
import java.util.Properties;
-public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<String, GatewayDelta> implements Declarable {
+public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<String, GatewayDelta>
+ implements Declarable {
private final Cache cache;
@@ -55,9 +54,7 @@ public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<Str
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
builder.append("GatewayDeltaForwarderCacheListener: Received create event for ")
- .append(event.getKey())
- .append("->")
- .append(event.getNewValue())
+ .append(event.getKey()).append("->").append(event.getNewValue())
.append(" that originated in the local site. Sending it to the remote site.");
this.cache.getLogger().fine(builder.toString());
}
@@ -67,12 +64,12 @@ public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<Str
String sessionId = event.getKey();
SerializedCacheValue scv = event.getSerializedNewValue();
if (scv == null) {
- getGatewayDeltaRegion().put(sessionId,
- new GatewayDeltaCreateEvent(regionName, sessionId, EntryEventImpl.serialize(event.getNewValue())));
+ getGatewayDeltaRegion().put(sessionId, new GatewayDeltaCreateEvent(regionName, sessionId,
+ EntryEventImpl.serialize(event.getNewValue())));
} else {
System.out.println(
- "GatewayDeltaForwarderCacheListener event.getSerializedNewValue().getSerializedValue(): " + event.getSerializedNewValue()
- .getSerializedValue());
+ "GatewayDeltaForwarderCacheListener event.getSerializedNewValue().getSerializedValue(): "
+ + event.getSerializedNewValue().getSerializedValue());
getGatewayDeltaRegion().put(sessionId,
new GatewayDeltaCreateEvent(regionName, sessionId, scv.getSerializedValue()));
}
@@ -80,9 +77,7 @@ public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<Str
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
builder.append("GatewayDeltaForwarderCacheListener: Received create event for ")
- .append(event.getKey())
- .append("->")
- .append(event.getNewValue())
+ .append(event.getKey()).append("->").append(event.getNewValue())
.append(" that originated in the remote site.");
this.cache.getLogger().fine(builder.toString());
}
@@ -90,16 +85,14 @@ public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<Str
}
public void afterUpdate(EntryEvent<String, GatewayDelta> event) {
- //System.out.println("GatewayDeltaForwarderCacheListener.afterUpdate: " + event);
+ // System.out.println("GatewayDeltaForwarderCacheListener.afterUpdate: " + event);
// If the event is from the local site, create an 'update' event and send it to the
// gateway delta region
if (event.getCallbackArgument() == null) {
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
builder.append("GatewayDeltaForwarderCacheListener: Received update event for ")
- .append(event.getKey())
- .append("->")
- .append(event.getNewValue())
+ .append(event.getKey()).append("->").append(event.getNewValue())
.append(" that originated in the local site. Sending it to the remote site.");
this.cache.getLogger().fine(builder.toString());
}
@@ -114,9 +107,7 @@ public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<Str
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
builder.append("GatewayDeltaForwarderCacheListener: Received update event for ")
- .append(event.getKey())
- .append("->")
- .append(event.getNewValue())
+ .append(event.getKey()).append("->").append(event.getNewValue())
.append(" that originated in the remote site.");
this.cache.getLogger().fine(builder.toString());
}
@@ -130,16 +121,15 @@ public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<Str
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
builder.append("GatewayDeltaForwarderCacheListener: Received destroy event for ")
- .append(event.getKey())
- .append("->")
- .append(event.getNewValue())
+ .append(event.getKey()).append("->").append(event.getNewValue())
.append(" that originated in the local site. Sending it to the remote site.");
this.cache.getLogger().fine(builder.toString());
}
// Distribute the destroy event to the gateway hub(s)
String sessionId = event.getKey();
- getGatewayDeltaRegion().put(sessionId, new GatewayDeltaDestroyEvent(event.getRegion().getFullPath(), sessionId));
+ getGatewayDeltaRegion().put(sessionId,
+ new GatewayDeltaDestroyEvent(event.getRegion().getFullPath(), sessionId));
} else {
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
@@ -151,8 +141,7 @@ public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<Str
}
}
- public void init(Properties p) {
- }
+ public void init(Properties p) {}
private LocalRegion getGatewayDeltaRegion() {
if (this.gatewayDeltaRegion == null) {
@@ -165,17 +154,17 @@ public class GatewayDeltaForwarderCacheListener extends CacheListenerAdapter<Str
private LocalRegion createOrRetrieveGatewayDeltaRegion() {
Region region = this.cache.getRegion(GatewayDelta.GATEWAY_DELTA_REGION_NAME);
if (region == null) {
- region = new RegionFactory().setScope(Scope.LOCAL)
- .setDataPolicy(DataPolicy.EMPTY)
+ region = new RegionFactory().setScope(Scope.LOCAL).setDataPolicy(DataPolicy.EMPTY)
.setSubscriptionAttributes(new SubscriptionAttributes(InterestPolicy.ALL))
-// TODO: Disabled for WAN
-// .setEnableGateway(true)
+ // TODO: Disabled for WAN
+ // .setEnableGateway(true)
.addCacheListener(new GatewayDeltaEventApplicationCacheListener())
.create(GatewayDelta.GATEWAY_DELTA_REGION_NAME);
}
if (this.cache.getLogger().fineEnabled()) {
StringBuilder builder = new StringBuilder();
- builder.append("GatewayDeltaForwarderCacheListener: Created gateway delta region: ").append(region);
+ builder.append("GatewayDeltaForwarderCacheListener: Created gateway delta region: ")
+ .append(region);
this.cache.getLogger().fine(builder.toString());
}
return (LocalRegion) region;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/AbstractCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/AbstractCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/AbstractCache.java
index 6c18e0f..483af3d 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/AbstractCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/AbstractCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.bootstrap;
import org.apache.geode.cache.GemFireCache;
@@ -44,13 +42,16 @@ public abstract class AbstractCache {
private static final DateFormat FORMAT = new SimpleDateFormat("yyyy-MM-dd");
- protected static final String DEFAULT_LOG_FILE_NAME = RegionHelper.NAME + "." + FORMAT.format(new Date()) + ".log";
+ protected static final String DEFAULT_LOG_FILE_NAME =
+ RegionHelper.NAME + "." + FORMAT.format(new Date()) + ".log";
protected static final String DEFAULT_STATISTIC_ARCHIVE_FILE_NAME = RegionHelper.NAME + ".gfs";
- protected static final float DEFAULT_EVICTION_HEAP_PERCENTAGE = LocalRegion.DEFAULT_HEAPLRU_EVICTION_HEAP_PERCENTAGE;
+ protected static final float DEFAULT_EVICTION_HEAP_PERCENTAGE =
+ LocalRegion.DEFAULT_HEAPLRU_EVICTION_HEAP_PERCENTAGE;
- protected static final float DEFAULT_CRITICAL_HEAP_PERCENTAGE = ResourceManager.DEFAULT_CRITICAL_PERCENTAGE;
+ protected static final float DEFAULT_CRITICAL_HEAP_PERCENTAGE =
+ ResourceManager.DEFAULT_CRITICAL_PERCENTAGE;
protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCache.class);
@@ -175,7 +176,7 @@ public abstract class AbstractCache {
}
public void setProperty(String name, String value) {
- //TODO Look at fake attributes
+ // TODO Look at fake attributes
if (name.equals("className")) {
return;
}
@@ -194,7 +195,8 @@ public abstract class AbstractCache {
if (validProperty) {
this.gemfireProperties.put(name, value);
} else {
- getLogger().warn("The input property named " + name + " is not a valid GemFire property. It is being ignored.");
+ getLogger().warn("The input property named " + name
+ + " is not a valid GemFire property. It is being ignored.");
}
}
@@ -258,10 +260,11 @@ public abstract class AbstractCache {
} else if (System.getProperty("weblogic.Name") != null) {
String weblogicName = System.getProperty("weblogic.Name");
String separator = System.getProperty("file.separator");
- logFile = new File("servers" + separator + weblogicName + separator +
- "logs" + separator + logFileName);
+ logFile = new File(
+ "servers" + separator + weblogicName + separator + "logs" + separator + logFileName);
} else {
- logFile = new File(System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "logdir"), logFileName);
+ logFile =
+ new File(System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "logdir"), logFileName);
}
}
return logFile;
@@ -276,14 +279,17 @@ public abstract class AbstractCache {
// If the statistics archive file is not absolute, point it at the logs directory.
if (!statisticsArchiveFile.isAbsolute()) {
if (System.getProperty("catalina.base") != null) {
- statisticsArchiveFile = new File(System.getProperty("catalina.base") + "/logs/", statisticsArchiveFileName);
+ statisticsArchiveFile =
+ new File(System.getProperty("catalina.base") + "/logs/", statisticsArchiveFileName);
} else if (System.getProperty("weblogic.Name") != null) {
String weblogicName = System.getProperty("weblogic.Name");
String separator = System.getProperty("file.separator");
- statisticsArchiveFile = new File("servers" + separator + weblogicName + separator +
- "logs" + separator + statisticsArchiveFileName);
+ statisticsArchiveFile = new File("servers" + separator + weblogicName + separator + "logs"
+ + separator + statisticsArchiveFileName);
} else {
- statisticsArchiveFile = new File(System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "statisticsdir"), statisticsArchiveFileName);
+ statisticsArchiveFile =
+ new File(System.getProperty(DistributionConfig.GEMFIRE_PREFIX + "statisticsdir"),
+ statisticsArchiveFileName);
}
}
}
@@ -297,19 +303,16 @@ public abstract class AbstractCache {
float currentCriticalHeapPercentage = rm.getCriticalHeapPercentage();
// Set new eviction and critical heap percentages if necessary
- if (getEvictionHeapPercentage() != currentEvictionHeapPercentage || getCriticalHeapPercentage() != currentCriticalHeapPercentage) {
+ if (getEvictionHeapPercentage() != currentEvictionHeapPercentage
+ || getCriticalHeapPercentage() != currentCriticalHeapPercentage) {
if (getLogger().isDebugEnabled()) {
StringBuilder builder = new StringBuilder();
- builder.append("Previous eviction heap percentage=")
- .append(currentEvictionHeapPercentage)
- .append("; critical heap percentage=")
- .append(currentCriticalHeapPercentage);
+ builder.append("Previous eviction heap percentage=").append(currentEvictionHeapPercentage)
+ .append("; critical heap percentage=").append(currentCriticalHeapPercentage);
getLogger().debug(builder.toString());
builder.setLength(0);
- builder.append("Requested eviction heap percentage=")
- .append(getEvictionHeapPercentage())
- .append("; critical heap percentage=")
- .append(getCriticalHeapPercentage());
+ builder.append("Requested eviction heap percentage=").append(getEvictionHeapPercentage())
+ .append("; critical heap percentage=").append(getCriticalHeapPercentage());
getLogger().debug(builder.toString());
}
if (currentCriticalHeapPercentage == 0.0f) {
@@ -320,7 +323,8 @@ public abstract class AbstractCache {
rm.setEvictionHeapPercentage(getEvictionHeapPercentage());
rm.setCriticalHeapPercentage(getCriticalHeapPercentage());
} catch (IllegalArgumentException e) {
- handleResourceManagerException(e, currentEvictionHeapPercentage, currentCriticalHeapPercentage);
+ handleResourceManagerException(e, currentEvictionHeapPercentage,
+ currentCriticalHeapPercentage);
rm.setEvictionHeapPercentage(currentEvictionHeapPercentage);
rm.setCriticalHeapPercentage(currentCriticalHeapPercentage);
}
@@ -332,7 +336,8 @@ public abstract class AbstractCache {
rm.setCriticalHeapPercentage(getCriticalHeapPercentage());
rm.setEvictionHeapPercentage(getEvictionHeapPercentage());
} catch (IllegalArgumentException e) {
- handleResourceManagerException(e, currentEvictionHeapPercentage, currentCriticalHeapPercentage);
+ handleResourceManagerException(e, currentEvictionHeapPercentage,
+ currentCriticalHeapPercentage);
rm.setCriticalHeapPercentage(currentCriticalHeapPercentage);
rm.setEvictionHeapPercentage(currentEvictionHeapPercentage);
}
@@ -344,17 +349,16 @@ public abstract class AbstractCache {
rm.setEvictionHeapPercentage(getEvictionHeapPercentage());
rm.setCriticalHeapPercentage(getCriticalHeapPercentage());
} catch (IllegalArgumentException e) {
- handleResourceManagerException(e, currentEvictionHeapPercentage, currentCriticalHeapPercentage);
+ handleResourceManagerException(e, currentEvictionHeapPercentage,
+ currentCriticalHeapPercentage);
rm.setEvictionHeapPercentage(currentEvictionHeapPercentage);
rm.setCriticalHeapPercentage(currentCriticalHeapPercentage);
}
}
if (getLogger().isDebugEnabled()) {
StringBuilder builder = new StringBuilder();
- builder.append("Actual eviction heap percentage=")
- .append(rm.getEvictionHeapPercentage())
- .append("; critical heap percentage=")
- .append(rm.getCriticalHeapPercentage());
+ builder.append("Actual eviction heap percentage=").append(rm.getEvictionHeapPercentage())
+ .append("; critical heap percentage=").append(rm.getCriticalHeapPercentage());
getLogger().debug(builder.toString());
}
}
@@ -365,29 +369,23 @@ public abstract class AbstractCache {
ResourceManagerValidator.validateJavaStartupParameters(getCache());
}
- private void handleResourceManagerException(IllegalArgumentException e, float currentEvictionHeapPercentage,
- float currentCriticalHeapPercentage) {
+ private void handleResourceManagerException(IllegalArgumentException e,
+ float currentEvictionHeapPercentage, float currentCriticalHeapPercentage) {
StringBuilder builder = new StringBuilder();
builder.append("Caught exception attempting to set eviction heap percentage=")
- .append(getEvictionHeapPercentage())
- .append(" and critical heap percentage=")
+ .append(getEvictionHeapPercentage()).append(" and critical heap percentage=")
.append(getCriticalHeapPercentage())
- .append(". The percentages will be set back to their previous values (eviction heap percentage=")
- .append(currentEvictionHeapPercentage)
- .append(" and critical heap percentage=")
- .append(currentCriticalHeapPercentage)
- .append(").");
+ .append(
+ ". The percentages will be set back to their previous values (eviction heap percentage=")
+ .append(currentEvictionHeapPercentage).append(" and critical heap percentage=")
+ .append(currentCriticalHeapPercentage).append(").");
getLogger().warn(builder.toString(), e);
}
@Override
public String toString() {
- return new StringBuilder().append(getClass().getSimpleName())
- .append("[")
- .append("cache=")
- .append(this.cache)
- .append("]")
- .toString();
+ return new StringBuilder().append(getClass().getSimpleName()).append("[").append("cache=")
+ .append(this.cache).append("]").toString();
}
protected abstract void createOrRetrieveCache();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/ClientServerCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/ClientServerCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/ClientServerCache.java
index 986ff32..7cef225 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/ClientServerCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/ClientServerCache.java
@@ -1,26 +1,25 @@
/*
-* 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.
-*/
+ * 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.modules.session.bootstrap;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.client.ClientCacheFactory;
/**
- * This is a singleton class which maintains configuration properties as well as starting a Client-Server cache.
+ * This is a singleton class which maintains configuration properties as well as starting a
+ * Client-Server cache.
*/
public class ClientServerCache extends AbstractCache {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/LifecycleTypeAdapter.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/LifecycleTypeAdapter.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/LifecycleTypeAdapter.java
index 3b24cda..3b9b5ed 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/LifecycleTypeAdapter.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/LifecycleTypeAdapter.java
@@ -1,22 +1,19 @@
/*
-* 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.
-*/
+ * 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.
+ */
/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
+ * To change this template, choose Tools | Templates and open the template in the editor.
*/
package org.apache.geode.modules.session.bootstrap;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/PeerToPeerCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/PeerToPeerCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/PeerToPeerCache.java
index c220804..36b19e4 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/PeerToPeerCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/bootstrap/PeerToPeerCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.bootstrap;
import org.apache.geode.cache.CacheClosedException;
@@ -22,7 +20,8 @@ import org.apache.geode.cache.control.RebalanceResults;
import org.apache.geode.modules.util.RegionHelper;
/**
- * This is a singleton class which maintains configuration properties as well as starting a Peer-To-Peer cache.
+ * This is a singleton class which maintains configuration properties as well as starting a
+ * Peer-To-Peer cache.
*/
public class PeerToPeerCache extends AbstractCache {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractCacheLifecycleListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractCacheLifecycleListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractCacheLifecycleListener.java
index edea6a9..024c27c 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractCacheLifecycleListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractCacheLifecycleListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
@@ -39,8 +37,7 @@ public abstract class AbstractCacheLifecycleListener implements LifecycleListene
}
/*
- * These getters and setters are also called by Tomcat and just passed on to
- * the cache.
+ * These getters and setters are also called by Tomcat and just passed on to the cache.
*/
public float getEvictionHeapPercentage() {
return cache.getEvictionHeapPercentage();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java
index 461a982..ff6ab42 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/AbstractSessionCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.geode.cache.EntryNotFoundException;
@@ -30,13 +28,15 @@ public abstract class AbstractSessionCache implements SessionCache {
protected SessionManager sessionManager;
/**
- * The sessionRegion is the <code>Region</code> that actually stores and replicates the <code>Session</code>s.
+ * The sessionRegion is the <code>Region</code> that actually stores and replicates the
+ * <code>Session</code>s.
*/
protected Region<String, HttpSession> sessionRegion;
/**
- * The operatingRegion is the <code>Region</code> used to do HTTP operations. if local cache is enabled, then this
- * will be the local <code>Region</code>; otherwise, it will be the session <code>Region</code>.
+ * The operatingRegion is the <code>Region</code> used to do HTTP operations. if local cache is
+ * enabled, then this will be the local <code>Region</code>; otherwise, it will be the session
+ * <code>Region</code>.
*/
protected Region<String, HttpSession> operatingRegion;
@@ -101,11 +101,13 @@ public abstract class AbstractSessionCache implements SessionCache {
RegionConfiguration configuration = new RegionConfiguration();
configuration.setRegionName(getSessionManager().getRegionName());
configuration.setRegionAttributesId(getSessionManager().getRegionAttributesId());
- if (getSessionManager().getMaxInactiveInterval() != RegionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL) {
+ if (getSessionManager()
+ .getMaxInactiveInterval() != RegionConfiguration.DEFAULT_MAX_INACTIVE_INTERVAL) {
configuration.setMaxInactiveInterval(getSessionManager().getMaxInactiveInterval());
configuration.setCustomExpiry(new SessionCustomExpiry());
}
- configuration.setEnableGatewayDeltaReplication(getSessionManager().getEnableGatewayDeltaReplication());
+ configuration
+ .setEnableGatewayDeltaReplication(getSessionManager().getEnableGatewayDeltaReplication());
configuration.setEnableGatewayReplication(getSessionManager().getEnableGatewayReplication());
configuration.setEnableDebugListener(getSessionManager().getEnableDebugListener());
return configuration;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java
index ffed8ca..8c3c651 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerCacheLifecycleListener.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.geode.modules.session.bootstrap.ClientServerCache;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
index 333b355..2d4a8cd 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/ClientServerSessionCache.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.geode.cache.GemFireCache;
@@ -47,7 +45,8 @@ public class ClientServerSessionCache extends AbstractSessionCache {
private ClientCache cache;
- protected static final String DEFAULT_REGION_ATTRIBUTES_ID = RegionShortcut.PARTITION_REDUNDANT.toString();
+ protected static final String DEFAULT_REGION_ATTRIBUTES_ID =
+ RegionShortcut.PARTITION_REDUNDANT.toString();
protected static final boolean DEFAULT_ENABLE_LOCAL_CACHE = true;
@@ -100,7 +99,8 @@ public class ClientServerSessionCache extends AbstractSessionCache {
// Execute the partitioned touch function on the primary server(s)
Execution execution = FunctionService.onRegion(getSessionRegion()).withFilter(sessionIds);
try {
- ResultCollector collector = execution.execute(TouchPartitionedRegionEntriesFunction.ID, true, false, true);
+ ResultCollector collector =
+ execution.execute(TouchPartitionedRegionEntriesFunction.ID, true, false, true);
collector.getResult();
} catch (Exception e) {
// If an exception occurs in the function, log it.
@@ -109,9 +109,10 @@ public class ClientServerSessionCache extends AbstractSessionCache {
} else {
// Execute the member touch function on all the server(s)
Execution execution = FunctionService.onServers(getCache())
- .withArgs(new Object[]{this.sessionRegion.getFullPath(), sessionIds});
+ .withArgs(new Object[] {this.sessionRegion.getFullPath(), sessionIds});
try {
- ResultCollector collector = execution.execute(TouchReplicatedRegionEntriesFunction.ID, true, false, false);
+ ResultCollector collector =
+ execution.execute(TouchReplicatedRegionEntriesFunction.ID, true, false, false);
collector.getResult();
} catch (Exception e) {
// If an exception occurs in the function, log it.
@@ -209,7 +210,9 @@ public class ClientServerSessionCache extends AbstractSessionCache {
for (RegionStatus status : results) {
if (status == RegionStatus.INVALID) {
StringBuilder builder = new StringBuilder();
- builder.append("An exception occurred on the server while attempting to create or validate region named ")
+ builder
+ .append(
+ "An exception occurred on the server while attempting to create or validate region named ")
.append(getSessionManager().getRegionName())
.append(". See the server log for additional details.");
throw new IllegalStateException(builder.toString());
@@ -240,8 +243,8 @@ public class ClientServerSessionCache extends AbstractSessionCache {
Region region = factory.create(getSessionManager().getRegionName());
/*
- * If we're using an empty client region, we register interest so that
- * expired sessions are destroyed correctly.
+ * If we're using an empty client region, we register interest so that expired sessions are
+ * destroyed correctly.
*/
if (!getSessionManager().getEnableLocalCache()) {
region.registerInterest("ALL_KEYS", InterestResultPolicy.KEYS);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java
index a6568e6..659181a 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/CommitSessionValve.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.catalina.Manager;
@@ -30,7 +28,8 @@ public class CommitSessionValve extends ValveBase {
private static final Log log = LogFactory.getLog(CommitSessionValve.class);
- protected static final String info = "org.apache.geode.modules.session.catalina.CommitSessionValve/1.0";
+ protected static final String info =
+ "org.apache.geode.modules.session.catalina.CommitSessionValve/1.0";
public CommitSessionValve() {
log.info("Initialized");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
index 8691829..bc421a5 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.geode.DataSerializable;
@@ -54,7 +52,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@SuppressWarnings("serial")
-public class DeltaSession extends StandardSession implements DataSerializable, Delta, GatewayDelta, Sizeable, DeltaSessionInterface {
+public class DeltaSession extends StandardSession
+ implements DataSerializable, Delta, GatewayDelta, Sizeable, DeltaSessionInterface {
private transient Region<String, HttpSession> operatingRegion;
@@ -70,7 +69,8 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
private transient final Object changeLock = new Object();
- private final List<DeltaSessionAttributeEvent> eventQueue = new ArrayList<DeltaSessionAttributeEvent>();
+ private final List<DeltaSessionAttributeEvent> eventQueue =
+ new ArrayList<DeltaSessionAttributeEvent>();
private transient GatewayDeltaEvent currentGatewayDeltaEvent;
@@ -85,12 +85,12 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
/**
* The string manager for this package.
*/
-// protected static StringManager STRING_MANAGER =
-// StringManager.getManager("org.apache.geode.modules.session.catalina");
+ // protected static StringManager STRING_MANAGER =
+ // StringManager.getManager("org.apache.geode.modules.session.catalina");
/**
- * Construct a new <code>Session</code> associated with no <code>Manager</code>. The <code>Manager</code> will be
- * assigned later using {@link #setOwner(Object)}.
+ * Construct a new <code>Session</code> associated with no <code>Manager</code>. The
+ * <code>Manager</code> will be assigned later using {@link #setOwner(Object)}.
*/
public DeltaSession() {
super(null);
@@ -133,18 +133,18 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
sp = (SerializablePrincipal) BlobHelper.deserializeBlob(this.serializedPrincipal);
} catch (Exception e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(
- ": Serialized principal contains a byte[] that cannot be deserialized due to the following exception");
+ builder.append(this).append(
+ ": Serialized principal contains a byte[] that cannot be deserialized due to the following exception");
((DeltaSessionManager) getManager()).getLogger().warn(builder.toString(), e);
return null;
}
- this.principal = sp.getPrincipal(((DeltaSessionManager)this.manager).getTheContext().getRealm());
+ this.principal =
+ sp.getPrincipal(((DeltaSessionManager) this.manager).getTheContext().getRealm());
if (getManager() != null) {
DeltaSessionManager mgr = (DeltaSessionManager) getManager();
if (mgr.getLogger().isDebugEnabled()) {
mgr.getLogger().debug(this + ": Deserialized principal: " + this.principal);
- //mgr.logCurrentStack();
+ // mgr.logCurrentStack();
}
}
}
@@ -161,7 +161,7 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
DeltaSessionManager mgr = (DeltaSessionManager) getManager();
if (mgr.getLogger().isDebugEnabled()) {
mgr.getLogger().debug(this + ": Cached principal: " + principal);
- //mgr.logCurrentStack();
+ // mgr.logCurrentStack();
}
}
}
@@ -176,7 +176,7 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
DeltaSessionManager mgr = (DeltaSessionManager) getManager();
if (mgr.getLogger().isDebugEnabled()) {
mgr.getLogger().debug(this + ": Serialized principal: " + sp);
- //mgr.logCurrentStack();
+ // mgr.logCurrentStack();
}
}
}
@@ -253,7 +253,8 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
}
// Create the update attribute message
- DeltaSessionAttributeEvent event = new DeltaSessionUpdateAttributeEvent(name, serializedValue);
+ DeltaSessionAttributeEvent event =
+ new DeltaSessionUpdateAttributeEvent(name, serializedValue);
queueAttributeEvent(event, true);
// Distribute the update
@@ -291,10 +292,8 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
value = BlobHelper.deserializeBlob((byte[]) value);
} catch (Exception e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Attribute named ")
- .append(name)
- .append(" contains a byte[] that cannot be deserialized due to the following exception");
+ builder.append(this).append(": Attribute named ").append(name).append(
+ " contains a byte[] that cannot be deserialized due to the following exception");
((DeltaSessionManager) getManager()).getLogger().warn(builder.toString(), e);
}
if (this.preferDeserializedForm) {
@@ -312,7 +311,7 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
public void invalidate() {
super.invalidate();
- //getOperatingRegion().destroy(this.id, true); // already done in super (remove)
+ // getOperatingRegion().destroy(this.id, true); // already done in super (remove)
((DeltaSessionManager) getManager()).getStatistics().incSessionsInvalidated();
}
@@ -346,7 +345,8 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
super.removeAttribute(name, false); // don't do notification since this is a replication
}
- public void applyAttributeEvents(Region<String, DeltaSessionInterface> region, List<DeltaSessionAttributeEvent> events) {
+ public void applyAttributeEvents(Region<String, DeltaSessionInterface> region,
+ List<DeltaSessionAttributeEvent> events) {
for (DeltaSessionAttributeEvent event : events) {
event.apply(this);
queueAttributeEvent(event, false);
@@ -370,7 +370,8 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
}
}
- private void queueAttributeEvent(DeltaSessionAttributeEvent event, boolean checkAddToCurrentGatewayDelta) {
+ private void queueAttributeEvent(DeltaSessionAttributeEvent event,
+ boolean checkAddToCurrentGatewayDelta) {
// Add to current gateway delta if necessary
if (checkAddToCurrentGatewayDelta) {
// If the manager has enabled gateway delta replication and is a P2P
@@ -384,7 +385,8 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
if (!isCommitEnabled()) {
List<DeltaSessionAttributeEvent> events = new ArrayList<DeltaSessionAttributeEvent>();
events.add(event);
- this.currentGatewayDeltaEvent = new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events);
+ this.currentGatewayDeltaEvent =
+ new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events);
}
}
}
@@ -400,9 +402,9 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
}
public void commit() {
- if (!isValidInternal()) throw new IllegalStateException("commit: Session " + getId() +
- " already invalidated");
-// (STRING_MANAGER.getString("deltaSession.commit.ise", getId()));
+ if (!isValidInternal())
+ throw new IllegalStateException("commit: Session " + getId() + " already invalidated");
+ // (STRING_MANAGER.getString("deltaSession.commit.ise", getId()));
synchronized (this.changeLock) {
// Jens - there used to be a check to only perform this if the queue is
@@ -478,7 +480,8 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
// Add the events to the gateway delta region if necessary
if (this.enableGatewayDeltaReplication && this.applyRemotely) {
- setCurrentGatewayDeltaEvent(new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events));
+ setCurrentGatewayDeltaEvent(
+ new DeltaSessionAttributeEventBatch(this.sessionRegionName, this.id, events));
}
// Access it to set the last accessed time. End access it to set not new.
@@ -545,7 +548,7 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
@Override
public int getSizeInBytes() {
int size = 0;
- for (Enumeration<String> e = getAttributeNames(); e.hasMoreElements(); ) {
+ for (Enumeration<String> e = getAttributeNames(); e.hasMoreElements();) {
// Don't use this.getAttribute() because we don't want to deserialize
// the value.
Object value = super.getAttribute(e.nextElement());
@@ -559,9 +562,10 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
@SuppressWarnings({"unchecked", "rawtypes"})
protected Map<String, byte[]> getSerializedAttributes() {
- // Iterate the values and serialize them if necessary before sending them to the server. This makes the application classes unnecessary on the server.
+ // Iterate the values and serialize them if necessary before sending them to the server. This
+ // makes the application classes unnecessary on the server.
Map<String, byte[]> serializedAttributes = new ConcurrentHashMap<String, byte[]>();
- for (Iterator i = this.attributes.entrySet().iterator(); i.hasNext(); ) {
+ for (Iterator i = this.attributes.entrySet().iterator(); i.hasNext();) {
Map.Entry<String, Object> entry = (Map.Entry<String, Object>) i.next();
Object value = entry.getValue();
byte[] serializedValue = value instanceof byte[] ? (byte[]) value : serialize(value);
@@ -576,9 +580,7 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
serializedValue = BlobHelper.serializeToBlob(obj);
} catch (IOException e) {
StringBuilder builder = new StringBuilder();
- builder.append(this)
- .append(": Object ")
- .append(obj)
+ builder.append(this).append(": Object ").append(obj)
.append(" cannot be serialized due to the following exception");
((DeltaSessionManager) getManager()).getLogger().warn(builder.toString(), e);
}
@@ -587,16 +589,10 @@ public class DeltaSession extends StandardSession implements DataSerializable, D
@Override
public String toString() {
- return new StringBuilder().append("DeltaSession[")
- .append("id=")
- .append(getId())
- .append("; context=")
- .append(this.contextName)
- .append("; sessionRegionName=")
- .append(this.sessionRegionName)
- .append("; operatingRegionName=")
+ return new StringBuilder().append("DeltaSession[").append("id=").append(getId())
+ .append("; context=").append(this.contextName).append("; sessionRegionName=")
+ .append(this.sessionRegionName).append("; operatingRegionName=")
.append(getOperatingRegion() == null ? "unset" : getOperatingRegion().getFullPath())
- .append("]")
- .toString();
+ .append("]").toString();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java
index a64e408..e6d7c65 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionFacade.java
@@ -1,19 +1,17 @@
/*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.catalina.session.StandardSessionFacade;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java
----------------------------------------------------------------------
diff --git a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java
index cbcd569..cb8ac51 100644
--- a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java
+++ b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionInterface.java
@@ -1,25 +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
-*
-* 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.
-*/
+ * 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.modules.session.catalina;
import org.apache.geode.cache.Region;
-
-
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
@@ -33,20 +29,28 @@ import org.apache.geode.modules.session.catalina.internal.DeltaSessionAttributeE
public interface DeltaSessionInterface extends Session {
void commit();
+
void abort();
+
boolean isValid();
+
void localDestroyAttribute(String name);
- void applyAttributeEvents(Region<String, DeltaSessionInterface> region, List<DeltaSessionAttributeEvent> events);
+
+ void applyAttributeEvents(Region<String, DeltaSessionInterface> region,
+ List<DeltaSessionAttributeEvent> events);
void localUpdateAttribute(String attributeName, Object attributeValue);
void toData(DataOutput os) throws IOException;
+
void fromData(DataInput is) throws IOException, ClassNotFoundException;
String getContextName();
+
boolean getExpired();
void setOwner(Object manager);
+
void activate();
void processExpired();
[83/98] [abbrv] incubator-geode git commit: [GEODE-2037] Update
documentation links
Posted by ds...@apache.org.
[GEODE-2037] Update documentation links
Fix README.md, geode-examples/README.md, and the website releases
page to point to documentation hosted on the geode website
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f73a4e3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f73a4e3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f73a4e3f
Branch: refs/heads/feature/GEM-983
Commit: f73a4e3fd941715de6547c66875bebbf2db29d6e
Parents: f6b534d
Author: Anthony Baker <ab...@apache.org>
Authored: Wed Oct 26 07:40:29 2016 -0700
Committer: Anthony Baker <ab...@apache.org>
Committed: Wed Oct 26 10:14:11 2016 -0700
----------------------------------------------------------------------
README.md | 4 ++--
geode-examples/README.md | 4 ++--
geode-site/website/content/releases/index.html | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f73a4e3f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index eee17fc..4ca2416 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ Apache Geode applications can be written in these client technologies:
* Java using the Geode client API or embedded using the Geode peer API
* [Spring Data GemFire](http://projects.spring.io/spring-data-gemfire/) or [Spring Cache](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/cache.html)
-* [Python](https://github.com/gemfire/py-gemfire-rest)
-* [REST](http://geode.docs.pivotal.io/docs/rest_apps/book_intro.html)
+* [REST](http://geode.apache.org/docs/guide/rest_apps/chapter_overview.html)
* [memcached](https://cwiki.apache.org/confluence/display/GEODE/Moving+from+memcached+to+gemcached)
+* [Python](https://github.com/gemfire/py-gemfire-rest)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f73a4e3f/geode-examples/README.md
----------------------------------------------------------------------
diff --git a/geode-examples/README.md b/geode-examples/README.md
index 1d4eafb..83fd93d 100644
--- a/geode-examples/README.md
+++ b/geode-examples/README.md
@@ -16,9 +16,9 @@ All examples:
### Installation and a Tutorial for Beginners
-* [How to Install](http://geode.docs.pivotal.io/docs/getting_started/installation/install_standalone.html)
+* [How to Install](http://geode.apache.org/docs/guide/getting_started/installation/install_standalone.html)
* Set a `GEODE_HOME` environment variable to point to the root directory of the installation; this directory contains `bin/`. For those that have built from source, it will be the `geode-assembly/build/install/apache-geode` directory.
-* If desired run the tutorial: [Apache Geode in 15 minutes or Less](http://geode.docs.pivotal.io/docs/getting_started/15_minute_quickstart_gfsh.html)
+* If desired run the tutorial: [Apache Geode in 15 minutes or Less](http://geode.apache.org/docs/guide/getting_started/15_minute_quickstart_gfsh.html)
### Basics
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f73a4e3f/geode-site/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/releases/index.html b/geode-site/website/content/releases/index.html
index 63f685e..7056640 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -268,7 +268,7 @@ under the License. -->
<p>
Alternatively, you can verify the MD5 signature on the files. A Unix program called md5 or md5sum is included in many Unix distributions. It is also available as part of <a href="http://www.gnu.org/software/textutils/textutils.html">GNU Textutils</a>. Windows users can get binary md5 programs from <a href="http://www.fourmilab.ch/md5/">here</a>, <a href="http://www.pc-tools.net/win32/md5sums/">here</a>, or <a href="http://www.slavasoft.com/fsum/">here</a>.
<p>
- If you want to build directly from source, instructions are within the User Documentation in the <a href="http://geode.docs.pivotal.io/docs/getting_started/installation/install_standalone.html">How to Install</a> subsection.
+ If you want to build directly from source, instructions are within the User Documentation in the <a href="http://geode.apache.org/docs/guide/getting_started/installation/install_standalone.html">How to Install</a> subsection.
</p>
</div>
</div>
[13/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
index ad60682..65c2477 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
@@ -1,81 +1,78 @@
/*
- * 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
+ * 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.admin.jmx.internal;
-//import org.apache.geode.admin.AdminException;
-//import org.apache.geode.admin.DistributionLocator;
+// import org.apache.geode.admin.AdminException;
+// import org.apache.geode.admin.DistributionLocator;
import org.apache.geode.admin.DistributionLocatorConfig;
import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
import org.apache.geode.internal.i18n.LocalizedStrings;
-//import org.apache.geode.internal.Assert;
-
-//import org.apache.commons.modeler.ManagedBean;
-//import org.apache.commons.modeler.AttributeInfo;
-
-//import java.util.Date;
-//import java.util.Set;
-
-//import javax.management.Attribute;
-//import javax.management.AttributeList;
-//import javax.management.Descriptor;
-//import javax.management.JMException;
-//import javax.management.MBeanServer;
-//import javax.management.MalformedObjectNameException;
-//import javax.management.Notification;
-//import javax.management.NotificationListener;
+// import org.apache.geode.internal.Assert;
+
+// import org.apache.commons.modeler.ManagedBean;
+// import org.apache.commons.modeler.AttributeInfo;
+
+// import java.util.Date;
+// import java.util.Set;
+
+// import javax.management.Attribute;
+// import javax.management.AttributeList;
+// import javax.management.Descriptor;
+// import javax.management.JMException;
+// import javax.management.MBeanServer;
+// import javax.management.MalformedObjectNameException;
+// import javax.management.Notification;
+// import javax.management.NotificationListener;
import javax.management.ObjectName;
-//import javax.management.modelmbean.DescriptorSupport;
+// import javax.management.modelmbean.DescriptorSupport;
import javax.management.modelmbean.ModelMBean;
-//import javax.management.modelmbean.ModelMBeanAttributeInfo;
+// import javax.management.modelmbean.ModelMBeanAttributeInfo;
/**
* Provides MBean support for managing a distribution locator.
*
*/
-public class DistributionLocatorJmxImpl
-extends org.apache.geode.admin.internal.DistributionLocatorImpl
-implements org.apache.geode.admin.jmx.internal.ManagedResource,
- DistributionLocatorConfig {
+public class DistributionLocatorJmxImpl
+ extends org.apache.geode.admin.internal.DistributionLocatorImpl
+ implements org.apache.geode.admin.jmx.internal.ManagedResource, DistributionLocatorConfig {
/** The JMX object name of this managed resource */
private ObjectName objectName;
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
-
+
/**
- * Constructs new instance of DistributionLocatorJmxImpl for managing a
- * distribution locator service via JMX.
+ * Constructs new instance of DistributionLocatorJmxImpl for managing a distribution locator
+ * service via JMX.
*/
public DistributionLocatorJmxImpl(DistributionLocatorConfig config,
- AdminDistributedSystemImpl system) {
+ AdminDistributedSystemImpl system) {
super(config, system);
initializeMBean();
}
/** Create and register the MBean to manage this resource */
private void initializeMBean() {
- this.mbeanName = "GemFire:type=DistributionLocator,id=" + MBeanUtil.makeCompliantMBeanNameProperty(getId());
- this.objectName =
- MBeanUtil.createMBean(this, MBeanUtil.lookupManagedBean(this));
+ this.mbeanName =
+ "GemFire:type=DistributionLocator,id=" + MBeanUtil.makeCompliantMBeanNameProperty(getId());
+ this.objectName = MBeanUtil.createMBean(this, MBeanUtil.lookupManagedBean(this));
}
- //////////////////////// Configuration ////////////////////////
+ //////////////////////// Configuration ////////////////////////
public String getHost() {
return this.getConfig().getHost();
@@ -112,7 +109,7 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource,
public java.util.Properties getDistributedSystemProperties() {
return this.getConfig().getDistributedSystemProperties();
}
-
+
public void setDistributedSystemProperties(java.util.Properties props) {
this.getConfig().setDistributedSystemProperties(props);
}
@@ -143,34 +140,35 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource,
}
// -------------------------------------------------------------------------
- // MBean attributes - accessors/mutators
+ // MBean attributes - accessors/mutators
// -------------------------------------------------------------------------
-
+
// -------------------------------------------------------------------------
- // JMX Notification listener
+ // JMX Notification listener
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
- // ManagedResource implementation
+ // ManagedResource implementation
// -------------------------------------------------------------------------
-
+
/** The name of the MBean that will manage this resource */
private String mbeanName;
/** The ModelMBean that is configured to manage this resource */
private ModelMBean modelMBean;
-
- public String getMBeanName() {
- return this.mbeanName;
- }
-
- public ModelMBean getModelMBean() {
- return this.modelMBean;
- }
- public void setModelMBean(ModelMBean modelMBean) {
- this.modelMBean = modelMBean;
- }
-
+
+ public String getMBeanName() {
+ return this.mbeanName;
+ }
+
+ public ModelMBean getModelMBean() {
+ return this.modelMBean;
+ }
+
+ public void setModelMBean(ModelMBean modelMBean) {
+ this.modelMBean = modelMBean;
+ }
+
public ObjectName getObjectName() {
return this.objectName;
}
@@ -178,8 +176,8 @@ implements org.apache.geode.admin.jmx.internal.ManagedResource,
public ManagedResourceType getManagedResourceType() {
return ManagedResourceType.DISTRIBUTION_LOCATOR;
}
-
+
public void cleanupResource() {}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
index 1b62fb0..32ee5b4 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DynamicManagedBean.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -26,17 +24,17 @@ import org.apache.commons.modeler.OperationInfo;
import org.apache.commons.modeler.ManagedBean;
/**
- * Extends ManagedBean to allow for dynamically creating new instances of
- * ManagedBean based on an existing instance of ManagedBean.
+ * Extends ManagedBean to allow for dynamically creating new instances of ManagedBean based on an
+ * existing instance of ManagedBean.
*
* @since GemFire 5.0.1
*/
public class DynamicManagedBean extends org.apache.commons.modeler.ManagedBean {
private static final long serialVersionUID = 4051924500150228160L;
-
+
public DynamicManagedBean(ManagedBean managed) {
super();
-
+
this.attributes = managed.getAttributes();
this.className = managed.getClassName();
this.constructors = managed.getConstructors();
@@ -48,9 +46,11 @@ public class DynamicManagedBean extends org.apache.commons.modeler.ManagedBean {
this.notifications = managed.getNotifications();
this.operations = managed.getOperations();
this.type = managed.getType();
-
- /* we don't use modelerType and it's nice to remove it to keep the list of
- attributes cleaned up...*/
+
+ /*
+ * we don't use modelerType and it's nice to remove it to keep the list of attributes cleaned
+ * up...
+ */
removeAttribute("modelerType");
}
@@ -70,22 +70,23 @@ public class DynamicManagedBean extends org.apache.commons.modeler.ManagedBean {
attributesList.add(this.attributes[i]);
}
}
- this.attributes = (AttributeInfo[])
- attributesList.toArray(new AttributeInfo[attributesList.size()]);
-
- /* super.info should be nulled out anytime the structure is changed,
- * such as altering the attributes, operations, or notifications
+ this.attributes =
+ (AttributeInfo[]) attributesList.toArray(new AttributeInfo[attributesList.size()]);
+
+ /*
+ * super.info should be nulled out anytime the structure is changed, such as altering the
+ * attributes, operations, or notifications
*
- * however super.info is private, so we need the following hack to cause
- * the super class to null it out for us...
+ * however super.info is private, so we need the following hack to cause the super class to
+ * null it out for us...
*/
setType(this.type); // causes this in super: "this.info = null;"
}
}
/**
- * Removes the operation with the given name from thie
- * <code>ManageBean</code>'s operation descriptor list.
+ * Removes the operation with the given name from thie <code>ManageBean</code>'s operation
+ * descriptor list.
*
* @since GemFire 4.0
*/
@@ -101,14 +102,15 @@ public class DynamicManagedBean extends org.apache.commons.modeler.ManagedBean {
operationsList.add(this.operations[i]);
}
}
- this.operations = (OperationInfo[])
- operationsList.toArray(new OperationInfo[operationsList.size()]);
-
- /* super.info should be nulled out anytime the structure is changed,
- * such as altering the operations, operations, or notifications
+ this.operations =
+ (OperationInfo[]) operationsList.toArray(new OperationInfo[operationsList.size()]);
+
+ /*
+ * super.info should be nulled out anytime the structure is changed, such as altering the
+ * operations, operations, or notifications
*
- * however super.info is private, so we need the following hack to cause
- * the super class to null it out for us...
+ * however super.info is private, so we need the following hack to cause the super class to
+ * null it out for us...
*/
setType(this.type); // causes this in super: "this.info = null;"
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
index f1bfa55..6c44811 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -25,29 +23,27 @@ import org.apache.geode.admin.GemFireHealthConfig;
import org.apache.geode.admin.internal.GemFireHealthConfigImpl;
/**
- * The JMX "managed resource" that represents the configuration for
- * the health of GemFire. Basically, it provides the behavior of
- * <code>GemFireHealthConfigImpl</code>, but does some JMX stuff like
- * registering beans with the agent.
+ * The JMX "managed resource" that represents the configuration for the health of GemFire.
+ * Basically, it provides the behavior of <code>GemFireHealthConfigImpl</code>, but does some JMX
+ * stuff like registering beans with the agent.
*
* <P>
*
- * Unlike other <code>ManagedResource</code>s this class cannot simply
- * subclass <code>GemFireHealthImpl</code> because it instances are
- * serialized and sent to other VMs. This is problematic because the
- * other VMs most likely do not have JMX classes like
- * <code>ModelMBean</code> on their classpaths. So, instead we
- * delegate all of the <code>GemFireHealthConfig</code> behavior to
- * another object which IS serialized.
+ * Unlike other <code>ManagedResource</code>s this class cannot simply subclass
+ * <code>GemFireHealthImpl</code> because it instances are serialized and sent to other VMs. This is
+ * problematic because the other VMs most likely do not have JMX classes like
+ * <code>ModelMBean</code> on their classpaths. So, instead we delegate all of the
+ * <code>GemFireHealthConfig</code> behavior to another object which IS serialized.
*
* @see GemFireHealthJmxImpl#createDistributedSystemHealthConfig
*
*
* @since GemFire 3.5
*/
-@edu.umd.cs.findbugs.annotations.SuppressWarnings(justification="This class is deprecated. Also, any further changes so close to the release is inadvisable.")
+@edu.umd.cs.findbugs.annotations.SuppressWarnings(
+ justification = "This class is deprecated. Also, any further changes so close to the release is inadvisable.")
public class GemFireHealthConfigJmxImpl
- implements GemFireHealthConfig, ManagedResource, java.io.Serializable {
+ implements GemFireHealthConfig, ManagedResource, java.io.Serializable {
private static final long serialVersionUID = 1482719647163239953L;
@@ -66,34 +62,28 @@ public class GemFireHealthConfigJmxImpl
/** The object name of this managed resource */
private ObjectName objectName;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>GemFireHealthConfigJmxImpl</code> that
- * configures the health monitoring of components running on the
- * given host.
+ * Creates a new <code>GemFireHealthConfigJmxImpl</code> that configures the health monitoring of
+ * components running on the given host.
*/
- GemFireHealthConfigJmxImpl(GemFireHealthJmxImpl health,
- String hostName)
- throws AdminException {
+ GemFireHealthConfigJmxImpl(GemFireHealthJmxImpl health, String hostName) throws AdminException {
this.delegate = new GemFireHealthConfigImpl(hostName);
this.health = health;
- this.mbeanName = new StringBuffer()
- .append(MBEAN_NAME_PREFIX)
- .append("GemFireHealthConfig,id=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(health.getDistributedSystem().getId()))
- .append(",host=")
- .append((hostName == null ? "default" : MBeanUtil.makeCompliantMBeanNameProperty(hostName)))
- .toString();
+ this.mbeanName = new StringBuffer().append(MBEAN_NAME_PREFIX).append("GemFireHealthConfig,id=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(health.getDistributedSystem().getId()))
+ .append(",host=")
+ .append((hostName == null ? "default" : MBeanUtil.makeCompliantMBeanNameProperty(hostName)))
+ .toString();
this.objectName = MBeanUtil.createMBean(this);
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Applies the changes made to this config back to the health
- * monitor.
+ * Applies the changes made to this config back to the health monitor.
*
* @see GemFireHealth#setDistributedSystemHealthConfig
*/
@@ -110,7 +100,7 @@ public class GemFireHealthConfigJmxImpl
public String getMBeanName() {
return this.mbeanName;
}
-
+
public ModelMBean getModelMBean() {
return this.modelMBean;
}
@@ -128,14 +118,13 @@ public class GemFireHealthConfigJmxImpl
}
/**
- * Replace this object with the delegate that can be properly
- * serialized.
+ * Replace this object with the delegate that can be properly serialized.
*/
public Object writeReplace() {
return this.delegate;
}
- ////////////////////// MemberHealthConfig //////////////////////
+ ////////////////////// MemberHealthConfig //////////////////////
public long getMaxVMProcessSize() {
return delegate.getMaxVMProcessSize();
@@ -164,14 +153,14 @@ public class GemFireHealthConfigJmxImpl
public double getMaxRetransmissionRatio() {
return delegate.getMaxRetransmissionRatio();
}
-
+
public void setMaxRetransmissionRatio(double ratio) {
delegate.setMaxRetransmissionRatio(ratio);
}
- ////////////////////// CacheHealthConfig //////////////////////
+ ////////////////////// CacheHealthConfig //////////////////////
- public long getMaxNetSearchTime() {
+ public long getMaxNetSearchTime() {
return delegate.getMaxNetSearchTime();
}
@@ -203,7 +192,7 @@ public class GemFireHealthConfigJmxImpl
delegate.setMaxEventQueueSize(maxEventQueueSize);
}
- ////////////////////// GemFireHealthConfig //////////////////////
+ ////////////////////// GemFireHealthConfig //////////////////////
public String getHostName() {
return delegate.getHostName();
@@ -218,5 +207,5 @@ public class GemFireHealthConfigJmxImpl
}
public void cleanupResource() {}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
index 1f8d322..a47ff27 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GemFireHealthJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -31,24 +29,22 @@ import org.apache.geode.admin.internal.GemFireHealthImpl;
import org.apache.geode.internal.admin.GfManagerAgent;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.logging.LogService;
-//import org.apache.commons.modeler.ManagedBean;
+// import org.apache.commons.modeler.ManagedBean;
/**
- * The JMX "managed resource" that represents the health of GemFire.
- * Basically, it provides the behavior of
- * <code>GemFireHealthImpl</code>, but does some JMX stuff like
- * registering beans with the agent.
+ * The JMX "managed resource" that represents the health of GemFire. Basically, it provides the
+ * behavior of <code>GemFireHealthImpl</code>, but does some JMX stuff like registering beans with
+ * the agent.
*
* @see AdminDistributedSystemJmxImpl#createGemFireHealth
*
*
* @since GemFire 3.5
*/
-public class GemFireHealthJmxImpl extends GemFireHealthImpl
- implements ManagedResource {
+public class GemFireHealthJmxImpl extends GemFireHealthImpl implements ManagedResource {
private static final Logger logger = LogService.getLogger();
-
+
/** The name of the MBean that will manage this resource */
private String mbeanName;
@@ -58,71 +54,67 @@ public class GemFireHealthJmxImpl extends GemFireHealthImpl
/** The object name of the MBean created for this managed resource */
private final ObjectName objectName;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>GemFireHealthJmxImpl</code> that monitors the
- * health of the given distributed system and uses the given JMX
- * agent.
+ * Creates a new <code>GemFireHealthJmxImpl</code> that monitors the health of the given
+ * distributed system and uses the given JMX agent.
*/
- GemFireHealthJmxImpl(GfManagerAgent agent,
- AdminDistributedSystemJmxImpl system)
- throws AdminException {
+ GemFireHealthJmxImpl(GfManagerAgent agent, AdminDistributedSystemJmxImpl system)
+ throws AdminException {
super(agent, system);
- this.mbeanName = new StringBuffer()
- .append(MBEAN_NAME_PREFIX)
- .append("GemFireHealth,id=")
- .append(MBeanUtil.makeCompliantMBeanNameProperty(system.getId()))
- .toString();
+ this.mbeanName = new StringBuffer().append(MBEAN_NAME_PREFIX).append("GemFireHealth,id=")
+ .append(MBeanUtil.makeCompliantMBeanNameProperty(system.getId())).toString();
this.objectName = MBeanUtil.createMBean(this);
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
public String getHealthStatus() {
return getHealth().toString();
}
-
- public ObjectName manageGemFireHealthConfig(String hostName)
- throws MalformedObjectNameException {
+
+ public ObjectName manageGemFireHealthConfig(String hostName) throws MalformedObjectNameException {
try {
GemFireHealthConfig config = getGemFireHealthConfig(hostName);
GemFireHealthConfigJmxImpl jmx = (GemFireHealthConfigJmxImpl) config;
return new ObjectName(jmx.getMBeanName());
- } //catch (AdminException e) { logWriter.warning(e); throw e; }
- catch (RuntimeException e) {
- logger.warn(e.getMessage(), e);
- throw e;
+ } // catch (AdminException e) { logWriter.warning(e); throw e; }
+ catch (RuntimeException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
logger.error(e.getMessage(), e);
- throw e;
+ throw e;
}
}
-
+
/**
* Creates a new {@link DistributedSystemHealthConfigJmxImpl}
*/
@Override
- protected DistributedSystemHealthConfig
- createDistributedSystemHealthConfig() {
+ protected DistributedSystemHealthConfig createDistributedSystemHealthConfig() {
try {
return new DistributedSystemHealthConfigJmxImpl(this);
} catch (AdminException ex) {
- throw new RuntimeAdminException(LocalizedStrings.GemFireHealthJmxImpl_WHILE_GETTING_THE_DISTRIBUTEDSYSTEMHEALTHCONFIG.toLocalizedString(), ex);
+ throw new RuntimeAdminException(
+ LocalizedStrings.GemFireHealthJmxImpl_WHILE_GETTING_THE_DISTRIBUTEDSYSTEMHEALTHCONFIG
+ .toLocalizedString(),
+ ex);
}
}
@@ -130,31 +122,32 @@ public class GemFireHealthJmxImpl extends GemFireHealthImpl
* Creates a new {@link GemFireHealthConfigJmxImpl}
*/
@Override
- protected GemFireHealthConfig
- createGemFireHealthConfig(String hostName) {
+ protected GemFireHealthConfig createGemFireHealthConfig(String hostName) {
try {
return new GemFireHealthConfigJmxImpl(this, hostName);
} catch (AdminException ex) {
- throw new RuntimeAdminException(LocalizedStrings.GemFireHealthJmxImpl_WHILE_GETTING_THE_GEMFIREHEALTHCONFIG.toLocalizedString(), ex);
+ throw new RuntimeAdminException(
+ LocalizedStrings.GemFireHealthJmxImpl_WHILE_GETTING_THE_GEMFIREHEALTHCONFIG
+ .toLocalizedString(),
+ ex);
}
}
/**
- * Ensures that the three primary Health MBeans are registered and returns
- * their ObjectNames.
+ * Ensures that the three primary Health MBeans are registered and returns their ObjectNames.
*/
protected void ensureMBeansAreRegistered() {
MBeanUtil.ensureMBeanIsRegistered(this);
- MBeanUtil.ensureMBeanIsRegistered((ManagedResource)this.defaultConfig);
- MBeanUtil.ensureMBeanIsRegistered((ManagedResource)this.dsHealthConfig);
+ MBeanUtil.ensureMBeanIsRegistered((ManagedResource) this.defaultConfig);
+ MBeanUtil.ensureMBeanIsRegistered((ManagedResource) this.dsHealthConfig);
}
-
+
public String getMBeanName() {
return this.mbeanName;
}
-
+
public ModelMBean getModelMBean() {
return this.modelMBean;
}
@@ -174,5 +167,5 @@ public class GemFireHealthJmxImpl extends GemFireHealthImpl
public void cleanupResource() {
close();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
index 2c4f63e..5375a19 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/GenerateMBeanHTML.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -24,12 +22,11 @@ import javax.xml.parsers.SAXParserFactory;
import org.xml.sax.*;
import org.xml.sax.helpers.DefaultHandler;
import java.io.*;
-//import java.util.*;
+// import java.util.*;
/**
- * A tool that reads the XML description of MBeans used with the
- * Jakarta Commons Modeler and generates an HTML file that documents
- * each MBean.
+ * A tool that reads the XML description of MBeans used with the Jakarta Commons Modeler and
+ * generates an HTML file that documents each MBean.
*
* @since GemFire 3.5
*/
@@ -37,15 +34,15 @@ public class GenerateMBeanHTML extends DefaultHandler {
/** The location of the DTD for the MBean descriptions */
private static final String DTD_LOCATION =
- "/org/apache/geode/admin/jmx/internal/doc-files/mbeans-descriptors.dtd";
+ "/org/apache/geode/admin/jmx/internal/doc-files/mbeans-descriptors.dtd";
-// /** The system id of MBean description's DTD */
-// private static final String SYSTEM_ID =
-// "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";
+ // /** The system id of MBean description's DTD */
+ // private static final String SYSTEM_ID =
+ // "http://jakarta.apache.org/commons/dtds/mbeans-descriptors.dtd";
-// /** The public id for the DTD */
-// private static final String PUBLIC_ID =
-// "-//Apache Software Foundation//DTD Model MBeans Configuration File";
+ // /** The public id for the DTD */
+ // private static final String PUBLIC_ID =
+ // "-//Apache Software Foundation//DTD Model MBeans Configuration File";
/** The name of the "mbean-descriptors" element */
private static final String MBEANS_DESCRIPTORS = "mbeans-descriptors";
@@ -80,8 +77,8 @@ public class GenerateMBeanHTML extends DefaultHandler {
/** The name of the "notification" element */
private static final String NOTIFICATION = "notification";
-// /** The name of the "description" element */
-// private static final String DESCRIPTOR = "descriptor";
+ // /** The name of the "description" element */
+ // private static final String DESCRIPTOR = "descriptor";
/** The name of the "field" element */
private static final String FIELD = "field";
@@ -89,7 +86,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
/** The name of the "value" attribute */
private static final String VALUE = "value";
- ////////////////////// Instance Fields ///////////////////////
+ ////////////////////// Instance Fields ///////////////////////
/** Where the generated HTML data is written */
private PrintWriter pw;
@@ -103,14 +100,13 @@ public class GenerateMBeanHTML extends DefaultHandler {
/** Have we seen notifications for the current MBean? */
private boolean seenNotifications = false;
- /////////////////////// Static Methods ///////////////////////
+ /////////////////////// Static Methods ///////////////////////
/**
- * Converts data from the given <code>InputStream</code> into HTML
- * that is written to the given <code>PrintWriter</code>
+ * Converts data from the given <code>InputStream</code> into HTML that is written to the given
+ * <code>PrintWriter</code>
*/
- private static void convert(InputStream in, PrintWriter out)
- throws Exception {
+ private static void convert(InputStream in, PrintWriter out) throws Exception {
SAXParserFactory factory = SAXParserFactory.newInstance();
factory.setValidating(true);
@@ -119,45 +115,47 @@ public class GenerateMBeanHTML extends DefaultHandler {
parser.parse(in, handler);
}
- //////////////////////// Constructors ////////////////////////
+ //////////////////////// Constructors ////////////////////////
/**
- * Creates a new <code>GenerateMBeanHTML</code> that writes to the
- * given <code>PrintWriter</code>.
+ * Creates a new <code>GenerateMBeanHTML</code> that writes to the given <code>PrintWriter</code>.
*/
private GenerateMBeanHTML(PrintWriter pw) {
this.pw = pw;
}
- ////////////////////// Instance Methods //////////////////////
+ ////////////////////// Instance Methods //////////////////////
/**
- * Given a public id, attempt to resolve it to a DTD. Returns an
- * <code>InputSoure</code> for the DTD.
+ * Given a public id, attempt to resolve it to a DTD. Returns an <code>InputSoure</code> for the
+ * DTD.
*/
@Override
- public InputSource resolveEntity(String publicId, String systemId)
- throws SAXException {
+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException {
if (publicId == null || systemId == null) {
- throw new SAXException(LocalizedStrings.GenerateMBeanHTML_PUBLIC_ID_0_SYSTEM_ID_1.toLocalizedString(new Object[] {publicId, systemId}));
+ throw new SAXException(LocalizedStrings.GenerateMBeanHTML_PUBLIC_ID_0_SYSTEM_ID_1
+ .toLocalizedString(new Object[] {publicId, systemId}));
}
// Figure out the location for the publicId.
String location = DTD_LOCATION;
InputSource result;
-// if (location != null) (cannot be null)
+ // if (location != null) (cannot be null)
{
InputStream stream = ClassPathLoader.getLatest().getResourceAsStream(getClass(), location);
if (stream != null) {
result = new InputSource(stream);
} else {
- throw new SAXNotRecognizedException(LocalizedStrings.GenerateMBeanHTML_DTD_NOT_FOUND_0.toLocalizedString(location));
+ throw new SAXNotRecognizedException(
+ LocalizedStrings.GenerateMBeanHTML_DTD_NOT_FOUND_0.toLocalizedString(location));
}
-// } else {
-// throw new SAXNotRecognizedException(LocalizedStrings.GenerateMBeanHTML_COULD_NOT_FIND_DTD_FOR_0_1.toLocalizedString(new Object[] {publicId, systemId}));
+ // } else {
+ // throw new
+ // SAXNotRecognizedException(LocalizedStrings.GenerateMBeanHTML_COULD_NOT_FIND_DTD_FOR_0_1.toLocalizedString(new
+ // Object[] {publicId, systemId}));
}
return result;
@@ -167,7 +165,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
* Warnings are ignored
*/
@Override
- public void warning(SAXParseException ex) throws SAXException {
+ public void warning(SAXParseException ex) throws SAXException {
}
@@ -178,7 +176,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
public void error(SAXParseException ex) throws SAXException {
throw ex;
}
-
+
/**
* Rethrow the <code>SAXParseException</code>
*/
@@ -186,7 +184,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
public void fatalError(SAXParseException ex) throws SAXException {
throw ex;
}
-
+
/**
* Starts the HTML document
*/
@@ -198,9 +196,9 @@ public class GenerateMBeanHTML extends DefaultHandler {
pw.println("");
pw.println("<h1>GemFire Management Beans</h1>");
pw.println("");
- pw.println("<P>This document describes the attributes, operations,");
+ pw.println("<P>This document describes the attributes, operations,");
pw.println("and notifications of the GemFire Administration");
- pw.println("Management Beans (MBeans).</P>");
+ pw.println("Management Beans (MBeans).</P>");
pw.println("");
}
@@ -216,7 +214,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
*/
private void startMBean(Attributes atts) {
String name = atts.getValue(NAME);
- /*String description =*/ atts.getValue(DESCRIPTION);
+ /* String description = */ atts.getValue(DESCRIPTION);
pw.println("<h2><b>" + name + "</b> MBean</h2>");
pw.println("<table border=\"0\" cellpadding=\"3\">");
pw.println("<tr valign=\"top\">");
@@ -287,7 +285,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
pw.println("</tr>");
} else {
- String title = "Operations and Parameters";
+ String title = "Operations and Parameters";
pw.println("<tr valign=\"top\">");
pw.println(" <th align=\"left\" colspan=\"6\">" + title + "</th>");
pw.println("</tr>");
@@ -306,7 +304,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
pw.println(" <td>" + type + "</td>");
pw.println(" <td colspan=\"2\">" + description + "</td>");
pw.println("</tr>");
-
+
}
/**
@@ -352,13 +350,13 @@ public class GenerateMBeanHTML extends DefaultHandler {
String name = atts.getValue(NAME);
String description = atts.getValue(DESCRIPTION);
-
+
pw.println("<tr valign=\"top\">");
pw.println(" <td></td>");
pw.println(" <td colspan=\"3\">" + name + "</td>");
pw.println(" <td colspan=\"3\">" + description + "</td>");
pw.println("</tr>");
-
+
}
/**
@@ -374,13 +372,12 @@ public class GenerateMBeanHTML extends DefaultHandler {
pw.println(" <td colspan=\"2\">" + name + "</td>");
pw.println(" <td colspan=\"2\">" + value + "</td>");
pw.println("</tr>");
-
+
}
@Override
- public void startElement(String namespaceURI, String localName,
- String qName, Attributes atts)
- throws SAXException {
+ public void startElement(String namespaceURI, String localName, String qName, Attributes atts)
+ throws SAXException {
if (qName.equals(MBEANS_DESCRIPTORS)) {
startMBeansDescriptors();
@@ -408,9 +405,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
@Override
- public void endElement(String namespaceURI, String localName,
- String qName)
- throws SAXException {
+ public void endElement(String namespaceURI, String localName, String qName) throws SAXException {
if (qName.equals(MBEANS_DESCRIPTORS)) {
endMBeansDescriptors();
@@ -421,45 +416,40 @@ public class GenerateMBeanHTML extends DefaultHandler {
}
- ////////// Inherited methods that don't do anything //////////
+ ////////// Inherited methods that don't do anything //////////
@Override
- public void characters(char[] ch, int start, int length)
- throws SAXException {
+ public void characters(char[] ch, int start, int length) throws SAXException {
}
@Override
- public void setDocumentLocator(Locator locator) { }
+ public void setDocumentLocator(Locator locator) {}
@Override
- public void startDocument() throws SAXException { }
+ public void startDocument() throws SAXException {}
@Override
- public void endDocument() throws SAXException { }
+ public void endDocument() throws SAXException {}
@Override
- public void startPrefixMapping(String prefix, String uri)
- throws SAXException { }
+ public void startPrefixMapping(String prefix, String uri) throws SAXException {}
@Override
- public void endPrefixMapping(String prefix)
- throws SAXException { }
+ public void endPrefixMapping(String prefix) throws SAXException {}
@Override
- public void ignorableWhitespace(char[] ch, int start, int length)
- throws SAXException { }
+ public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {}
@Override
- public void processingInstruction(String target, String data)
- throws SAXException { }
+ public void processingInstruction(String target, String data) throws SAXException {}
@Override
- public void skippedEntity(String name) throws SAXException { }
+ public void skippedEntity(String name) throws SAXException {}
- //////////////////////// Main Program ////////////////////////
+ //////////////////////// Main Program ////////////////////////
-// private static final PrintStream out = System.out;
+ // private static final PrintStream out = System.out;
private static final PrintStream err = System.err;
/**
@@ -506,8 +496,7 @@ public class GenerateMBeanHTML extends DefaultHandler {
}
File htmlFile = new File(htmlFileName);
- convert(new FileInputStream(xmlFile),
- new PrintWriter(new FileWriter(htmlFile), true));
+ convert(new FileInputStream(xmlFile), new PrintWriter(new FileWriter(htmlFile), true));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
index d805b8a..b2c5883 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MBeanUtil.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -52,48 +50,48 @@ import org.apache.geode.internal.logging.InternalLogWriter;
import org.apache.geode.internal.logging.LogService;
/**
- * Common support for MBeans and {@link ManagedResource}s. Static loading of
- * this class creates the MBeanServer and Modeler Registry.
+ * Common support for MBeans and {@link ManagedResource}s. Static loading of this class creates the
+ * MBeanServer and Modeler Registry.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
public class MBeanUtil {
-
+
private static final Logger logger = LogService.getLogger();
-
+
/** The default MBeanServer domain name is "GemFire" */
private static final String DEFAULT_DOMAIN = "GemFire";
/** MBean Name for refreshTimer */
private static String REFRESH_TIMER_NAME = DEFAULT_DOMAIN + ":type=RefreshTimer";
-
+
/* indicates whether the mbeanServer, registry & refreshTimer are started */
private static boolean isStarted;
-
+
/** The Commons-Modeler configuration registry for our managed beans */
private static Registry registry;
/** The <code>MBeanServer</code> for this application */
private static MBeanServer mbeanServer;
-
+
/** MBean name of the Timer which handles refresh notifications */
private static ObjectName refreshTimerObjectName;
-
+
/** Actual TimerMBean responsible for refresh notifications */
private static TimerMBean refreshTimer;
-
- /**
+
+ /**
* Map of ObjectNames to current timerNotificationIds
* <p>
- * map: key=ObjectName,
- * value=map: key=RefreshNotificationType,
- * value=timerNotificationId
+ * map: key=ObjectName, value=map: key=RefreshNotificationType, value=timerNotificationId
*/
- private static Map<NotificationListener, Map<RefreshNotificationType, Integer>> refreshClients = new HashMap<NotificationListener, Map<RefreshNotificationType, Integer>>();
-
+ private static Map<NotificationListener, Map<RefreshNotificationType, Integer>> refreshClients =
+ new HashMap<NotificationListener, Map<RefreshNotificationType, Integer>>();
+
/** key=ObjectName, value=ManagedResource */
- private final static Map<ObjectName, ManagedResource> managedResources = new HashMap<ObjectName, ManagedResource>();
+ private final static Map<ObjectName, ManagedResource> managedResources =
+ new HashMap<ObjectName, ManagedResource>();
static {
try {
@@ -102,18 +100,17 @@ public class MBeanUtil {
logStackTrace(Level.ERROR, e);
}
}
-
+
/**
- * Initializes Mbean Server, Registry, Refresh Timer & registers Server
- * Notification Listener.
+ * Initializes Mbean Server, Registry, Refresh Timer & registers Server Notification Listener.
*
* @return reference to the mbeanServer
*/
static MBeanServer start() {
if (!isStarted) {
mbeanServer = createMBeanServer();
- registry = createRegistry();
-
+ registry = createRegistry();
+
registerServerNotificationListener();
createRefreshTimer();
isStarted = true;
@@ -121,25 +118,24 @@ public class MBeanUtil {
return mbeanServer;
}
-
+
/**
* Stops Registry, Refresh Timer. Releases Mbean Server after.
*/
static void stop() {
if (isStarted) {
stopRefreshTimer();
-
+
registry.stop();
registry = null;
- releaseMBeanServer();//makes mbeanServer null
+ releaseMBeanServer();// makes mbeanServer null
isStarted = false;
}
}
/**
- * Create and configure (if necessary) and return the <code>MBeanServer</code>
- * with which we will be registering our <code>ModelMBean</code>
- * implementations.
+ * Create and configure (if necessary) and return the <code>MBeanServer</code> with which we will
+ * be registering our <code>ModelMBean</code> implementations.
*
* @see javax.management.MBeanServer
*/
@@ -151,8 +147,8 @@ public class MBeanUtil {
}
/**
- * Create and configure (if necessary) and return the Commons-Modeler registry
- * of managed object descriptions.
+ * Create and configure (if necessary) and return the Commons-Modeler registry of managed object
+ * descriptions.
*
* @see org.apache.commons.modeler.Registry
*/
@@ -161,37 +157,37 @@ public class MBeanUtil {
try {
registry = Registry.getRegistry(null, null);
if (mbeanServer == null) {
- throw new IllegalStateException(LocalizedStrings.MBeanUtil_MBEAN_SERVER_NOT_INITIALIZED_YET.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.MBeanUtil_MBEAN_SERVER_NOT_INITIALIZED_YET.toLocalizedString());
}
registry.setMBeanServer(mbeanServer);
-
+
String mbeansResource = getOSPath("/org/apache/geode/admin/jmx/mbeans-descriptors.xml");
- //System.out.println(LocalizedStrings.MBeanUtil_LOADING_RESOURCE_0.toLocalizedString(mbeansResource));
-
+ // System.out.println(LocalizedStrings.MBeanUtil_LOADING_RESOURCE_0.toLocalizedString(mbeansResource));
+
URL url = ClassPathLoader.getLatest().getResource(MBeanUtil.class, mbeansResource);
- raiseOnFailure(url != null,
- LocalizedStrings.MBeanUtil_FAILED_TO_FIND_0.toLocalizedString(new Object[] {mbeansResource}));
+ raiseOnFailure(url != null, LocalizedStrings.MBeanUtil_FAILED_TO_FIND_0
+ .toLocalizedString(new Object[] {mbeansResource}));
registry.loadMetadata(url);
-
+
// simple test to make sure the xml was actually loaded and is valid...
String[] test = registry.findManagedBeans();
- raiseOnFailure(test != null && test.length > 0,
- LocalizedStrings.MBeanUtil_FAILED_TO_LOAD_0.toLocalizedString(new Object[] {mbeansResource}));
+ raiseOnFailure(test != null && test.length > 0, LocalizedStrings.MBeanUtil_FAILED_TO_LOAD_0
+ .toLocalizedString(new Object[] {mbeansResource}));
} catch (Exception e) {
logStackTrace(Level.WARN, e);
- throw new RuntimeAdminException(LocalizedStrings.MBeanUtil_FAILED_TO_GET_MBEAN_REGISTRY.toLocalizedString(), e);
+ throw new RuntimeAdminException(
+ LocalizedStrings.MBeanUtil_FAILED_TO_GET_MBEAN_REGISTRY.toLocalizedString(), e);
}
}
return registry;
}
/**
- * Creates and registers a <code>ModelMBean</code> for the specified
- * <code>ManagedResource</code>. State changing callbacks into the
- * <code>ManagedResource</code> will also be made.
+ * Creates and registers a <code>ModelMBean</code> for the specified <code>ManagedResource</code>.
+ * State changing callbacks into the <code>ManagedResource</code> will also be made.
*
- * @param resource
- * the ManagedResource to create a managing MBean for
+ * @param resource the ManagedResource to create a managing MBean for
*
* @return The object name of the newly-created MBean
*
@@ -200,14 +196,13 @@ public class MBeanUtil {
static ObjectName createMBean(ManagedResource resource) {
return createMBean(resource, lookupManagedBean(resource));
}
-
+
/**
- * Creates and registers a <code>ModelMBean</code> for the specified
- * <code>ManagedResource</code>. State changing callbacks into the
- * <code>ManagedResource</code> will also be made.
+ * Creates and registers a <code>ModelMBean</code> for the specified <code>ManagedResource</code>.
+ * State changing callbacks into the <code>ManagedResource</code> will also be made.
*
* @param resource the ManagedResource to create a managing MBean for
- * @param managed the ManagedBean definition to create the MBean with
+ * @param managed the ManagedBean definition to create the MBean with
* @see ManagedResource#setModelMBean
*/
static ObjectName createMBean(ManagedResource resource, ManagedBean managed) {
@@ -215,17 +210,18 @@ public class MBeanUtil {
try {
DynamicManagedBean mb = new DynamicManagedBean(managed);
resource.setModelMBean(mb.createMBean(resource));
-
+
// create the ObjectName and register the MBean...
final ObjectName objName;
try {
objName = ObjectName.getInstance(resource.getMBeanName());
} catch (MalformedObjectNameException e) {
- throw new MalformedObjectNameException(LocalizedStrings.MBeanUtil_0_IN_1.toLocalizedString(new Object[] { e.getMessage(), resource.getMBeanName()} ) );
+ throw new MalformedObjectNameException(LocalizedStrings.MBeanUtil_0_IN_1
+ .toLocalizedString(new Object[] {e.getMessage(), resource.getMBeanName()}));
}
synchronized (MBeanUtil.class) {
- // Only register a bean once. Otherwise, you risk race
+ // Only register a bean once. Otherwise, you risk race
// conditions with things like the RMI connector accessing it.
if (mbeanServer != null && !mbeanServer.isRegistered(objName)) {
@@ -237,19 +233,18 @@ public class MBeanUtil {
}
return objName;
} catch (java.lang.Exception e) {
- throw new RuntimeAdminException(LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_MBEAN_FOR_0.toLocalizedString(new Object[]{resource.getMBeanName()}), e);
+ throw new RuntimeAdminException(LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_MBEAN_FOR_0
+ .toLocalizedString(new Object[] {resource.getMBeanName()}), e);
}
}
-
+
/**
- * Ensures that an MBean is registered for the specified
- * <code>ManagedResource</code>. If an MBean cannot be found in the
- * <code>MBeanServer</code>, then this creates and registers a
- * <code>ModelMBean</code>. State changing callbacks into the
- * <code>ManagedResource</code> will also be made.
+ * Ensures that an MBean is registered for the specified <code>ManagedResource</code>. If an MBean
+ * cannot be found in the <code>MBeanServer</code>, then this creates and registers a
+ * <code>ModelMBean</code>. State changing callbacks into the <code>ManagedResource</code> will
+ * also be made.
*
- * @param resource
- * the ManagedResource to create a managing MBean for
+ * @param resource the ManagedResource to create a managing MBean for
*
* @return The object name of the MBean that manages the ManagedResource
*
@@ -263,18 +258,18 @@ public class MBeanUtil {
return createMBean(resource);
}
}
- raiseOnFailure(mbeanServer.isRegistered(objName),
- LocalizedStrings.MBeanUtil_COULDNT_FIND_MBEAN_REGISTERED_WITH_OBJECTNAME_0.toLocalizedString(new Object[] {objName.toString()}));
+ raiseOnFailure(mbeanServer.isRegistered(objName),
+ LocalizedStrings.MBeanUtil_COULDNT_FIND_MBEAN_REGISTERED_WITH_OBJECTNAME_0
+ .toLocalizedString(new Object[] {objName.toString()}));
return objName;
- }
- catch (java.lang.Exception e) {
+ } catch (java.lang.Exception e) {
throw new RuntimeAdminException(e);
}
}
-
+
/**
- * Retrieves the <code>ManagedBean</code> configuration from the Registry for
- * the specified <code>ManagedResource</code>
+ * Retrieves the <code>ManagedBean</code> configuration from the Registry for the specified
+ * <code>ManagedResource</code>
*
* @param resource the ManagedResource to find the configuration for
*/
@@ -282,60 +277,62 @@ public class MBeanUtil {
// find the registry defn for our MBean...
ManagedBean managed = null;
if (registry != null) {
- managed = registry.findManagedBean(
- resource.getManagedResourceType().getClassTypeName());
+ managed = registry.findManagedBean(resource.getManagedResourceType().getClassTypeName());
} else {
- throw new IllegalArgumentException(LocalizedStrings.MBeanUtil_MANAGEDBEAN_IS_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.MBeanUtil_MANAGEDBEAN_IS_NULL.toLocalizedString());
}
-
+
if (managed == null) {
- throw new IllegalArgumentException(LocalizedStrings.MBeanUtil_MANAGEDBEAN_IS_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.MBeanUtil_MANAGEDBEAN_IS_NULL.toLocalizedString());
}
-
+
// customize the defn...
- managed.setClassName(
- "org.apache.geode.admin.jmx.internal.MX4JModelMBean");
+ managed.setClassName("org.apache.geode.admin.jmx.internal.MX4JModelMBean");
return managed;
}
/**
- * Registers a refresh notification for the specified client MBean.
- * Specifying zero for the refreshInterval disables notification for the
- * refresh client. Note: this does not currently support remote connections.
+ * Registers a refresh notification for the specified client MBean. Specifying zero for the
+ * refreshInterval disables notification for the refresh client. Note: this does not currently
+ * support remote connections.
*
- * @param client client to listen for refresh notifications
- * @param userData userData to register with the Notification
- * @param type refresh notification type the client will use
+ * @param client client to listen for refresh notifications
+ * @param userData userData to register with the Notification
+ * @param type refresh notification type the client will use
* @param refreshInterval the seconds between refreshes
*/
- static void registerRefreshNotification(NotificationListener client,
- Object userData,
- RefreshNotificationType type,
- int refreshInterval) {
+ static void registerRefreshNotification(NotificationListener client, Object userData,
+ RefreshNotificationType type, int refreshInterval) {
if (client == null) {
- throw new IllegalArgumentException(LocalizedStrings.MBeanUtil_NOTIFICATIONLISTENER_IS_REQUIRED.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.MBeanUtil_NOTIFICATIONLISTENER_IS_REQUIRED.toLocalizedString());
}
if (type == null) {
- throw new IllegalArgumentException(LocalizedStrings.MBeanUtil_REFRESHNOTIFICATIONTYPE_IS_REQUIRED.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.MBeanUtil_REFRESHNOTIFICATIONTYPE_IS_REQUIRED.toLocalizedString());
}
if (refreshTimerObjectName == null || refreshTimer == null) {
- throw new IllegalStateException(LocalizedStrings.MBeanUtil_REFRESHTIMER_HAS_NOT_BEEN_PROPERLY_INITIALIZED.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.MBeanUtil_REFRESHTIMER_HAS_NOT_BEEN_PROPERLY_INITIALIZED
+ .toLocalizedString());
}
-
+
try {
// get the notifications for the specified client...
Map<RefreshNotificationType, Integer> notifications = null;
synchronized (refreshClients) {
- notifications = (Map<RefreshNotificationType, Integer>) refreshClients.get(client);
+ notifications = (Map<RefreshNotificationType, Integer>) refreshClients.get(client);
}
-
+
if (notifications == null) {
// If refreshInterval is being set to zero and notifications is removed return
if (refreshInterval <= 0) {
return;
}
-
+
// never registered before, so add client...
notifications = new HashMap<RefreshNotificationType, Integer>();
synchronized (refreshClients) {
@@ -344,20 +341,21 @@ public class MBeanUtil {
validateRefreshTimer();
try {
// register client as a listener with MBeanServer...
- mbeanServer.addNotificationListener(
- refreshTimerObjectName, // timer to listen to
- client, // the NotificationListener object
- null, // optional NotificationFilter TODO: convert to using
- new Object() // not used but null throws IllegalArgumentException
- );
+ mbeanServer.addNotificationListener(refreshTimerObjectName, // timer to listen to
+ client, // the NotificationListener object
+ null, // optional NotificationFilter TODO: convert to using
+ new Object() // not used but null throws IllegalArgumentException
+ );
} catch (InstanceNotFoundException e) {
// should not happen since we already checked refreshTimerObjectName
- logStackTrace(Level.WARN, e, LocalizedStrings.MBeanUtil_COULD_NOT_FIND_REGISTERED_REFRESHTIMER_INSTANCE.toLocalizedString());
+ logStackTrace(Level.WARN, e,
+ LocalizedStrings.MBeanUtil_COULD_NOT_FIND_REGISTERED_REFRESHTIMER_INSTANCE
+ .toLocalizedString());
}
}
// TODO: change to manipulating timer indirectly thru mserver...
-
+
// check for pre-existing refresh notification entry...
Integer timerNotificationId = (Integer) notifications.get(type);
if (timerNotificationId != null) {
@@ -371,33 +369,31 @@ public class MBeanUtil {
notifications.put(type, null);
}
}
-
+
if (refreshInterval > 0) {
// add notification to the refresh timer...
- timerNotificationId = refreshTimer.addNotification(
- type.getType(), // type
- type.getMessage(), // message = "refresh"
- userData, // userData
- new Date(System.currentTimeMillis() +
- refreshInterval * 1000), // first occurence
- refreshInterval * 1000); // period to repeat
-
+ timerNotificationId = refreshTimer.addNotification(type.getType(), // type
+ type.getMessage(), // message = "refresh"
+ userData, // userData
+ new Date(System.currentTimeMillis() + refreshInterval * 1000), // first occurence
+ refreshInterval * 1000); // period to repeat
+
// put an entry into the map for the listener...
notifications.put(type, timerNotificationId);
} else {
- // do nothing! refreshInterval must be over 0 to do anything...
+ // do nothing! refreshInterval must be over 0 to do anything...
}
} catch (java.lang.RuntimeException e) {
logStackTrace(Level.WARN, e);
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -408,25 +404,25 @@ public class MBeanUtil {
}
/**
- * Verifies a refresh notification for the specified client MBean.
- * If notification is not registered, then returns a false
+ * Verifies a refresh notification for the specified client MBean. If notification is not
+ * registered, then returns a false
*
- * @param client client to listen for refresh notifications
- * @param type refresh notification type the client will use
+ * @param client client to listen for refresh notifications
+ * @param type refresh notification type the client will use
*
- * @return isRegistered boolean indicating if a notification is registered
+ * @return isRegistered boolean indicating if a notification is registered
*/
static boolean isRefreshNotificationRegistered(NotificationListener client,
- RefreshNotificationType type) {
+ RefreshNotificationType type) {
boolean isRegistered = false;
// get the notifications for the specified client...
Map<RefreshNotificationType, Integer> notifications = null;
- synchronized(refreshClients) {
+ synchronized (refreshClients) {
notifications = (Map<RefreshNotificationType, Integer>) refreshClients.get(client);
}
- // never registered before if null ...
+ // never registered before if null ...
if (notifications != null) {
// check for pre-existing refresh notification entry...
Integer timerNotificationId = notifications.get(type);
@@ -437,60 +433,62 @@ public class MBeanUtil {
return isRegistered;
}
-
- /**
- * Validates refreshTimer has been registered without problems and attempts
- * to re-register if there is a problem.
+
+ /**
+ * Validates refreshTimer has been registered without problems and attempts to re-register if
+ * there is a problem.
*/
static void validateRefreshTimer() {
if (refreshTimerObjectName == null || refreshTimer == null) {
- //if (refreshTimerObjectName == null) System.out.println("refreshTimerObjectName is null");
- //if (refreshTimer == null) System.out.println("refreshTimer is null");
- //System.out.println("[validateRefreshTimer] createRefreshTimer");
+ // if (refreshTimerObjectName == null) System.out.println("refreshTimerObjectName is null");
+ // if (refreshTimer == null) System.out.println("refreshTimer is null");
+ // System.out.println("[validateRefreshTimer] createRefreshTimer");
createRefreshTimer();
}
-
- raiseOnFailure(refreshTimer != null,
- "Failed to validate Refresh Timer");
+
+ raiseOnFailure(refreshTimer != null, "Failed to validate Refresh Timer");
if (mbeanServer != null && !mbeanServer.isRegistered(refreshTimerObjectName)) {
- //System.out.println("[validateRefreshTimer] registerMBean");
+ // System.out.println("[validateRefreshTimer] registerMBean");
try {
mbeanServer.registerMBean(refreshTimer, refreshTimerObjectName);
- } catch (JMException e) {
- logStackTrace(Level.WARN, e);
- } catch (JMRuntimeException e) {
- logStackTrace(Level.WARN, e);
- }
- }
+ } catch (JMException e) {
+ logStackTrace(Level.WARN, e);
+ } catch (JMRuntimeException e) {
+ logStackTrace(Level.WARN, e);
+ }
+ }
}
-
+
/**
* Initializes the timer for sending refresh notifications.
*/
- static void createRefreshTimer() {
+ static void createRefreshTimer() {
try {
refreshTimer = new javax.management.timer.Timer();
mbeanServer.registerMBean(refreshTimer, refreshTimerObjectName);
-
+
refreshTimer.start();
} catch (JMException e) {
- logStackTrace(Level.WARN, e, LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_REFRESH_TIMER.toLocalizedString());
+ logStackTrace(Level.WARN, e,
+ LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_REFRESH_TIMER.toLocalizedString());
} catch (JMRuntimeException e) {
- logStackTrace(Level.WARN, e, LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_REFRESH_TIMER.toLocalizedString());
+ logStackTrace(Level.WARN, e,
+ LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_REFRESH_TIMER.toLocalizedString());
} catch (Exception e) {
- logStackTrace(Level.WARN, e, LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_REFRESH_TIMER.toLocalizedString());
+ logStackTrace(Level.WARN, e,
+ LocalizedStrings.MBeanUtil_FAILED_TO_CREATE_REFRESH_TIMER.toLocalizedString());
}
}
-
+
/**
* Initializes the timer for sending refresh notifications.
*/
- static void stopRefreshTimer() {
+ static void stopRefreshTimer() {
try {
if (refreshTimer != null && mbeanServer != null) {
mbeanServer.unregisterMBean(refreshTimerObjectName);
-
+
refreshTimer.stop();
}
} catch (JMException e) {
@@ -498,26 +496,24 @@ public class MBeanUtil {
} catch (JMRuntimeException e) {
logStackTrace(Level.WARN, e);
} catch (Exception e) {
- logStackTrace(Level.DEBUG,e, "Failed to stop refresh timer for MBeanUtil");
+ logStackTrace(Level.DEBUG, e, "Failed to stop refresh timer for MBeanUtil");
}
}
-
+
/**
- * Return a String that been modified to be compliant as a property of an
- * ObjectName.
+ * Return a String that been modified to be compliant as a property of an ObjectName.
* <p>
- * The property name of an ObjectName may not contain any of the following
- * characters: <b><i>: , = * ?</i></b>
+ * The property name of an ObjectName may not contain any of the following characters: <b><i>: , =
+ * * ?</i></b>
* <p>
- * This method will replace the above non-compliant characters with a
- * dash: <b><i>-</i></b>
+ * This method will replace the above non-compliant characters with a dash: <b><i>-</i></b>
* <p>
* If value is empty, this method will return the string "nothing".
* <p>
- * Note: this is <code>public</code> because certain tests call this from
- * outside of the package. TODO: clean this up
+ * Note: this is <code>public</code> because certain tests call this from outside of the package.
+ * TODO: clean this up
*
- * @param value the potentially non-compliant ObjectName property
+ * @param value the potentially non-compliant ObjectName property
* @return the value modified to be compliant as an ObjectName property
*/
public static String makeCompliantMBeanNameProperty(String value) {
@@ -531,38 +527,41 @@ public class MBeanUtil {
}
return value;
}
-
+
/**
- * Unregisters all GemFire MBeans and then releases the MBeanServer for
- * garbage collection.
+ * Unregisters all GemFire MBeans and then releases the MBeanServer for garbage collection.
*/
static void releaseMBeanServer() {
try {
// unregister all GemFire mbeans...
Iterator iter = mbeanServer.queryNames(null, null).iterator();
while (iter.hasNext()) {
- ObjectName name = (ObjectName)iter.next();
+ ObjectName name = (ObjectName) iter.next();
if (name.getDomain().startsWith(DEFAULT_DOMAIN)) {
unregisterMBean(name);
}
}
-
+
// last, release the mbean server...
MBeanServerFactory.releaseMBeanServer(mbeanServer);
mbeanServer = null;
- } catch (JMRuntimeException e) {
- logStackTrace(Level.WARN, e);
- }
- /* See #42391. Cleaning up the static maps which might be still holding
- * references to ManagedResources */
- synchronized (MBeanUtil.managedResources) {
- MBeanUtil.managedResources.clear();
- }
- synchronized (refreshClients) {
- refreshClients.clear();
- }
- /* See #42391. Cleaning up the static maps which might be still holding
- * references to ManagedResources */
+ } catch (JMRuntimeException e) {
+ logStackTrace(Level.WARN, e);
+ }
+ /*
+ * See #42391. Cleaning up the static maps which might be still holding references to
+ * ManagedResources
+ */
+ synchronized (MBeanUtil.managedResources) {
+ MBeanUtil.managedResources.clear();
+ }
+ synchronized (refreshClients) {
+ refreshClients.clear();
+ }
+ /*
+ * See #42391. Cleaning up the static maps which might be still holding references to
+ * ManagedResources
+ */
synchronized (MBeanUtil.managedResources) {
MBeanUtil.managedResources.clear();
}
@@ -570,19 +569,18 @@ public class MBeanUtil {
refreshClients.clear();
}
}
-
+
/**
* Returns true if a MBean with given ObjectName is registered.
*
- * @param objectName
- * ObjectName to use for checking if MBean is registered
- * @return true if MBeanServer is not null & MBean with given ObjectName is
- * registered with the MBeanServer
+ * @param objectName ObjectName to use for checking if MBean is registered
+ * @return true if MBeanServer is not null & MBean with given ObjectName is registered with the
+ * MBeanServer
*/
static boolean isRegistered(ObjectName objectName) {
return mbeanServer != null && mbeanServer.isRegistered(objectName);
}
-
+
/**
* Unregisters the identified MBean if it's registered.
*/
@@ -592,25 +590,32 @@ public class MBeanUtil {
mbeanServer.unregisterMBean(objectName);
}
} catch (MBeanRegistrationException e) {
- logStackTrace(Level.WARN, null, LocalizedStrings.MBeanUtil_FAILED_WHILE_UNREGISTERING_MBEAN_WITH_OBJECTNAME_0.toLocalizedString(new Object[] {objectName}));
+ logStackTrace(Level.WARN, null,
+ LocalizedStrings.MBeanUtil_FAILED_WHILE_UNREGISTERING_MBEAN_WITH_OBJECTNAME_0
+ .toLocalizedString(new Object[] {objectName}));
} catch (InstanceNotFoundException e) {
- logStackTrace(Level.WARN, null, LocalizedStrings.MBeanUtil_WHILE_UNREGISTERING_COULDNT_FIND_MBEAN_WITH_OBJECTNAME_0.toLocalizedString(new Object[] {objectName}));
- } catch (JMRuntimeException e) {
- logStackTrace(Level.WARN, null, LocalizedStrings.MBeanUtil_COULD_NOT_UNREGISTER_MBEAN_WITH_OBJECTNAME_0.toLocalizedString(new Object[] {objectName}));
+ logStackTrace(Level.WARN, null,
+ LocalizedStrings.MBeanUtil_WHILE_UNREGISTERING_COULDNT_FIND_MBEAN_WITH_OBJECTNAME_0
+ .toLocalizedString(new Object[] {objectName}));
+ } catch (JMRuntimeException e) {
+ logStackTrace(Level.WARN, null,
+ LocalizedStrings.MBeanUtil_COULD_NOT_UNREGISTER_MBEAN_WITH_OBJECTNAME_0
+ .toLocalizedString(new Object[] {objectName}));
}
}
+
static void unregisterMBean(ManagedResource resource) {
if (resource != null) {
unregisterMBean(resource.getObjectName());
-
+
// call cleanup on managedResource here and not rely on listener
// since it is possible that notification listener not deliver
- // all notifications of un-registration. If resource is
+ // all notifications of un-registration. If resource is
// cleaned here, another call from the listener should be as good as a no-op
cleanupResource(resource);
}
}
-
+
// cleanup resource
private static void cleanupResource(ManagedResource resource) {
synchronized (MBeanUtil.managedResources) {
@@ -624,17 +629,17 @@ public class MBeanUtil {
notifications = (Map<RefreshNotificationType, Integer>) refreshClients.remove(resource);
}
- // never registered before if null ...
- // Also as of current, there is ever only 1 Notification type per
+ // never registered before if null ...
+ // Also as of current, there is ever only 1 Notification type per
// MBean, so we do need need a while loop here
if (notifications != null) {
// Fix for findbugs reported inefficiency with keySet().
Set<Map.Entry<RefreshNotificationType, Integer>> entries = notifications.entrySet();
-
- for(Map.Entry<RefreshNotificationType, Integer> e : entries) {
+
+ for (Map.Entry<RefreshNotificationType, Integer> e : entries) {
Integer timerNotificationId = e.getValue();
- if(null != timerNotificationId) {
+ if (null != timerNotificationId) {
try {
// found one, so let's remove it...
refreshTimer.removeNotification(timerNotificationId);
@@ -644,13 +649,12 @@ public class MBeanUtil {
}
}
}
-
+
try {
if (mbeanServer != null && mbeanServer.isRegistered(refreshTimerObjectName)) {
// remove client as a listener with MBeanServer...
- mbeanServer.removeNotificationListener(
- refreshTimerObjectName, // timer to listen to
- (NotificationListener)resource // the NotificationListener object
+ mbeanServer.removeNotificationListener(refreshTimerObjectName, // timer to listen to
+ (NotificationListener) resource // the NotificationListener object
);
}
} catch (ListenerNotFoundException xptn) {
@@ -658,11 +662,13 @@ public class MBeanUtil {
logStackTrace(Level.WARN, null, xptn.getMessage());
} catch (InstanceNotFoundException xptn) {
// should not happen since we already checked refreshTimerObjectName
- logStackTrace(Level.WARN, null, LocalizedStrings.MBeanUtil_WHILE_UNREGISTERING_COULDNT_FIND_MBEAN_WITH_OBJECTNAME_0.toLocalizedString(new Object[] {refreshTimerObjectName}));
+ logStackTrace(Level.WARN, null,
+ LocalizedStrings.MBeanUtil_WHILE_UNREGISTERING_COULDNT_FIND_MBEAN_WITH_OBJECTNAME_0
+ .toLocalizedString(new Object[] {refreshTimerObjectName}));
}
}
}
-
+
// ----- borrowed the following from admin.internal.RemoteCommand -----
/** Translates the path between Windows and UNIX. */
static String getOSPath(String path) {
@@ -676,8 +682,8 @@ public class MBeanUtil {
/** Returns true if the path is on Windows. */
static boolean pathIsWindows(String path) {
if (path != null && path.length() > 1) {
- return (Character.isLetter(path.charAt(0)) && path.charAt(1) == ':') ||
- (path.startsWith("//") || path.startsWith("\\\\"));
+ return (Character.isLetter(path.charAt(0)) && path.charAt(1) == ':')
+ || (path.startsWith("//") || path.startsWith("\\\\"));
}
return false;
}
@@ -689,75 +695,68 @@ public class MBeanUtil {
try {
// the MBeanServerDelegate name is spec'ed as the following...
ObjectName delegate = ObjectName.getInstance("JMImplementation:type=MBeanServerDelegate");
- mbeanServer.addNotificationListener(
- delegate,
- new NotificationListener() {
- public void handleNotification(Notification notification, Object handback) {
- MBeanServerNotification serverNotification = (MBeanServerNotification) notification;
- if (MBeanServerNotification.UNREGISTRATION_NOTIFICATION.equals(serverNotification.getType())) {
- ObjectName objectName = serverNotification.getMBeanName();
- synchronized (MBeanUtil.managedResources) {
- Object entry = MBeanUtil.managedResources.get(objectName);
- if (entry == null) return;
- if (!(entry instanceof ManagedResource)) {
- throw new ClassCastException(LocalizedStrings.MBeanUtil_0_IS_NOT_A_MANAGEDRESOURCE.toLocalizedString(new Object[] {entry.getClass().getName()}));
- }
- ManagedResource resource = (ManagedResource) entry;
- {
- // call cleanup on managedResource
- cleanupResource(resource);
- }
+ mbeanServer.addNotificationListener(delegate, new NotificationListener() {
+ public void handleNotification(Notification notification, Object handback) {
+ MBeanServerNotification serverNotification = (MBeanServerNotification) notification;
+ if (MBeanServerNotification.UNREGISTRATION_NOTIFICATION
+ .equals(serverNotification.getType())) {
+ ObjectName objectName = serverNotification.getMBeanName();
+ synchronized (MBeanUtil.managedResources) {
+ Object entry = MBeanUtil.managedResources.get(objectName);
+ if (entry == null)
+ return;
+ if (!(entry instanceof ManagedResource)) {
+ throw new ClassCastException(LocalizedStrings.MBeanUtil_0_IS_NOT_A_MANAGEDRESOURCE
+ .toLocalizedString(new Object[] {entry.getClass().getName()}));
+ }
+ ManagedResource resource = (ManagedResource) entry;
+ {
+ // call cleanup on managedResource
+ cleanupResource(resource);
}
}
}
- },
- null, null);
+ }
+ }, null, null);
} catch (JMException e) {
- logStackTrace(Level.WARN, e,
- LocalizedStrings.MBeanUtil_FAILED_TO_REGISTER_SERVERNOTIFICATIONLISTENER.toLocalizedString());
+ logStackTrace(Level.WARN, e,
+ LocalizedStrings.MBeanUtil_FAILED_TO_REGISTER_SERVERNOTIFICATIONLISTENER
+ .toLocalizedString());
} catch (JMRuntimeException e) {
- logStackTrace(Level.WARN, e,
- LocalizedStrings.MBeanUtil_FAILED_TO_REGISTER_SERVERNOTIFICATIONLISTENER.toLocalizedString());
+ logStackTrace(Level.WARN, e,
+ LocalizedStrings.MBeanUtil_FAILED_TO_REGISTER_SERVERNOTIFICATIONLISTENER
+ .toLocalizedString());
}
}
/**
- * Logs the stack trace for the given Throwable if logger is initialized else
- * prints the stack trace using System.out.
+ * Logs the stack trace for the given Throwable if logger is initialized else prints the stack
+ * trace using System.out.
*
- * @param level
- * severity level to log at
- * @param throwable
- * Throwable to log stack trace for
+ * @param level severity level to log at
+ * @param throwable Throwable to log stack trace for
*/
public static void logStackTrace(Level level, Throwable throwable) {
logStackTrace(level, throwable, null);
}
/**
- * Logs the stack trace for the given Throwable if logger is initialized else
- * prints the stack trace using System.out.
+ * Logs the stack trace for the given Throwable if logger is initialized else prints the stack
+ * trace using System.out.
*
- * @param level
- * severity level to log at
- * @param throwable
- * Throwable to log stack trace for
- * @param message
- * user friendly error message to show
+ * @param level severity level to log at
+ * @param throwable Throwable to log stack trace for
+ * @param message user friendly error message to show
*/
- public static void logStackTrace(Level level, Throwable throwable,
- String message) {
+ public static void logStackTrace(Level level, Throwable throwable, String message) {
logger.log(level, message, throwable);
}
/**
- * Raises RuntimeAdminException with given 'message' if given 'condition' is
- * false.
+ * Raises RuntimeAdminException with given 'message' if given 'condition' is false.
*
- * @param condition
- * condition to evaluate
- * @param message
- * failure message
+ * @param condition condition to evaluate
+ * @param message failure message
*/
private static void raiseOnFailure(boolean condition, String message) {
if (!condition) {
[37/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
index 390f12d..5397b95 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -76,611 +74,252 @@ public class RestAPIsQueryAndFEJUnitTest {
private Cache c;
private String hostName;
-
+
private String baseURL;
-
+
private int restServicePort;
-
+
private final String CUSTOMER_REGION = "customers";
-
+
private final String ITEM_REGION = "items";
private final String ORDER_REGION = "orders";
private final String PRIMITIVE_KV_STORE_REGION = "primitiveKVStore";
private final String UNKNOWN_REGION = "unknown_region";
private final String EMPTY_REGION = "empty_region";
-
+
private Map<Integer, QueryResultData> queryResultByIndex;
-
+
private final String ORDER1_AS_JSON = "{"
+ "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
+ "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
- + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
- + "\"contact\": \"Nilkanthkumar N Patel\","
+ + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\","
+ + "\"deliveryDate\": \"01/20/2014\"," + "\"contact\": \"Nilkanthkumar N Patel\","
+ "\"email\": \"npatel@pivotal.io\"," + "\"phone\": \"020-2048096\"," + "\"totalPrice\": 205,"
- + "\"items\":" + "[" + "{" + "\"itemNo\": 1,"
- + "\"description\": \"Product-1\"," + "\"quantity\": 5,"
- + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
- + "\"itemNo\": 1," + "\"description\": \"Product-2\","
- + "\"quantity\": 10," + "\"unitPrice\": 15.5," + "\"totalPrice\": 155"
- + "}" + "]" + "}";
-
+ + "\"items\":" + "[" + "{" + "\"itemNo\": 1," + "\"description\": \"Product-1\","
+ + "\"quantity\": 5," + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
+ + "\"itemNo\": 1," + "\"description\": \"Product-2\"," + "\"quantity\": 10,"
+ + "\"unitPrice\": 15.5," + "\"totalPrice\": 155" + "}" + "]" + "}";
+
private final String MALFORMED_JSON = "{"
+ "\"@type\" \"org.apache.geode.rest.internal.web.controllers.Order\","
+ "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
- + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
- + "\"contact\": \"Nilkanthkumar N Patel\","
+ + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\","
+ + "\"deliveryDate\": \"01/20/2014\"," + "\"contact\": \"Nilkanthkumar N Patel\","
+ "\"email\": \"npatel@pivotal.io\"," + "\"phone\": \"020-2048096\"," + "\"totalPrice\": 205,"
- + "\"items\":" + "[" + "{" + "\"itemNo\": 1,"
- + "\"description\": \"Product-1\"," + "\"quantity\": 5,"
- + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
- + "\"itemNo\": 1," + "\"description\": \"Product-2\","
- + "\"quantity\": 10," + "\"unitPrice\": 15.5," + "\"totalPrice\": 155"
- + "}" + "]" + "}";
-
+ + "\"items\":" + "[" + "{" + "\"itemNo\": 1," + "\"description\": \"Product-1\","
+ + "\"quantity\": 5," + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
+ + "\"itemNo\": 1," + "\"description\": \"Product-2\"," + "\"quantity\": 10,"
+ + "\"unitPrice\": 15.5," + "\"totalPrice\": 155" + "}" + "]" + "}";
+
private final String ORDER2_AS_JSON = "{"
+ "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
+ "\"purchaseOrderNo\": 112," + "\"customerId\": 102,"
- + "\"description\": \"Purchase order for company - B\"," + "\"orderDate\": \"02/10/2014\"," + "\"deliveryDate\": \"02/20/2014\","
- + "\"contact\": \"John Blum\","
+ + "\"description\": \"Purchase order for company - B\"," + "\"orderDate\": \"02/10/2014\","
+ + "\"deliveryDate\": \"02/20/2014\"," + "\"contact\": \"John Blum\","
+ "\"email\": \"jblum@pivotal.io\"," + "\"phone\": \"01-2048096\"," + "\"totalPrice\": 225,"
- + "\"items\":" + "[" + "{" + "\"itemNo\": 1,"
- + "\"description\": \"Product-3\"," + "\"quantity\": 6,"
- + "\"unitPrice\": 20," + "\"totalPrice\": 120" + "}," + "{"
- + "\"itemNo\": 2," + "\"description\": \"Product-4\","
- + "\"quantity\": 10," + "\"unitPrice\": 10.5," + "\"totalPrice\": 105"
- + "}" + "]" + "}";
-
+ + "\"items\":" + "[" + "{" + "\"itemNo\": 1," + "\"description\": \"Product-3\","
+ + "\"quantity\": 6," + "\"unitPrice\": 20," + "\"totalPrice\": 120" + "}," + "{"
+ + "\"itemNo\": 2," + "\"description\": \"Product-4\"," + "\"quantity\": 10,"
+ + "\"unitPrice\": 10.5," + "\"totalPrice\": 105" + "}" + "]" + "}";
+
private final String ORDER2_UPDATED_AS_JSON = "{"
+ "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
+ "\"purchaseOrderNo\": 1112," + "\"customerId\": 102,"
- + "\"description\": \"Purchase order for company - B\"," + "\"orderDate\": \"02/10/2014\"," + "\"deliveryDate\": \"02/20/2014\","
- + "\"contact\": \"John Blum\","
+ + "\"description\": \"Purchase order for company - B\"," + "\"orderDate\": \"02/10/2014\","
+ + "\"deliveryDate\": \"02/20/2014\"," + "\"contact\": \"John Blum\","
+ "\"email\": \"jblum@pivotal.io\"," + "\"phone\": \"01-2048096\"," + "\"totalPrice\": 350,"
- + "\"items\":" + "[" + "{" + "\"itemNo\": 1,"
- + "\"description\": \"Product-AAAA\"," + "\"quantity\": 10,"
- + "\"unitPrice\": 20," + "\"totalPrice\": 200" + "}," + "{"
- + "\"itemNo\": 2," + "\"description\": \"Product-BBB\","
- + "\"quantity\": 15," + "\"unitPrice\": 10," + "\"totalPrice\": 150"
- + "}" + "]" + "}";
-
- final String CUSTOMER_LIST1_AS_JSON = "["
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 1,"
- + " \"firstName\": \"Vishal\","
- + " \"lastName\": \"Roa\""
- + "},"
- +"{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 2,"
- + " \"firstName\": \"Nilkanth\","
- + " \"lastName\": \"Patel\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 3,"
- + " \"firstName\": \"Avinash Dongre\","
- + " \"lastName\": \"Roa\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 4,"
- + " \"firstName\": \"Avinash Dongre\","
- + " \"lastName\": \"Roa\""
- + "}"
- + "]";
-
- final String CUSTOMER_LIST_AS_JSON = "["
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 101,"
- + " \"firstName\": \"Vishal\","
- + " \"lastName\": \"Roa\""
- + "},"
- +"{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 102,"
- + " \"firstName\": \"Nilkanth\","
- + " \"lastName\": \"Patel\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 103,"
- + " \"firstName\": \"Avinash Dongre\","
- + " \"lastName\": \"Roa\""
- + "},"
- +"{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 104,"
- + " \"firstName\": \"John\","
- + " \"lastName\": \"Blum\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 105,"
- + " \"firstName\": \"Shankar\","
- + " \"lastName\": \"Hundekar\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 106,"
- + " \"firstName\": \"Amey\","
- + " \"lastName\": \"Barve\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 107,"
- + " \"firstName\": \"Vishal\","
- + " \"lastName\": \"Roa\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 108,"
- + " \"firstName\": \"Supriya\","
- + " \"lastName\": \"Pillai\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 109,"
- + " \"firstName\": \"Tushar\","
- + " \"lastName\": \"khairnar\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 110,"
- + " \"firstName\": \"Rishitesh\","
- + " \"lastName\": \"Mishra\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 111,"
- + " \"firstName\": \"Ajay\","
- + " \"lastName\": \"Pandey\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 112,"
- + " \"firstName\": \"Suyog\","
- + " \"lastName\": \"Bokare\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 113,"
- + " \"firstName\": \"Rajesh\","
- + " \"lastName\": \"kumar\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 114,"
- + " \"firstName\": \"swati\","
- + " \"lastName\": \"sawant\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 115,"
- + " \"firstName\": \"sonal\","
- + " \"lastName\": \"Agrawal\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 116,"
- + " \"firstName\": \"Amogh\","
- + " \"lastName\": \"Shetkar\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 117,"
- + " \"firstName\": \"Viren\","
- + " \"lastName\": \"Balaut\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 118,"
- + " \"firstName\": \"Namrata\","
- + " \"lastName\": \"Tanvi\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 119,"
- + " \"firstName\": \"Rahul\","
- + " \"lastName\": \"Diyekar\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 120,"
- + " \"firstName\": \"Varun\","
- + " \"lastName\": \"Agrawal\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 121,"
- + " \"firstName\": \"Hemant\","
- + " \"lastName\": \"Bhanavat\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 122,"
- + " \"firstName\": \"Sunil\","
- + " \"lastName\": \"jigyasu\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 123,"
- + " \"firstName\": \"Sumedh\","
- + " \"lastName\": \"wale\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 124,"
- + " \"firstName\": \"saobhik\","
- + " \"lastName\": \"chaudhari\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 125,"
- + " \"firstName\": \"Ketki\","
- + " \"lastName\": \"Naidu\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 126,"
- + " \"firstName\": \"YOgesh\","
- + " \"lastName\": \"Mahajan\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 127,"
- + " \"firstName\": \"Surinder\","
- + " \"lastName\": \"Bindra\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 128,"
- + " \"firstName\": \"sandip\","
- + " \"lastName\": \"kasbe\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 129,"
- + " \"firstName\": \"shivam\","
- + " \"lastName\": \"Panada\""
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
- +"\"customerId\": 130,"
- + " \"firstName\": \"Preeti\","
- + " \"lastName\": \"Kumari\""
- + "},"
- + "{"
- +"\"customerId\": 131,"
- + " \"firstName\": \"Vishal31\","
- + " \"lastName\": \"Roa31\""
- + "},"
- +"{"
- +"\"customerId\": 132,"
- + " \"firstName\": \"Nilkanth32\","
- + " \"lastName\": \"Patel32\""
- + "},"
- + "{"
- +"\"customerId\": 133,"
- + " \"firstName\": \"Avinash33\","
- + " \"lastName\": \"Dongre33\""
- + "},"
- +"{"
- +"\"customerId\": 134,"
- + " \"firstName\": \"John34\","
- + " \"lastName\": \"Blum34\""
- + "},"
- + "{"
- +"\"customerId\": 135,"
- + " \"firstName\": \"Shankar35\","
- + " \"lastName\": \"Hundekar35\""
- + "},"
- + "{"
- +"\"customerId\": 136,"
- + " \"firstName\": \"Amey36\","
- + " \"lastName\": \"Barve36\""
- + "},"
- + "{"
- +"\"customerId\": 137,"
- + " \"firstName\": \"Vishal37\","
- + " \"lastName\": \"Roa37\""
- + "},"
- + "{"
- +"\"customerId\": 138,"
- + " \"firstName\": \"Supriya38\","
- + " \"lastName\": \"Pillai38\""
- + "},"
- + "{"
- +"\"customerId\": 139,"
- + " \"firstName\": \"Tushar39\","
- + " \"lastName\": \"khairnar39\""
- + "},"
- + "{"
- +"\"customerId\": 140,"
- + " \"firstName\": \"Rishitesh40\","
- + " \"lastName\": \"Mishra40\""
- + "},"
- + "{"
- +"\"customerId\": 141,"
- + " \"firstName\": \"Ajay41\","
- + " \"lastName\": \"Pandey41\""
- + "},"
- + "{"
- +"\"customerId\": 142,"
- + " \"firstName\": \"Suyog42\","
- + " \"lastName\": \"Bokare42\""
- + "},"
- + "{"
- +"\"customerId\": 143,"
- + " \"firstName\": \"Rajesh43\","
- + " \"lastName\": \"kumar43\""
- + "},"
- + "{"
- +"\"customerId\": 144,"
- + " \"firstName\": \"swati44\","
- + " \"lastName\": \"sawant44\""
- + "},"
- + "{"
- +"\"customerId\": 145,"
- + " \"firstName\": \"sonal45\","
- + " \"lastName\": \"Agrawal45\""
- + "},"
- + "{"
- +"\"customerId\": 146,"
- + " \"firstName\": \"Amogh46\","
- + " \"lastName\": \"Shetkar46\""
- + "},"
- + "{"
- +"\"customerId\": 147,"
- + " \"firstName\": \"Viren47\","
- + " \"lastName\": \"Balaut47\""
- + "},"
- + "{"
- +"\"customerId\": 148,"
- + " \"firstName\": \"Namrata48\","
- + " \"lastName\": \"Tanvi48\""
- + "},"
- + "{"
- +"\"customerId\": 149,"
- + " \"firstName\": \"Rahul49\","
- + " \"lastName\": \"Diyekar49\""
- + "},"
- + "{"
- +"\"customerId\": 150,"
- + " \"firstName\": \"Varun50\","
- + " \"lastName\": \"Agrawal50\""
- + "},"
- + "{"
- +"\"customerId\": 151,"
- + " \"firstName\": \"Hemant50\","
- + " \"lastName\": \"Bhanavat50\""
- + "},"
- + "{"
- +"\"customerId\": 152,"
- + " \"firstName\": \"Sunil52\","
- + " \"lastName\": \"jigyasu52\""
- + "},"
- + "{"
- +"\"customerId\": 153,"
- + " \"firstName\": \"Sumedh53\","
- + " \"lastName\": \"wale53\""
- + "},"
- + "{"
- +"\"customerId\": 154,"
- + " \"firstName\": \"saobhik54\","
- + " \"lastName\": \"chaudhari54\""
- + "},"
- + "{"
- +"\"customerId\": 155,"
- + " \"firstName\": \"Ketki55\","
- + " \"lastName\": \"Naidu55\""
- + "},"
- + "{"
- +"\"customerId\": 156,"
- + " \"firstName\": \"YOgesh56\","
- + " \"lastName\": \"Mahajan56\""
- + "},"
- + "{"
- +"\"customerId\": 157,"
- + " \"firstName\": \"Surinder57\","
- + " \"lastName\": \"Bindra57\""
- + "},"
- + "{"
- +"\"customerId\": 158,"
- + " \"firstName\": \"sandip58\","
- + " \"lastName\": \"kasbe58\""
- + "},"
- + "{"
- +"\"customerId\": 159,"
- + " \"firstName\": \"shivam59\","
- + " \"lastName\": \"Panada59\""
- + "},"
- + "{"
- +"\"customerId\": 160,"
- + " \"firstName\": \"Preeti60\","
- + " \"lastName\": \"Kumari60\""
- + "}"
- + "]";
-
- private final String ORDER_AS_CASJSON = "{"
- + "\"@old\" :"
- + "{"
+ + "\"items\":" + "[" + "{" + "\"itemNo\": 1," + "\"description\": \"Product-AAAA\","
+ + "\"quantity\": 10," + "\"unitPrice\": 20," + "\"totalPrice\": 200" + "}," + "{"
+ + "\"itemNo\": 2," + "\"description\": \"Product-BBB\"," + "\"quantity\": 15,"
+ + "\"unitPrice\": 10," + "\"totalPrice\": 150" + "}" + "]" + "}";
+
+ final String CUSTOMER_LIST1_AS_JSON =
+ "[" + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 1," + " \"firstName\": \"Vishal\"," + " \"lastName\": \"Roa\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 2," + " \"firstName\": \"Nilkanth\"," + " \"lastName\": \"Patel\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 3," + " \"firstName\": \"Avinash Dongre\"," + " \"lastName\": \"Roa\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 4," + " \"firstName\": \"Avinash Dongre\"," + " \"lastName\": \"Roa\""
+ + "}" + "]";
+
+ final String CUSTOMER_LIST_AS_JSON = "[" + "{"
+ + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 101," + " \"firstName\": \"Vishal\"," + " \"lastName\": \"Roa\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 102," + " \"firstName\": \"Nilkanth\"," + " \"lastName\": \"Patel\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 103," + " \"firstName\": \"Avinash Dongre\"," + " \"lastName\": \"Roa\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 104," + " \"firstName\": \"John\"," + " \"lastName\": \"Blum\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 105," + " \"firstName\": \"Shankar\"," + " \"lastName\": \"Hundekar\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 106," + " \"firstName\": \"Amey\"," + " \"lastName\": \"Barve\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 107," + " \"firstName\": \"Vishal\"," + " \"lastName\": \"Roa\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 108," + " \"firstName\": \"Supriya\"," + " \"lastName\": \"Pillai\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 109," + " \"firstName\": \"Tushar\"," + " \"lastName\": \"khairnar\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 110," + " \"firstName\": \"Rishitesh\"," + " \"lastName\": \"Mishra\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 111," + " \"firstName\": \"Ajay\"," + " \"lastName\": \"Pandey\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 112," + " \"firstName\": \"Suyog\"," + " \"lastName\": \"Bokare\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 113," + " \"firstName\": \"Rajesh\"," + " \"lastName\": \"kumar\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 114," + " \"firstName\": \"swati\"," + " \"lastName\": \"sawant\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 115," + " \"firstName\": \"sonal\"," + " \"lastName\": \"Agrawal\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 116," + " \"firstName\": \"Amogh\"," + " \"lastName\": \"Shetkar\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 117," + " \"firstName\": \"Viren\"," + " \"lastName\": \"Balaut\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 118," + " \"firstName\": \"Namrata\"," + " \"lastName\": \"Tanvi\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 119," + " \"firstName\": \"Rahul\"," + " \"lastName\": \"Diyekar\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 120," + " \"firstName\": \"Varun\"," + " \"lastName\": \"Agrawal\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 121," + " \"firstName\": \"Hemant\"," + " \"lastName\": \"Bhanavat\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 122," + " \"firstName\": \"Sunil\"," + " \"lastName\": \"jigyasu\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 123," + " \"firstName\": \"Sumedh\"," + " \"lastName\": \"wale\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 124," + " \"firstName\": \"saobhik\"," + " \"lastName\": \"chaudhari\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 125," + " \"firstName\": \"Ketki\"," + " \"lastName\": \"Naidu\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 126," + " \"firstName\": \"YOgesh\"," + " \"lastName\": \"Mahajan\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 127," + " \"firstName\": \"Surinder\"," + " \"lastName\": \"Bindra\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 128," + " \"firstName\": \"sandip\"," + " \"lastName\": \"kasbe\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 129," + " \"firstName\": \"shivam\"," + " \"lastName\": \"Panada\"" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Customer\","
+ + "\"customerId\": 130," + " \"firstName\": \"Preeti\"," + " \"lastName\": \"Kumari\"" + "},"
+ + "{" + "\"customerId\": 131," + " \"firstName\": \"Vishal31\"," + " \"lastName\": \"Roa31\""
+ + "}," + "{" + "\"customerId\": 132," + " \"firstName\": \"Nilkanth32\","
+ + " \"lastName\": \"Patel32\"" + "}," + "{" + "\"customerId\": 133,"
+ + " \"firstName\": \"Avinash33\"," + " \"lastName\": \"Dongre33\"" + "}," + "{"
+ + "\"customerId\": 134," + " \"firstName\": \"John34\"," + " \"lastName\": \"Blum34\"" + "},"
+ + "{" + "\"customerId\": 135," + " \"firstName\": \"Shankar35\","
+ + " \"lastName\": \"Hundekar35\"" + "}," + "{" + "\"customerId\": 136,"
+ + " \"firstName\": \"Amey36\"," + " \"lastName\": \"Barve36\"" + "}," + "{"
+ + "\"customerId\": 137," + " \"firstName\": \"Vishal37\"," + " \"lastName\": \"Roa37\"" + "},"
+ + "{" + "\"customerId\": 138," + " \"firstName\": \"Supriya38\","
+ + " \"lastName\": \"Pillai38\"" + "}," + "{" + "\"customerId\": 139,"
+ + " \"firstName\": \"Tushar39\"," + " \"lastName\": \"khairnar39\"" + "}," + "{"
+ + "\"customerId\": 140," + " \"firstName\": \"Rishitesh40\"," + " \"lastName\": \"Mishra40\""
+ + "}," + "{" + "\"customerId\": 141," + " \"firstName\": \"Ajay41\","
+ + " \"lastName\": \"Pandey41\"" + "}," + "{" + "\"customerId\": 142,"
+ + " \"firstName\": \"Suyog42\"," + " \"lastName\": \"Bokare42\"" + "}," + "{"
+ + "\"customerId\": 143," + " \"firstName\": \"Rajesh43\"," + " \"lastName\": \"kumar43\""
+ + "}," + "{" + "\"customerId\": 144," + " \"firstName\": \"swati44\","
+ + " \"lastName\": \"sawant44\"" + "}," + "{" + "\"customerId\": 145,"
+ + " \"firstName\": \"sonal45\"," + " \"lastName\": \"Agrawal45\"" + "}," + "{"
+ + "\"customerId\": 146," + " \"firstName\": \"Amogh46\"," + " \"lastName\": \"Shetkar46\""
+ + "}," + "{" + "\"customerId\": 147," + " \"firstName\": \"Viren47\","
+ + " \"lastName\": \"Balaut47\"" + "}," + "{" + "\"customerId\": 148,"
+ + " \"firstName\": \"Namrata48\"," + " \"lastName\": \"Tanvi48\"" + "}," + "{"
+ + "\"customerId\": 149," + " \"firstName\": \"Rahul49\"," + " \"lastName\": \"Diyekar49\""
+ + "}," + "{" + "\"customerId\": 150," + " \"firstName\": \"Varun50\","
+ + " \"lastName\": \"Agrawal50\"" + "}," + "{" + "\"customerId\": 151,"
+ + " \"firstName\": \"Hemant50\"," + " \"lastName\": \"Bhanavat50\"" + "}," + "{"
+ + "\"customerId\": 152," + " \"firstName\": \"Sunil52\"," + " \"lastName\": \"jigyasu52\""
+ + "}," + "{" + "\"customerId\": 153," + " \"firstName\": \"Sumedh53\","
+ + " \"lastName\": \"wale53\"" + "}," + "{" + "\"customerId\": 154,"
+ + " \"firstName\": \"saobhik54\"," + " \"lastName\": \"chaudhari54\"" + "}," + "{"
+ + "\"customerId\": 155," + " \"firstName\": \"Ketki55\"," + " \"lastName\": \"Naidu55\""
+ + "}," + "{" + "\"customerId\": 156," + " \"firstName\": \"YOgesh56\","
+ + " \"lastName\": \"Mahajan56\"" + "}," + "{" + "\"customerId\": 157,"
+ + " \"firstName\": \"Surinder57\"," + " \"lastName\": \"Bindra57\"" + "}," + "{"
+ + "\"customerId\": 158," + " \"firstName\": \"sandip58\"," + " \"lastName\": \"kasbe58\""
+ + "}," + "{" + "\"customerId\": 159," + " \"firstName\": \"shivam59\","
+ + " \"lastName\": \"Panada59\"" + "}," + "{" + "\"customerId\": 160,"
+ + " \"firstName\": \"Preeti60\"," + " \"lastName\": \"Kumari60\"" + "}" + "]";
+
+ private final String ORDER_AS_CASJSON = "{" + "\"@old\" :" + "{"
+ "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
+ "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
- + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
- + "\"contact\": \"Nilkanthkumar N Patel\","
+ + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\","
+ + "\"deliveryDate\": \"01/20/2014\"," + "\"contact\": \"Nilkanthkumar N Patel\","
+ "\"email\": \"npatel@pivotal.io\"," + "\"phone\": \"020-2048096\"," + "\"totalPrice\": 205,"
- + "\"items\":" + "[" + "{" + "\"itemNo\": 1,"
- + "\"description\": \"Product-1\"," + "\"quantity\": 5,"
- + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
- + "\"itemNo\": 1," + "\"description\": \"Product-2\","
- + "\"quantity\": 10," + "\"unitPrice\": 15.5," + "\"totalPrice\": 155"
- + "}" + "]"
- + "},"
- + "\"@new\" :"
- + "{"
+ + "\"items\":" + "[" + "{" + "\"itemNo\": 1," + "\"description\": \"Product-1\","
+ + "\"quantity\": 5," + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
+ + "\"itemNo\": 1," + "\"description\": \"Product-2\"," + "\"quantity\": 10,"
+ + "\"unitPrice\": 15.5," + "\"totalPrice\": 155" + "}" + "]" + "}," + "\"@new\" :" + "{"
+ "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
+ "\"purchaseOrderNo\": 11101," + "\"customerId\": 101,"
- + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
- + "\"contact\": \"Nilkanthkumar N Patel\","
+ + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\","
+ + "\"deliveryDate\": \"01/20/2014\"," + "\"contact\": \"Nilkanthkumar N Patel\","
+ "\"email\": \"npatel@pivotal.io\"," + "\"phone\": \"020-2048096\"," + "\"totalPrice\": 205,"
- + "\"items\":"
- + "["
- + "{"
- + "\"itemNo\": 1,"
- + "\"description\": \"Product-1\","
- + "\"quantity\": 5,"
- + "\"unitPrice\": 10,"
- + "\"totalPrice\": 50"
- + "},"
- + "{"
- + "\"itemNo\": 3,"
- + "\"description\": \"Product-3\","
- + "\"quantity\": 10,"
- + "\"unitPrice\": 100,"
- + "\"totalPrice\": 1000"
- + "},"
- + "{"
- + "\"itemNo\": 1,"
- + "\"description\": \"Product-2\","
- + "\"quantity\": 10,"
- + "\"unitPrice\": 15.5,"
- + "\"totalPrice\": 155"
- + "}"
- + "]"
- + "}"
- + "}";
-
- private final String MALFORMED_CAS_JSON = "{"
- + "\"@old\" :"
- + "{"
+ + "\"items\":" + "[" + "{" + "\"itemNo\": 1," + "\"description\": \"Product-1\","
+ + "\"quantity\": 5," + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
+ + "\"itemNo\": 3," + "\"description\": \"Product-3\"," + "\"quantity\": 10,"
+ + "\"unitPrice\": 100," + "\"totalPrice\": 1000" + "}," + "{" + "\"itemNo\": 1,"
+ + "\"description\": \"Product-2\"," + "\"quantity\": 10," + "\"unitPrice\": 15.5,"
+ + "\"totalPrice\": 155" + "}" + "]" + "}" + "}";
+
+ private final String MALFORMED_CAS_JSON = "{" + "\"@old\" :" + "{"
+ "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
+ "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
- + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
- + "\"contact\": \"Nilkanthkumar N Patel\","
+ + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\","
+ + "\"deliveryDate\": \"01/20/2014\"," + "\"contact\": \"Nilkanthkumar N Patel\","
+ "\"email\": \"npatel@pivotal.io\"," + "\"phone\": \"020-2048096\"," + "\"totalPrice\": 205,"
- + "\"items\":" + "[" + "{" + "\"itemNo\": 1,"
- + "\"description\": \"Product-1\"," + "\"quantity\": 5,"
- + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
- + "\"itemNo\": 1," + "\"description\": \"Product-2\","
- + "\"quantity\": 10," + "\"unitPrice\": 15.5," + "\"totalPrice\": 155"
- + "}" + "]"
- + "},"
-
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
+ + "\"items\":" + "[" + "{" + "\"itemNo\": 1," + "\"description\": \"Product-1\","
+ + "\"quantity\": 5," + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
+ + "\"itemNo\": 1," + "\"description\": \"Product-2\"," + "\"quantity\": 10,"
+ + "\"unitPrice\": 15.5," + "\"totalPrice\": 155" + "}" + "]" + "},"
+
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
+ "\"purchaseOrderNo\": 11101," + "\"customerId\": 101,"
- + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
- + "\"contact\": \"Nilkanthkumar N Patel\","
+ + "\"description\": \"Purchase order for company - A\"," + "\"orderDate\": \"01/10/2014\","
+ + "\"deliveryDate\": \"01/20/2014\"," + "\"contact\": \"Nilkanthkumar N Patel\","
+ "\"email\": \"npatel@pivotal.io\"," + "\"phone\": \"020-2048096\"," + "\"totalPrice\": 205,"
- + "\"items\":"
- + "["
- + "{"
- + "\"itemNo\": 1,"
- + "\"description\": \"Product-1\","
- + "\"quantity\": 5,"
- + "\"unitPrice\": 10,"
- + "\"totalPrice\": 50"
- + "},"
- + "{"
- + "\"itemNo\": 3,"
- + "\"description\": \"Product-3\","
- + "\"quantity\": 10,"
- + "\"unitPrice\": 100,"
- + "\"totalPrice\": 1000"
- + "},"
- + "{"
- + "\"itemNo\": 1,"
- + "\"description\": \"Product-2\","
- + "\"quantity\": 10,"
- + "\"unitPrice\": 15.5,"
- + "\"totalPrice\": 155"
- + "}"
- + "]"
- + "}"
- + "}";
+ + "\"items\":" + "[" + "{" + "\"itemNo\": 1," + "\"description\": \"Product-1\","
+ + "\"quantity\": 5," + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
+ + "\"itemNo\": 3," + "\"description\": \"Product-3\"," + "\"quantity\": 10,"
+ + "\"unitPrice\": 100," + "\"totalPrice\": 1000" + "}," + "{" + "\"itemNo\": 1,"
+ + "\"description\": \"Product-2\"," + "\"quantity\": 10," + "\"unitPrice\": 15.5,"
+ + "\"totalPrice\": 155" + "}" + "]" + "}" + "}";
final String[][] PARAMETERIZED_QUERIES = new String[][] {
- {
- "selectOrders",
- "SELECT DISTINCT o FROM /orders o, o.items item WHERE item.quantity > $1 AND item.totalPrice > $2" },
- {
- "selectCustomer",
- "SELECT c FROM /customers c WHERE c.customerId = $1" },
- {
- "selectHighRollers",
- "SELECT DISTINCT c FROM /customers c, /orders o, o.items item WHERE item.totalprice > $1 AND c.customerId = o.customerId"
- },
- {
- "testQuery",
- "SELECT DISTINCT c from /customers c where lastName=$1"
- },
- {
- "findSelectedCustomers",
- "SELECT * from /customers where customerId IN SET ($1, $2, $3)"
- },
- {
- "invalidQuery",
- "This is invalid string"
- }
- };
-
- final String QUERY_ARGS2 = "{"
- + "\"@type\": \"int\","
- + "\"@value\": 101"
- + "}";
-
- final String QUERY_ARGS1 = "["
- +"{"
- + "\"@type\": \"int\","
- + "\"@value\": 2"
- + "},"
- +"{"
- + "\"@type\": \"double\","
- + "\"@value\": 110.00"
- + "}"
- + "]";
+ {"selectOrders",
+ "SELECT DISTINCT o FROM /orders o, o.items item WHERE item.quantity > $1 AND item.totalPrice > $2"},
+ {"selectCustomer", "SELECT c FROM /customers c WHERE c.customerId = $1"},
+ {"selectHighRollers",
+ "SELECT DISTINCT c FROM /customers c, /orders o, o.items item WHERE item.totalprice > $1 AND c.customerId = o.customerId"},
+ {"testQuery", "SELECT DISTINCT c from /customers c where lastName=$1"},
+ {"findSelectedCustomers", "SELECT * from /customers where customerId IN SET ($1, $2, $3)"},
+ {"invalidQuery", "This is invalid string"}};
+
+ final String QUERY_ARGS2 = "{" + "\"@type\": \"int\"," + "\"@value\": 101" + "}";
+
+ final String QUERY_ARGS1 = "[" + "{" + "\"@type\": \"int\"," + "\"@value\": 2" + "}," + "{"
+ + "\"@type\": \"double\"," + "\"@value\": 110.00" + "}" + "]";
@SuppressWarnings("unused")
- final String QUERY_ARGS3 = "["
- +"{"
- + "\"@type\": \"String\","
- + "\"@value\": \"Agrawal\""
- + "}"
- + "]";
+ final String QUERY_ARGS3 =
+ "[" + "{" + "\"@type\": \"String\"," + "\"@value\": \"Agrawal\"" + "}" + "]";
@SuppressWarnings("unused")
- final String QUERY_ARGS4 = "["
- +"{"
- + "\"@type\": \"int\","
- + "\"@value\": 20"
- + "},"
- +"{"
- + "\"@type\": \"int\","
- + "\"@value\": 120"
- + "},"
- +"{"
- + "\"@type\": \"int\","
- + "\"@value\": 130"
- + "}"
- + "]";
-
-
- final String FUNCTION_ARGS1 = "["
- + "{"
- + "\"@type\": \"double\","
- + "\"@value\": 210"
- + "},"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Item\","
- + "\"itemNo\": \"599\","
- + "\"description\": \"Part X Free on Bumper Offer\","
- + "\"quantity\": \"2\","
- + "\"unitprice\": \"5\","
- + "\"totalprice\": \"10.00\""
- + "}"
- +"]";
-
+ final String QUERY_ARGS4 =
+ "[" + "{" + "\"@type\": \"int\"," + "\"@value\": 20" + "}," + "{" + "\"@type\": \"int\","
+ + "\"@value\": 120" + "}," + "{" + "\"@type\": \"int\"," + "\"@value\": 130" + "}" + "]";
+
+
+ final String FUNCTION_ARGS1 = "[" + "{" + "\"@type\": \"double\"," + "\"@value\": 210" + "},"
+ + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Item\","
+ + "\"itemNo\": \"599\"," + "\"description\": \"Part X Free on Bumper Offer\","
+ + "\"quantity\": \"2\"," + "\"unitprice\": \"5\"," + "\"totalprice\": \"10.00\"" + "}" + "]";
+
public final int METHOD_INDEX = 0;
public final int URL_INDEX = 1;
public final int REQUEST_BODY_INDEX = 2;
@@ -688,629 +327,245 @@ public class RestAPIsQueryAndFEJUnitTest {
public final int LOCATION_HEADER_INDEX = 4;
public final int RESPONSE_HAS_BODY_INDEX = 5;
public final int RESPONSE_HAS_EXCEPTION_INDEX = 6;
-
- final Object TEST_DATA[][]={
- { //0. create - 200 ok
- HttpMethod.POST,
- "/orders?key=1",
- ORDER1_AS_JSON,
- HttpStatus.CREATED,
- "/orders/1",
- false,
- false
- },
- { //1. create - 409 conflict
- HttpMethod.POST,
- "/orders?key=1",
- ORDER1_AS_JSON,
- HttpStatus.CONFLICT,
- "/orders/1",
- true,
- true
- },
- { //2. create - 400 bad Req for malformed Json
- HttpMethod.POST,
- "/orders?key=k1",
- MALFORMED_JSON,
- HttpStatus.BAD_REQUEST,
- null,
- true,
- true
- },
- { //3. create - 404, Not Found, for Region not exist
- HttpMethod.POST,
- "/"+ UNKNOWN_REGION + "?key=k1",
- ORDER1_AS_JSON,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //4. create - 500 creating entry on region having DataPolicy=Empty
- HttpMethod.POST,
- "/"+ EMPTY_REGION + "?key=k1",
- ORDER1_AS_JSON,
- HttpStatus.INTERNAL_SERVER_ERROR,
- null,
- true,
- true
- },
- { //5. Get data for key - 200 ok
- HttpMethod.GET,
- "/orders/1",
- null,
- HttpStatus.OK,
- "/orders/1",
- true,
- false
- },
- { //6. Get data for key - 404 region not exist
- HttpMethod.GET,
- "/"+ UNKNOWN_REGION + "/1",
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //7. Get data for Non-existing key - 404, Resource NOT FOUND.
- HttpMethod.GET,
- "/"+ EMPTY_REGION + "/unknown",
- null,
- HttpStatus.INTERNAL_SERVER_ERROR,
- null,
- true,
- true
- },
- { //8. Put - 200 Ok, successful
- HttpMethod.PUT,
- "/orders/2",
- ORDER2_AS_JSON,
- HttpStatus.OK,
- "/orders/2",
- false,
- false
- },
- { //9. Put - 400 Bad Request, Malformed JSOn
- HttpMethod.PUT,
- "/orders/3",
- MALFORMED_JSON,
- HttpStatus.BAD_REQUEST,
- null,
- true,
- true
- },
- { //10. Put - 404 Not Found, Region does not exist
- HttpMethod.PUT,
- "/"+ UNKNOWN_REGION + "/k1",
- ORDER2_AS_JSON,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //11. Put - 500, Gemfire throws exception
- HttpMethod.PUT,
- "/"+ EMPTY_REGION + "/k1",
- ORDER2_AS_JSON,
- HttpStatus.INTERNAL_SERVER_ERROR,
- null,
- true,
- true
- },
- { //12. putAll - 200 Ok
- HttpMethod.PUT,
- "/customers/1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60",
- CUSTOMER_LIST_AS_JSON,
- HttpStatus.OK,
- "/customers/3,4,5,6",
- false,
- false
- },
- { //13. putAll - 400 bad Request, amlformed Json
- HttpMethod.PUT,
- "/customers/3,4,5,6",
- MALFORMED_JSON,
- HttpStatus.BAD_REQUEST,
- null,
- true,
- true
- },
- { //14. putAll - 404 Not Found, Region Does not exist
- HttpMethod.PUT,
- "/"+ UNKNOWN_REGION + "/3,4,5,6",
- CUSTOMER_LIST1_AS_JSON,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //15. putAll - 500, Gemfire throws exception
- HttpMethod.PUT,
- "/"+ EMPTY_REGION + "/3,4,5,6",
- CUSTOMER_LIST1_AS_JSON,
- HttpStatus.INTERNAL_SERVER_ERROR,
- null,
- true,
- true
- },
- { //16. PUT?op=REPLACE, 200 Ok test case
- HttpMethod.PUT,
- "/orders/2?op=REPLACE",
- ORDER2_UPDATED_AS_JSON,
- HttpStatus.OK,
- "/orders/2",
- false,
- false
- },
- { //17. Put?op=REPLACE, 400 Bad Request, Malformed JSOn
- HttpMethod.PUT,
- "/orders/2?op=REPLACE",
- MALFORMED_JSON,
- HttpStatus.BAD_REQUEST,
- null,
- true,
- true
- },
- { //18. Put?op=REPLACE, 404 Not Found, Region does not exist
- HttpMethod.PUT,
- "/"+ UNKNOWN_REGION + "/k1?op=rePlace",
- ORDER2_AS_JSON,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //19. Put?op=REPLACE, 500 testcase, Gemfire exception
- HttpMethod.PUT,
- "/"+ EMPTY_REGION + "/k1?op=REPLACE",
- ORDER2_AS_JSON,
- HttpStatus.INTERNAL_SERVER_ERROR,
- null,
- true,
- true
- },
- { //20. Put?op=CAS, 200 OK testcase.
- HttpMethod.PUT,
- "/orders/1?op=CAS",
- ORDER_AS_CASJSON,
- HttpStatus.OK,
- "/orders/1",
- false,
- false
- },
- { //21. Put?op=CAS, 409 OK testcase.
- HttpMethod.PUT,
- "/orders/2?op=CAS",
- ORDER_AS_CASJSON,
- HttpStatus.CONFLICT,
- "/orders/2",
- true,
- true
- },
- { //22. Put?op=CAS, 400 Bad Request, Malformed JSOn
- HttpMethod.PUT,
- "/orders/2?op=cas",
- MALFORMED_CAS_JSON,
- HttpStatus.BAD_REQUEST,
- null,
- true,
- true
- },
- { //23. Put?op=CAS, 404 Not Found, Region does not exist
- HttpMethod.PUT,
- "/"+ UNKNOWN_REGION + "/k1?op=CAS",
- ORDER_AS_CASJSON,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //24. Put?op=cAs, 500 testcase, Gemfire exception
- HttpMethod.PUT,
- "/"+ EMPTY_REGION + "/k1?op=cAs",
- ORDER_AS_CASJSON,
- HttpStatus.INTERNAL_SERVER_ERROR,
- null,
- true,
- true
- },
- { //25. Get - List all regions/resources - 200 ok testcase
- HttpMethod.GET,
- "",
- null,
- HttpStatus.OK,
- RestTestUtils.GEMFIRE_REST_API_WEB_SERVICE_URL,
- true,
- true
- },
- { //26. List all regions/resources - 405 testcase.
- HttpMethod.POST,
- "",
- null,
- HttpStatus.METHOD_NOT_ALLOWED,
- null,
- true,
- true
- },
- { //27. GetAll - read all data for region - 200 ok, Default test case [No limit param specified].
- HttpMethod.GET,
- "/customers",
- null,
- HttpStatus.OK,
- "/customers",
- true,
- false
- },
- { //28 GetAll - read all data for region - 404 NOT FOUND testcase.
- HttpMethod.GET,
- "/" + UNKNOWN_REGION,
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //29 GetAll - read all data for region - limit=ALL testcase.
- HttpMethod.GET,
- "/customers?limit=ALL",
- null,
- HttpStatus.OK,
- null,
- true,
- false
- },
- { //30 GetAll - read data for fixed number of keys - limit=<NUMBER> testcase.
- HttpMethod.GET,
- "/customers?limit=10",
- null,
- HttpStatus.OK,
- null,
- true,
- false
- },
- { //31. Get keys - List all keys in region - 200 ok testcase
- HttpMethod.GET,
- "/customers/keys",
- null,
- HttpStatus.OK,
- "/customers/keys",
- true,
- false
- },
- { //32. Get keys - List all keys for region which does not exist - 404 NOt Found testcase
- HttpMethod.GET,
- "/"+ UNKNOWN_REGION +"/keys",
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //33. Get keys - 405 testcase, if any HTTP request method other than GET (e.g. only POST, NOT PUT, DELETE, as for them its a valid op) is used
- HttpMethod.POST,
- "/customers/keys",
- null,
- HttpStatus.METHOD_NOT_ALLOWED,
- null,
- true,
- true
- },
- { //34. Read data for the specific keys. 200 Ok testcase.
- HttpMethod.GET,
- "/customers/1,2,3,4,5,6,7,8,9,10",
- null,
- HttpStatus.OK,
- null,
- true,
- false
- },
- {
- //35. Read data for the specific keys. 404 Ok testcase.
- HttpMethod.GET,
- "/" + UNKNOWN_REGION + "/1,2,3,4,5,6,7,8,9,10",
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //36. delete data for key in region. 200 Ok testcase
- HttpMethod.DELETE,
- "/customers/1",
- null,
- HttpStatus.OK,
- "/customers/1",
- false,
- false
- },
- { //37. delete data for key with non-existing region. 404 Not Found, testcase.
- HttpMethod.DELETE,
- "/" + UNKNOWN_REGION + "/1",
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //38. delete data for key, 500 - Gemfire throws exception testcase.
- HttpMethod.DELETE,
- "/" + EMPTY_REGION + "/1",
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //39. delete data for set of keys, 200 Ok, testcase.
- HttpMethod.DELETE,
- "/customers/2,3,4,5",
- null,
- HttpStatus.OK,
- null,
- false,
- false
- },
- { //40. delete data for set of keys, 404 Region NOT Found, testcase.
- HttpMethod.DELETE,
- "/" + UNKNOWN_REGION + "/2,3,4,5",
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //41. delete data for set of keys, 500 Gemfire throws exception testcase.
- HttpMethod.DELETE,
- "/" + EMPTY_REGION + "/2,3,4,5",
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //42. create parameterized named query
- HttpMethod.POST,
- "/queries?id=" + PARAMETERIZED_QUERIES[0][0] + "&q=" + PARAMETERIZED_QUERIES[0][1],
- null,
- HttpStatus.CREATED,
- "/queries/" + PARAMETERIZED_QUERIES[0][0],
- false,
- false
- },
- { //43. create parameterized named query
- HttpMethod.POST,
- "/queries?id=" + PARAMETERIZED_QUERIES[1][0] + "&q=" + PARAMETERIZED_QUERIES[1][1],
- null,
- HttpStatus.CREATED,
- "/queries/" + PARAMETERIZED_QUERIES[1][0],
- false,
- false
- },
- { //44. create parameterized named query
- HttpMethod.POST,
- "/queries?id=" + PARAMETERIZED_QUERIES[2][0] + "&q=" + PARAMETERIZED_QUERIES[2][1],
- null,
- HttpStatus.CREATED,
- "/queries/" + PARAMETERIZED_QUERIES[2][0],
- false,
- false
- },
- { //45. list all named/parameterized queries
- //NOTE: query result = 3. old index=8.
- HttpMethod.GET,
- "/queries",
- null,
- HttpStatus.OK,
- "/queries",
- true,
- false
- },
- { //46. Run the specified named query passing in args for query parameters in request body
- //Note: Query Result = 2, Old index=9
- HttpMethod.POST,
- "/queries/" + PARAMETERIZED_QUERIES[0][0],
- QUERY_ARGS1,
- HttpStatus.OK,
- "/queries/" + PARAMETERIZED_QUERIES[0][0],
- true,
- false
- },
- { //47. Run the specified named query passing in args for query parameters in request body
- //Note: Query size = 1, old index = 10
- HttpMethod.POST,
- "/queries/" + PARAMETERIZED_QUERIES[1][0],
- QUERY_ARGS2,
- HttpStatus.OK,
- "/queries/" + PARAMETERIZED_QUERIES[1][0],
- true,
- false
- },
- { //48. Run an unnamed (unidentified), ad-hoc query passed as a URL parameter
- HttpMethod.GET,
- "/queries/adhoc?q=SELECT * FROM /customers",
- null,
- HttpStatus.OK,
- null,
- true,
- false
- },
- { //49. list all functions available in the GemFire cluster
- HttpMethod.GET,
- "/functions",
- null,
- HttpStatus.OK,
- "/functions",
- true,
- false
- },
- { //50. Execute function with args on availabl nodes in the GemFire cluster
- HttpMethod.POST,
- "/functions/AddFreeItemToOrders?onRegion=orders",
- FUNCTION_ARGS1,
- HttpStatus.OK,
- "/functions/AddFreeItemToOrders",
- true,
- false
- },
- { //51. create parameterized named query "testQuery"
- HttpMethod.POST,
- "/queries?id=" + PARAMETERIZED_QUERIES[3][0] + "&q=" + PARAMETERIZED_QUERIES[3][1],
- null,
- HttpStatus.CREATED,
- "/queries/" + PARAMETERIZED_QUERIES[3][0],
- false,
- false
- },
- { //52. update parameterized named query "testQuery"
- HttpMethod.PUT,
- "/queries/" + PARAMETERIZED_QUERIES[0][0] + "?q=" + PARAMETERIZED_QUERIES[4][1],
- null,
- HttpStatus.OK,
- null,
- false,
- false
- },
- { //53. Run the updated named query passing in args for query parameters in request body
- HttpMethod.POST,
- "/queries/" + PARAMETERIZED_QUERIES[0][0],
- QUERY_ARGS1,
- HttpStatus.INTERNAL_SERVER_ERROR,
- null,
- true,
- false
- },
- { //54. update unknown parameterized named query
- HttpMethod.PUT,
- "/queries/" + "invalidQuery" + "?q=" + PARAMETERIZED_QUERIES[4][1],
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //55. DELETE parameterized named query with invalid queryString
- HttpMethod.DELETE,
- "/queries/" + PARAMETERIZED_QUERIES[3][0] ,
- null,
- HttpStatus.OK,
- null,
- false,
- false
- },
- { //56. DELETE Non-existing parameterized named
- HttpMethod.DELETE,
- "/queries/" + PARAMETERIZED_QUERIES[3][0] ,
- null,
- HttpStatus.NOT_FOUND,
- null,
- true,
- true
- },
- { //57. Ping the REST service using HTTP HEAD
- HttpMethod.HEAD,
- "/ping",
- null,
- HttpStatus.OK,
- null,
- false,
- false
- },
- { //58. Ping the REST service using HTTP GET
- HttpMethod.GET,
- "/ping",
- null,
- HttpStatus.OK,
- null,
- false,
- false
- },
- { //59. Get the total number of entries in region
- HttpMethod.HEAD,
- "/customers",
- null,
- HttpStatus.OK,
- null,
- false,
- false
- },
- { //60. create parameterized named query "testQuery", passing it in request-body
- HttpMethod.POST,
- "/queries?id=" + PARAMETERIZED_QUERIES[3][0],
- PARAMETERIZED_QUERIES[3][1],
- HttpStatus.CREATED,
- "/queries/" + PARAMETERIZED_QUERIES[3][0],
- false,
- false
- },
- { //61. update parameterized named query, passing it in request-body
- HttpMethod.PUT,
- "/queries/" + PARAMETERIZED_QUERIES[3][0],
- PARAMETERIZED_QUERIES[4][1],
- HttpStatus.OK,
- null,
- false,
- false
- },
- { // 52.5. update parameterized named query "testQuery"
- HttpMethod.GET,
- "/queries",
- null,
- HttpStatus.OK,
- null,
- true,
- false
- },
- };
- //TEST_DATA_END
-
+
+ final Object TEST_DATA[][] = {
+ { // 0. create - 200 ok
+ HttpMethod.POST, "/orders?key=1", ORDER1_AS_JSON, HttpStatus.CREATED, "/orders/1", false,
+ false},
+ { // 1. create - 409 conflict
+ HttpMethod.POST, "/orders?key=1", ORDER1_AS_JSON, HttpStatus.CONFLICT, "/orders/1", true,
+ true},
+ { // 2. create - 400 bad Req for malformed Json
+ HttpMethod.POST, "/orders?key=k1", MALFORMED_JSON, HttpStatus.BAD_REQUEST, null, true,
+ true},
+ { // 3. create - 404, Not Found, for Region not exist
+ HttpMethod.POST, "/" + UNKNOWN_REGION + "?key=k1", ORDER1_AS_JSON, HttpStatus.NOT_FOUND,
+ null, true, true},
+ { // 4. create - 500 creating entry on region having DataPolicy=Empty
+ HttpMethod.POST, "/" + EMPTY_REGION + "?key=k1", ORDER1_AS_JSON,
+ HttpStatus.INTERNAL_SERVER_ERROR, null, true, true},
+ { // 5. Get data for key - 200 ok
+ HttpMethod.GET, "/orders/1", null, HttpStatus.OK, "/orders/1", true, false},
+ { // 6. Get data for key - 404 region not exist
+ HttpMethod.GET, "/" + UNKNOWN_REGION + "/1", null, HttpStatus.NOT_FOUND, null, true,
+ true},
+ { // 7. Get data for Non-existing key - 404, Resource NOT FOUND.
+ HttpMethod.GET, "/" + EMPTY_REGION + "/unknown", null, HttpStatus.INTERNAL_SERVER_ERROR,
+ null, true, true},
+ { // 8. Put - 200 Ok, successful
+ HttpMethod.PUT, "/orders/2", ORDER2_AS_JSON, HttpStatus.OK, "/orders/2", false, false},
+ { // 9. Put - 400 Bad Request, Malformed JSOn
+ HttpMethod.PUT, "/orders/3", MALFORMED_JSON, HttpStatus.BAD_REQUEST, null, true, true},
+ { // 10. Put - 404 Not Found, Region does not exist
+ HttpMethod.PUT, "/" + UNKNOWN_REGION + "/k1", ORDER2_AS_JSON, HttpStatus.NOT_FOUND, null,
+ true, true},
+ { // 11. Put - 500, Gemfire throws exception
+ HttpMethod.PUT, "/" + EMPTY_REGION + "/k1", ORDER2_AS_JSON,
+ HttpStatus.INTERNAL_SERVER_ERROR, null, true, true},
+ { // 12. putAll - 200 Ok
+ HttpMethod.PUT,
+ "/customers/1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60",
+ CUSTOMER_LIST_AS_JSON, HttpStatus.OK, "/customers/3,4,5,6", false, false},
+ { // 13. putAll - 400 bad Request, amlformed Json
+ HttpMethod.PUT, "/customers/3,4,5,6", MALFORMED_JSON, HttpStatus.BAD_REQUEST, null, true,
+ true},
+ { // 14. putAll - 404 Not Found, Region Does not exist
+ HttpMethod.PUT, "/" + UNKNOWN_REGION + "/3,4,5,6", CUSTOMER_LIST1_AS_JSON,
+ HttpStatus.NOT_FOUND, null, true, true},
+ { // 15. putAll - 500, Gemfire throws exception
+ HttpMethod.PUT, "/" + EMPTY_REGION + "/3,4,5,6", CUSTOMER_LIST1_AS_JSON,
+ HttpStatus.INTERNAL_SERVER_ERROR, null, true, true},
+ { // 16. PUT?op=REPLACE, 200 Ok test case
+ HttpMethod.PUT, "/orders/2?op=REPLACE", ORDER2_UPDATED_AS_JSON, HttpStatus.OK,
+ "/orders/2", false, false},
+ { // 17. Put?op=REPLACE, 400 Bad Request, Malformed JSOn
+ HttpMethod.PUT, "/orders/2?op=REPLACE", MALFORMED_JSON, HttpStatus.BAD_REQUEST, null,
+ true, true},
+ { // 18. Put?op=REPLACE, 404 Not Found, Region does not exist
+ HttpMethod.PUT, "/" + UNKNOWN_REGION + "/k1?op=rePlace", ORDER2_AS_JSON,
+ HttpStatus.NOT_FOUND, null, true, true},
+ { // 19. Put?op=REPLACE, 500 testcase, Gemfire exception
+ HttpMethod.PUT, "/" + EMPTY_REGION + "/k1?op=REPLACE", ORDER2_AS_JSON,
+ HttpStatus.INTERNAL_SERVER_ERROR, null, true, true},
+ { // 20. Put?op=CAS, 200 OK testcase.
+ HttpMethod.PUT, "/orders/1?op=CAS", ORDER_AS_CASJSON, HttpStatus.OK, "/orders/1", false,
+ false},
+ { // 21. Put?op=CAS, 409 OK testcase.
+ HttpMethod.PUT, "/orders/2?op=CAS", ORDER_AS_CASJSON, HttpStatus.CONFLICT, "/orders/2",
+ true, true},
+ { // 22. Put?op=CAS, 400 Bad Request, Malformed JSOn
+ HttpMethod.PUT, "/orders/2?op=cas", MALFORMED_CAS_JSON, HttpStatus.BAD_REQUEST, null,
+ true, true},
+ { // 23. Put?op=CAS, 404 Not Found, Region does not exist
+ HttpMethod.PUT, "/" + UNKNOWN_REGION + "/k1?op=CAS", ORDER_AS_CASJSON,
+ HttpStatus.NOT_FOUND, null, true, true},
+ { // 24. Put?op=cAs, 500 testcase, Gemfire exception
+ HttpMethod.PUT, "/" + EMPTY_REGION + "/k1?op=cAs", ORDER_AS_CASJSON,
+ HttpStatus.INTERNAL_SERVER_ERROR, null, true, true},
+ { // 25. Get - List all regions/resources - 200 ok testcase
+ HttpMethod.GET, "", null, HttpStatus.OK, RestTestUtils.GEMFIRE_REST_API_WEB_SERVICE_URL,
+ true, true},
+ { // 26. List all regions/resources - 405 testcase.
+ HttpMethod.POST, "", null, HttpStatus.METHOD_NOT_ALLOWED, null, true, true},
+ { // 27. GetAll - read all data for region - 200 ok, Default test case [No limit param
+ // specified].
+ HttpMethod.GET, "/customers", null, HttpStatus.OK, "/customers", true, false},
+ { // 28 GetAll - read all data for region - 404 NOT FOUND testcase.
+ HttpMethod.GET, "/" + UNKNOWN_REGION, null, HttpStatus.NOT_FOUND, null, true, true},
+ { // 29 GetAll - read all data for region - limit=ALL testcase.
+ HttpMethod.GET, "/customers?limit=ALL", null, HttpStatus.OK, null, true, false},
+ { // 30 GetAll - read data for fixed number of keys - limit=<NUMBER> testcase.
+ HttpMethod.GET, "/customers?limit=10", null, HttpStatus.OK, null, true, false},
+ { // 31. Get keys - List all keys in region - 200 ok testcase
+ HttpMethod.GET, "/customers/keys", null, HttpStatus.OK, "/customers/keys", true, false},
+ { // 32. Get keys - List all keys for region which does not exist - 404 NOt Found testcase
+ HttpMethod.GET, "/" + UNKNOWN_REGION + "/keys", null, HttpStatus.NOT_FOUND, null, true,
+ true},
+ { // 33. Get keys - 405 testcase, if any HTTP request method other than GET (e.g. only POST,
+ // NOT PUT, DELETE, as for them its a valid op) is used
+ HttpMethod.POST, "/customers/keys", null, HttpStatus.METHOD_NOT_ALLOWED, null, true,
+ true},
+ { // 34. Read data for the specific keys. 200 Ok testcase.
+ HttpMethod.GET, "/customers/1,2,3,4,5,6,7,8,9,10", null, HttpStatus.OK, null, true,
+ false},
+ {
+ // 35. Read data for the specific keys. 404 Ok testcase.
+ HttpMethod.GET, "/" + UNKNOWN_REGION + "/1,2,3,4,5,6,7,8,9,10", null,
+ HttpStatus.NOT_FOUND, null, true, true},
+ { // 36. delete data for key in region. 200 Ok testcase
+ HttpMethod.DELETE, "/customers/1", null, HttpStatus.OK, "/customers/1", false, false},
+ { // 37. delete data for key with non-existing region. 404 Not Found, testcase.
+ HttpMethod.DELETE, "/" + UNKNOWN_REGION + "/1", null, HttpStatus.NOT_FOUND, null, true,
+ true},
+ { // 38. delete data for key, 500 - Gemfire throws exception testcase.
+ HttpMethod.DELETE, "/" + EMPTY_REGION + "/1", null, HttpStatus.NOT_FOUND, null, true,
+ true},
+ { // 39. delete data for set of keys, 200 Ok, testcase.
+ HttpMethod.DELETE, "/customers/2,3,4,5", null, HttpStatus.OK, null, false, false},
+ { // 40. delete data for set of keys, 404 Region NOT Found, testcase.
+ HttpMethod.DELETE, "/" + UNKNOWN_REGION + "/2,3,4,5", null, HttpStatus.NOT_FOUND, null,
+ true, true},
+ { // 41. delete data for set of keys, 500 Gemfire throws exception testcase.
+ HttpMethod.DELETE, "/" + EMPTY_REGION + "/2,3,4,5", null, HttpStatus.NOT_FOUND, null,
+ true, true},
+ { // 42. create parameterized named query
+ HttpMethod.POST,
+ "/queries?id=" + PARAMETERIZED_QUERIES[0][0] + "&q=" + PARAMETERIZED_QUERIES[0][1], null,
+ HttpStatus.CREATED, "/queries/" + PARAMETERIZED_QUERIES[0][0], false, false},
+ { // 43. create parameterized named query
+ HttpMethod.POST,
+ "/queries?id=" + PARAMETERIZED_QUERIES[1][0] + "&q=" + PARAMETERIZED_QUERIES[1][1], null,
+ HttpStatus.CREATED, "/queries/" + PARAMETERIZED_QUERIES[1][0], false, false},
+ { // 44. create parameterized named query
+ HttpMethod.POST,
+ "/queries?id=" + PARAMETERIZED_QUERIES[2][0] + "&q=" + PARAMETERIZED_QUERIES[2][1], null,
+ HttpStatus.CREATED, "/queries/" + PARAMETERIZED_QUERIES[2][0], false, false},
+ { // 45. list all named/parameterized queries
+ // NOTE: query result = 3. old index=8.
+ HttpMethod.GET, "/queries", null, HttpStatus.OK, "/queries", true, false},
+ { // 46. Run the specified named query passing in args for query parameters in request body
+ // Note: Query Result = 2, Old index=9
+ HttpMethod.POST, "/queries/" + PARAMETERIZED_QUERIES[0][0], QUERY_ARGS1, HttpStatus.OK,
+ "/queries/" + PARAMETERIZED_QUERIES[0][0], true, false},
+ { // 47. Run the specified named query passing in args for query parameters in request body
+ // Note: Query size = 1, old index = 10
+ HttpMethod.POST, "/queries/" + PARAMETERIZED_QUERIES[1][0], QUERY_ARGS2, HttpStatus.OK,
+ "/queries/" + PARAMETERIZED_QUERIES[1][0], true, false},
+ { // 48. Run an unnamed (unidentified), ad-hoc query passed as a URL parameter
+ HttpMethod.GET, "/queries/adhoc?q=SELECT * FROM /customers", null, HttpStatus.OK, null,
+ true, false},
+ { // 49. list all functions available in the GemFire cluster
+ HttpMethod.GET, "/functions", null, HttpStatus.OK, "/functions", true, false},
+ { // 50. Execute function with args on availabl nodes in the GemFire cluster
+ HttpMethod.POST, "/functions/AddFreeItemToOrders?onRegion=orders", FUNCTION_ARGS1,
+ HttpStatus.OK, "/functions/AddFreeItemToOrders", true, false},
+ { // 51. create parameterized named query "testQuery"
+ HttpMethod.POST,
+ "/queries?id=" + PARAMETERIZED_QUERIES[3][0] + "&q=" + PARAMETERIZED_QUERIES[3][1], null,
+ HttpStatus.CREATED, "/queries/" + PARAMETERIZED_QUERIES[3][0], false, false},
+ { // 52. update parameterized named query "testQuery"
+ HttpMethod.PUT,
+ "/queries/" + PARAMETERIZED_QUERIES[0][0] + "?q=" + PARAMETERIZED_QUERIES[4][1], null,
+ HttpStatus.OK, null, false, false},
+ { // 53. Run the updated named query passing in args for query parameters in request body
+ HttpMethod.POST, "/queries/" + PARAMETERIZED_QUERIES[0][0], QUERY_ARGS1,
+ HttpStatus.INTERNAL_SERVER_ERROR, null, true, false},
+ { // 54. update unknown parameterized named query
+ HttpMethod.PUT, "/queries/" + "invalidQuery" + "?q=" + PARAMETERIZED_QUERIES[4][1], null,
+ HttpStatus.NOT_FOUND, null, true, true},
+ { // 55. DELETE parameterized named query with invalid queryString
+ HttpMethod.DELETE, "/queries/" + PARAMETERIZED_QUERIES[3][0], null, HttpStatus.OK, null,
+ false, false},
+ { // 56. DELETE Non-existing parameterized named
+ HttpMethod.DELETE, "/queries/" + PARAMETERIZED_QUERIES[3][0], null, HttpStatus.NOT_FOUND,
+ null, true, true},
+ { // 57. Ping the REST service using HTTP HEAD
+ HttpMethod.HEAD, "/ping", null, HttpStatus.OK, null, false, false},
+ { // 58. Ping the REST service using HTTP GET
+ HttpMethod.GET, "/ping", null, HttpStatus.OK, null, false, false},
+ { // 59. Get the total number of entries in region
+ HttpMethod.HEAD, "/customers", null, HttpStatus.OK, null, false, false},
+ { // 60. create parameterized named query "testQuery", passing it in request-body
+ HttpMethod.POST, "/queries?id=" + PARAMETERIZED_QUERIES[3][0],
+ PARAMETERIZED_QUERIES[3][1], HttpStatus.CREATED,
+ "/queries/" + PARAMETERIZED_QUERIES[3][0], false, false},
+ { // 61. update parameterized named query, passing it in request-body
+ HttpMethod.PUT, "/queries/" + PARAMETERIZED_QUERIES[3][0], PARAMETERIZED_QUERIES[4][1],
+ HttpStatus.OK, null, false, false},
+ { // 52.5. update parameterized named query "testQuery"
+ HttpMethod.GET, "/queries", null, HttpStatus.OK, null, true, false},};
+ // TEST_DATA_END
+
final int LIST_ALL_NAMED_QUERIES_INDEX = 45;
- final List<Integer> VALID_400_URL_INDEXS = Arrays.asList(2, 9, 13, 17,22);
- final List<Integer> VALID_404_URL_INDEXS = Arrays.asList(3, 6, 7, 10, 14, 18, 23, 28, 32, 35, 37, 38, 40, 41, 54, 56);
+ final List<Integer> VALID_400_URL_INDEXS = Arrays.asList(2, 9, 13, 17, 22);
+ final List<Integer> VALID_404_URL_INDEXS =
+ Arrays.asList(3, 6, 7, 10, 14, 18, 23, 28, 32, 35, 37, 38, 40, 41, 54, 56);
final List<Integer> VALID_409_URL_INDEXS = Arrays.asList(1, 21);
final List<Integer> VALID_405_URL_INDEXS = Arrays.asList(26, 33);
final List<Integer> Query_URL_INDEXS = Arrays.asList(LIST_ALL_NAMED_QUERIES_INDEX, 46, 47, 48);
-
+
public String createRestURL(String baseURL, Object requestPart) {
- if(StringUtils.isEmpty(requestPart)) {
- return baseURL + RestTestUtils.GEMFIRE_REST_API_CONTEXT + RestTestUtils.GEMFIRE_REST_API_VERSION;
- }else {
- return baseURL + RestTestUtils.GEMFIRE_REST_API_CONTEXT + RestTestUtils.GEMFIRE_REST_API_VERSION + requestPart;
+ if (StringUtils.isEmpty(requestPart)) {
+ return baseURL + RestTestUtils.GEMFIRE_REST_API_CONTEXT
+ + RestTestUtils.GEMFIRE_REST_API_VERSION;
+ } else {
+ return baseURL + RestTestUtils.GEMFIRE_REST_API_CONTEXT
+ + RestTestUtils.GEMFIRE_REST_API_VERSION + requestPart;
}
}
public void initializeQueryTestData() {
- //LIST_ALL_NAMED_QUERY
+ // LIST_ALL_NAMED_QUERY
int size = PARAMETERIZED_QUERIES.length;
List<String> queryIds = new ArrayList<>();
- for (int i=0; i < size; i++ ){
- queryIds.add(PARAMETERIZED_QUERIES[i][0]) ;
+ for (int i = 0; i < size; i++) {
+ queryIds.add(PARAMETERIZED_QUERIES[i][0]);
}
-
+
QueryResultData qIndex45_resultData = new QueryResultData();
qIndex45_resultData.setQueryIndex(45);
qIndex45_resultData.setType(QueryType.LIST_ALL_NAMED_QUERY);
qIndex45_resultData.setResultSize(2);
qIndex45_resultData.setResult(queryIds);
queryResultByIndex.put(45, qIndex45_resultData);
-
- //index=46
+
+ // index=46
QueryResultData qIndex46_resultData = new QueryResultData();
qIndex46_resultData.setQueryIndex(46);
qIndex46_resultData.setType(QueryType.EXECUTE_NAMED_QUERY);
qIndex46_resultData.setResultSize(2);
qIndex46_resultData.setResult(null);
queryResultByIndex.put(46, qIndex46_resultData);
-
- //index=47
+
+ // index=47
QueryResultData qIndex47_resultData = new QueryResultData();
qIndex47_resultData.setQueryIndex(47);
qIndex47_resultData.setType(QueryType.EXECUTE_NAMED_QUERY);
qIndex47_resultData.setResultSize(0);
qIndex47_resultData.setResult(null);
queryResultByIndex.put(47, qIndex47_resultData);
-
- //index=48
+
+ // index=48
QueryResultData qIndex48_resultData = new QueryResultData();
qIndex48_resultData.setQueryIndex(48);
qIndex48_resultData.setType(QueryType.EXECUTE_ADHOC_QUERY);
@@ -1318,7 +573,7 @@ public class RestAPIsQueryAndFEJUnitTest {
qIndex48_resultData.setResult(null);
queryResultByIndex.put(48, qIndex48_resultData);
}
-
+
@Before
public void setUp() throws Exception {
AgentUtil agentUtil = new AgentUtil(GemFireVersion.getGemFireVersion());
@@ -1327,64 +582,58 @@ public class RestAPIsQueryAndFEJUnitTest {
}
this.restServicePort = AvailablePortHelper.getRandomAvailableTCPPort();
-
+
try {
InetAddress addr = SocketCreator.getLocalHost();
this.hostName = addr.getHostName();
} catch (UnknownHostException ex) {
this.hostName = ManagementConstants.DEFAULT_HOST_NAME;
}
-
+
String workingDirectory = System.getProperty("geode.build.dir", System.getProperty("user.dir"));
-
- ServerLauncher serverLauncher = new ServerLauncher.Builder()
- .set(MCAST_PORT, "0")
- .setServerBindAddress(this.hostName)
- .setServerPort(0)
- .set(START_DEV_REST_API, "true")
+
+ ServerLauncher serverLauncher = new ServerLauncher.Builder().set(MCAST_PORT, "0")
+ .setServerBindAddress(this.hostName).setServerPort(0).set(START_DEV_REST_API, "true")
.set(HTTP_SERVICE_PORT, String.valueOf(this.restServicePort))
- .set(HTTP_SERVICE_BIND_ADDRESS, this.hostName)
- .setPdxReadSerialized(true)
- .setWorkingDirectory(workingDirectory)
- .build();
-
+ .set(HTTP_SERVICE_BIND_ADDRESS, this.hostName).setPdxReadSerialized(true)
+ .setWorkingDirectory(workingDirectory).build();
+
serverLauncher.start();
-
+
this.baseURL = "http://" + this.hostName + ":" + this.restServicePort;
this.c = CacheFactory.getAnyInstance();
-
+
final AttributesFactory<String, String> attributesFactory = new AttributesFactory<>();
attributesFactory.setDataPolicy(DataPolicy.REPLICATE);
// Create region, customers
- final RegionAttributes<String, String> regionAttributes = attributesFactory
- .create();
+ final RegionAttributes<String, String> regionAttributes = attributesFactory.create();
c.createRegion(CUSTOMER_REGION, regionAttributes);
-
+
// Create region, items
attributesFactory.setDataPolicy(DataPolicy.PARTITION);
c.createRegion(ITEM_REGION, regionAttributes);
-
+
// Create region, /orders
final AttributesFactory<Object, Object> af2 = new AttributesFactory<>();
af2.setDataPolicy(DataPolicy.PARTITION);
final RegionAttributes<Object, Object> rAttributes2 = af2.create();
-
+
c.createRegion(ORDER_REGION, rAttributes2);
-
+
// Create region, primitiveKVStore
final AttributesFactory<Object, Object> af1 = new AttributesFactory<>();
af1.setDataPolicy(DataPolicy.PARTITION);
final RegionAttributes<Object, Object> rAttributes = af1.create();
-
+
c.createRegion(PRIMITIVE_KV_STORE_REGION, rAttributes);
-
- RegionFactory<String,Object> rf = c.createRegionFactory(RegionShortcut.REPLICATE);
+
+ RegionFactory<String, Object> rf = c.createRegionFactory(RegionShortcut.REPLICATE);
rf.setDataPolicy(DataPolicy.EMPTY);
rf.setCacheLoader(new SimpleCacheLoader());
rf.setCacheWriter(new SampleCacheWriter());
rf.create(EMPTY_REGION);
-
+
// Register functions here
FunctionService.registerFunction(new GetAllEntries());
FunctionService.registerFunction(new GetRegions());
@@ -1398,7 +647,7 @@ public class RestAPIsQueryAndFEJUnitTest {
// shutdown and clean up the manager node.
ServerLauncher.getInstance().stop();
}
-
+
private HttpHeaders setAcceptAndContentTypeHeaders() {
List<MediaType> acceptableMediaTypes = new ArrayList<>();
acceptableMediaTypes.add(MediaType.APPLICATION_JSON);
@@ -1410,7 +659,7 @@ public class RestAPIsQueryAndFEJUnitTest {
}
@Test
- public void testCreateAsJson() {
+ public void testCreateAsJson() {
executeQueryTestCases();
}
@@ -1418,8 +667,8 @@ public class RestAPIsQueryAndFEJUnitTest {
throw new AssertionError(message, cause);
}
- private void validateGetAllResult(int index, ResponseEntity<String> result){
- if (index == 27 || index == 29 || index == 30) {
+ private void validateGetAllResult(int index, ResponseEntity<String> result) {
+ if (index == 27 || index == 29 || index == 30) {
try {
new JSONObject(result.getBody()).getJSONArray("customers");
} catch (JSONException e) {
@@ -1427,41 +676,41 @@ public class RestAPIsQueryAndFEJUnitTest {
}
}
}
-
+
private void verifyRegionSize(int index, ResponseEntity<String> result) {
- if (index == 59 ) {
+ if (index == 59) {
HttpHeaders headers = result.getHeaders();
String value = headers.getFirst("Resource-Count");
assertEquals(Integer.parseInt(value), 55);
}
}
-
- private void validateQueryResult(int index, ResponseEntity<String> result){
+
+ private void validateQueryResult(int index, ResponseEntity<String> result) {
if (Query_URL_INDEXS.contains(index)) {
queryResultByIndex = new HashMap<>();
- initializeQueryTestData();
- QueryResultData queryResult = queryResultByIndex.get(index);
+ initializeQueryTestData();
+ QueryResultData queryResult = queryResultByIndex.get(index);
+
+ // Check whether received response contains expected query IDs.
+ if (index == 45) {
- //Check whether received response contains expected query IDs.
- if(index == 45 ) {
-
try {
JSONObject jsonObject = new JSONObject(result.getBody());
JSONArray jsonArray = new JSONArray(jsonObject.get("queries").toString());
-
- for (int i=0; i< jsonArray.length(); i++) {
- assertTrue("PREPARE_PARAMETERIZED_QUERY: function IDs are not matched", queryResult.getResult().contains(jsonArray.getJSONObject(i).getString("id")));
+
+ for (int i = 0; i < jsonArray.length(); i++) {
+ assertTrue("PREPARE_PARAMETERIZED_QUERY: function IDs are not matched",
+ queryResult.getResult().contains(jsonArray.getJSONObject(i).getString("id")));
}
} catch (JSONException e) {
caught("Caught JSONException in validateQueryResult :: " + e.getMessage(), e);
}
- }
- else if (index == 46 || index == 47 || index == 48) {
-
+ } else if (index == 46 || index == 47 || index == 48) {
+
JSONArray jsonArray;
try {
jsonArray = new JSONArray(result.getBody());
- //verify query result size
+ // verify query result size
assertEquals(queryResult.getResultSize(), jsonArray.length());
} catch (JSONException e) {
caught("Caught JSONException in validateQueryResult :: " + e.getMessage(), e);
@@ -1469,9 +718,9 @@ public class RestAPIsQueryAndFEJUnitTest {
}
}
}
-
- private String addExpectedException (int index) {
- String expectedEx = "appears to have started a thread named";
+
+ private String addExpectedException(int index) {
+ String expectedEx = "appears to have started a thread named";
if (index == 4 || index == 5 || index == 24) {
expectedEx = "java.lang.UnsupportedOperationException";
c.getLogger().info("<ExpectedException action=add>" + expectedEx + "</ExpectedException>");
@@ -1488,121 +737,128 @@ public class RestAPIsQueryAndFEJUnitTest {
expectedEx = "java.lang.IllegalArgumentException";
c.getLogger().info("<ExpectedException action=add>" + expectedEx + "</ExpectedException>");
return expectedEx;
- } else if (index == 38 || index == 41 ) {
+ } else if (index == 38 || index == 41) {
expectedEx = "org.apache.geode.cache.RegionDestroyedException";
c.getLogger().info("<ExpectedException action=add>" + expectedEx + "</ExpectedException>");
return expectedEx;
}
-
+
return expectedEx;
}
private void executeQueryTestCases() {
HttpHeaders headers = setAcceptAndContentTypeHeaders();
HttpEntity<Object> entity;
-
+
int totalRequests = TEST_DATA.length;
String expectedEx = null;
-
- for (int index=0; index < totalRequests; index++) {
+
+ for (int index = 0; index < totalRequests; index++) {
try {
expectedEx = addExpectedException(index);
final String restRequestUrl = createRestURL(this.baseURL, TEST_DATA[index][URL_INDEX]);
entity = new HttpEntity<>(TEST_DATA[index][REQUEST_BODY_INDEX], headers);
- ResponseEntity<String> result = RestTestUtils.getRestTemplate().exchange(
- restRequestUrl,
- (HttpMethod)TEST_DATA[index][METHOD_INDEX], entity, String.class);
+ ResponseEntity<String> result = RestTestUtils.getRestTemplate().exchange(restRequestUrl,
+ (HttpMethod) TEST_DATA[index][METHOD_INDEX], entity, String.class);
validateGetAllResult(index, result);
validateQueryResult(index, result);
assertEquals(result.getStatusCode(), TEST_DATA[index][STATUS_CODE_INDEX]);
- assertEquals(result.hasBody(), ((Boolean)TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
+ assertEquals(result.hasBody(),
+ ((Boolean) TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
verifyRegionSize(index, result);
- //TODO:
- //verify location header
+ // TODO:
+ // verify location header
} catch (HttpClientErrorException e) {
- if( VALID_409_URL_INDEXS.contains(index)) {
- //create-409, conflict testcase. [create on already existing key]
+ if (VALID_409_URL_INDEXS.contains(index)) {
+ // create-409, conflict testcase. [create on already existing key]
assertEquals(e.getStatusCode(), TEST_DATA[index][STATUS_CODE_INDEX]);
- assertEquals(StringUtils.hasText(e.getResponseBodyAsString()),((Boolean)TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
+ assertEquals(StringUtils.hasText(e.getResponseBodyAsString()),
+ ((Boolean) TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
- }else if (VALID_400_URL_INDEXS.contains(index)) {
+ } else if (VALID_400_URL_INDEXS.contains(index)) {
// 400, Bad Request testcases. [create with malformed Json]
assertEquals(e.getStatusCode(), TEST_DATA[index][STATUS_CODE_INDEX]);
- assertEquals(StringUtils.hasText(e.getResponseBodyAsString()), ((Boolean)TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
+ assertEquals(StringUtils.hasText(e.getResponseBodyAsString()),
+ ((Boolean) TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
- }
- else if (VALID_404_URL_INDEXS.contains(index) ) {
+ } else if (VALID_404_URL_INDEXS.contains(index)) {
// create-404, Not Found testcase. [create on not-existing region]
assertEquals(e.getStatusCode(), TEST_DATA[index][STATUS_CODE_INDEX]);
- assertEquals(StringUtils.hasText(e.getResponseBodyAsString()), ((Boolean)TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
+ assertEquals(StringUtils.hasText(e.getResponseBodyAsString()),
+ ((Boolean) TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
- }
- else if (VALID_405_URL_INDEXS.contains(index) ) {
+ } else if (VALID_405_URL_INDEXS.contains(index)) {
// create-404, Not Found testcase. [create on not-existing region]
assertEquals(e.getStatusCode(), TEST_DATA[index][STATUS_CODE_INDEX]);
- assertEquals(StringUtils.hasText(e.getResponseBodyAsString()), ((Boolean)TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
- }
- else {
- fail( "Index:" + index+ " " + TEST_DATA[index][METHOD_INDEX] + " " + TEST_DATA[index][URL_INDEX] + " should not have thrown exception ");
+ assertEquals(StringUtils.hasText(e.getResponseBodyAsString()),
+ ((Boolean) TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
+ } else {
+ fail("Index:" + index + " " + TEST_DATA[index][METHOD_INDEX] + " "
+ + TEST_DATA[index][URL_INDEX] + " should not have thrown exception ");
}
} catch (HttpServerErrorException se) {
- //index=4, create- 500, INTERNAL_SERVER_ERROR testcase. [create on Region with DataPolicy=Empty set]
- //index=7, create- 500, INTERNAL_SERVER_ERROR testcase. [Get, attached cache loader throws Timeout exception]
- //index=11, put- 500, [While doing R.put, CacheWriter.beforeCreate() has thrown CacheWriterException]
- //.... and more test cases
+ // index=4, create- 500, INTERNAL_SERVER_ERROR testcase. [create on Region with
+ // DataPolicy=Empty set]
+ // index=7, create- 500, INTERNAL_SERVER_ERROR testcase. [Get, attached cache loader throws
+ // Timeout exception]
+ // index=11, put- 500, [While doing R.put, CacheWriter.beforeCreate() has thrown
+ // CacheWriterException]
+ // .... and more test cases
assertEquals(se.getStatusCode(), TEST_DATA[index][STATUS_CODE_INDEX]);
- assertEquals(StringUtils.hasText(se.getResponseBodyAsString()), ((Boolean)TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
+ assertEquals(StringUtils.hasText(se.getResponseBodyAsString()),
+ ((Boolean) TEST_DATA[index][RESPONSE_HAS_BODY_INDEX]).booleanValue());
- }
- catch (Exception e) {
- caught("caught Exception in executeQueryTestCases " + "Index:" + index+ " " + TEST_DATA[index][METHOD_INDEX] + " " + TEST_DATA[index][URL_INDEX] + " :: Unexpected ERROR...!!", e);
+ } catch (Exception e) {
+ caught("caught Exception in executeQueryTestCases " + "Index:" + index + " "
+ + TEST_DATA[index][METHOD_INDEX] + " " + TEST_DATA[index][URL_INDEX]
+ + " :: Unexpected ERROR...!!", e);
} finally {
- c.getLogger().info("<ExpectedException action=remove>" + expectedEx + "</ExpectedException>");
+ c.getLogger()
+ .info("<ExpectedException action=remove>" + expectedEx + "</ExpectedException>");
}
}
}
}
+
// TODO: move following classes to be inner classes
class SimpleCacheLoader implements CacheLoader<String, Object>, Declarable {
-
+
@Override
public Object load(LoaderHelper helper) {
- //throws TimeoutException
+ // throws TimeoutException
throw new TimeoutException("Could not load, Request Timedout...!!");
}
@Override
- public void close() {
- }
+ public void close() {}
@Override
public void init(Properties props) {
-
+
}
}
-class SampleCacheWriter implements CacheWriter<String, Object> {
+
+class SampleCacheWriter implements CacheWriter<String, Object> {
@Override
- public void close() {
- }
+ public void close() {}
@Override
- public void beforeUpdate(EntryEvent event) throws CacheWriterException {
- }
+ public void beforeUpdate(EntryEvent event) throws CacheWriterException {}
@Override
public void beforeCreate(EntryEvent event) throws CacheWriterException {
@@ -1615,28 +871,29 @@ class SampleCacheWriter implements CacheWriter<String, Object> {
}
@Override
- public void beforeRegionDestroy(RegionEvent event) throws CacheWriterException {
- }
+ public void beforeRegionDestroy(RegionEvent event) throws CacheWriterException {}
@Override
- public void beforeRegionClear(RegionEvent event) throws CacheWriterException {
- }
+ public void beforeRegionClear(RegionEvent event) throws CacheWriterException {}
+}
+
+
+enum QueryType {
+ LIST_ALL_NAMED_QUERY, EXECUTE_NAMED_QUERY, EXECUTE_ADHOC_QUERY
}
-enum QueryType {LIST_ALL_NAMED_QUERY, EXECUTE_NAMED_QUERY, EXECUTE_ADHOC_QUERY }
class QueryResultData {
private int queryIndex;
- private QueryType type;
+ private QueryType type;
private int resultSize;
private List<String> result;
-
- public QueryResultData() {
- }
+
+ public QueryResultData() {}
@SuppressWarnings("unused")
- public QueryResultData(int index, QueryType type, int size, List<String> result){
+ public QueryResultData(int index, QueryType type, int size, List<String> result) {
this.queryIndex = index;
this.type = type;
this.resultSize = size;
@@ -1674,5 +931,5 @@ class QueryResultData {
public void setResult(List<String> result) {
this.result = result;
}
-
+
}
[63/98] [abbrv] incubator-geode git commit: GEODE-2025: do not use
8080 as the default http-server-port since we defined default in
DistributionConfig
Posted by ds...@apache.org.
GEODE-2025: do not use 8080 as the default http-server-port since we defined default in DistributionConfig
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/259ceb77
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/259ceb77
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/259ceb77
Branch: refs/heads/feature/GEM-983
Commit: 259ceb77d0221772801f2b0e8f535530e346c371
Parents: 892d6d3
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Fri Oct 21 09:38:43 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Oct 24 12:14:18 2016 -0700
----------------------------------------------------------------------
.../rest/internal/web/GeodeRestClient.java | 28 ++---
.../web/RestSecurityIntegrationTest.java | 4 +-
.../rest/internal/web/RestServersJUnitTest.java | 68 ++++++++++++
.../internal/web/SwaggerVerificationTest.java | 4 +-
.../apache/geode/cache/server/CacheServer.java | 7 --
.../util/FindRestEnabledServersFunction.java | 9 +-
.../geode/management/internal/RestAgent.java | 40 +++----
.../cli/commands/LauncherLifecycleCommands.java | 111 +++++++++++--------
8 files changed, 179 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
index 2889c67..071b95c 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
@@ -36,6 +36,9 @@ import org.apache.http.impl.client.BasicAuthCache;
import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
import org.json.JSONTokener;
import org.junit.Assert;
@@ -49,12 +52,13 @@ import java.nio.charset.StandardCharsets;
public class GeodeRestClient {
public final static String PROTOCOL = "http";
- public final static String HOSTNAME = "localhost";
public final static String CONTEXT = "/geode/v1";
private int restPort = 0;
+ private String bindAddress = null;
- public GeodeRestClient(int restPort) {
+ public GeodeRestClient(String bindAddress, int restPort) {
+ this.bindAddress = bindAddress;
this.restPort = restPort;
}
@@ -113,21 +117,19 @@ public class GeodeRestClient {
return response.getStatusLine().getStatusCode();
}
- public static JSONTokener getResponseBody(HttpResponse response) throws IOException {
- HttpEntity entity = response.getEntity();
- InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(content));
- String line;
- StringBuilder str = new StringBuilder();
- while ((line = reader.readLine()) != null) {
- str.append(line);
- }
- return new JSONTokener(str.toString());
+ public static JSONObject getJsonObject(HttpResponse response) throws IOException, JSONException {
+ JSONTokener tokener = new JSONTokener(new InputStreamReader(response.getEntity().getContent()));
+ return new JSONObject(tokener);
+ }
+
+ public static JSONArray getJsonArray(HttpResponse response) throws IOException, JSONException {
+ JSONTokener tokener = new JSONTokener(new InputStreamReader(response.getEntity().getContent()));
+ return new JSONArray(tokener);
}
public HttpResponse doRequest(HttpRequestBase request, String username, String password)
throws MalformedURLException {
- HttpHost targetHost = new HttpHost(HOSTNAME, restPort, PROTOCOL);
+ HttpHost targetHost = new HttpHost(bindAddress, restPort, PROTOCOL);
CloseableHttpClient httpclient = HttpClients.custom().build();
HttpClientContext clientContext = HttpClientContext.create();
// if username is null, do not put in authentication
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index 5b3f7ce..2dffcb7 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -59,7 +59,7 @@ public class RestSecurityIntegrationTest {
@ClassRule
public static ServerStarter serverStarter = new ServerStarter(properties);
- private final GeodeRestClient restClient = new GeodeRestClient(restPort);
+ private final GeodeRestClient restClient = new GeodeRestClient("localhost", restPort);
@BeforeClass
public static void before() throws Exception {
@@ -199,7 +199,7 @@ public class RestSecurityIntegrationTest {
assertEquals("A '200 - OK' was expected", 200, restClient.getCode(response));
assertEquals(MediaType.APPLICATION_JSON_UTF8_VALUE, restClient.getContentType(response));
- JSONObject jsonObject = new JSONObject(restClient.getResponseBody(response));
+ JSONObject jsonObject = restClient.getJsonObject(response);
JSONArray regions = jsonObject.getJSONArray("regions");
assertNotNull(regions);
assertTrue(regions.length() > 0);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
new file mode 100644
index 0000000..552a184
--- /dev/null
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
@@ -0,0 +1,68 @@
+/*
+ * 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.rest.internal.web;
+
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
+
+import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.http.HttpResponse;
+import org.json.JSONArray;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Properties;
+
+@Category(IntegrationTest.class)
+public class RestServersJUnitTest {
+
+ private static int defaultPort = 7070;
+ static Properties properties = new Properties() {
+ {
+ setProperty(START_DEV_REST_API, "true");
+ setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
+ }
+ };
+
+ @ClassRule
+ public static ServerStarter serverStarter = new ServerStarter(properties);
+ private static GeodeRestClient restClient;
+
+ @BeforeClass
+ public static void before() throws Exception {
+ serverStarter.startServer();
+ restClient = new GeodeRestClient("localhost", defaultPort);
+ }
+
+ @Test
+ public void testDefaultPort() throws Exception {
+ // make sure the server is started on the default port and we can connect using the default port
+ HttpResponse response = restClient.doGet("/", null, null);
+ Assert.assertEquals(200, GeodeRestClient.getCode(response));
+ }
+
+ @Test
+ public void testServers() throws Exception {
+ HttpResponse response = restClient.doGet("/servers", null, null);
+ JSONArray body = GeodeRestClient.getJsonArray(response);
+ Assert.assertEquals(1, body.length());
+ Assert.assertEquals("http://localhost:7070", body.getString(0));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
index 3412331..55cc26e 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
@@ -49,7 +49,7 @@ public class SwaggerVerificationTest {
@ClassRule
public static ServerStarter serverStarter = new ServerStarter(properties);
- private final GeodeRestClient restClient = new GeodeRestClient(restPort);
+ private final GeodeRestClient restClient = new GeodeRestClient("localhost", restPort);
@BeforeClass
public static void before() throws Exception {
@@ -65,7 +65,7 @@ public class SwaggerVerificationTest {
// Check the JSON
response = restClient.doGetRequest("/geode/v2/api-docs");
assertThat(GeodeRestClient.getCode(response), is(200));
- JSONObject json = new JSONObject(GeodeRestClient.getResponseBody(response));
+ JSONObject json = GeodeRestClient.getJsonObject(response);
assertThat(json.get("swagger"), is("2.0"));
JSONObject info = json.getJSONObject("info");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java b/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
index 8a5eb96..bd00170 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/server/CacheServer.java
@@ -20,8 +20,6 @@ import java.util.Set;
import org.apache.geode.cache.ClientSession;
import org.apache.geode.cache.InterestRegistrationListener;
import org.apache.geode.cache.client.Pool;
-import org.apache.geode.cache.server.ClientSubscriptionConfig;
-import org.apache.geode.cache.server.ServerLoadProbe;
import org.apache.geode.cache.server.internal.ConnectionCountProbe;
import org.apache.geode.distributed.DistributedMember;
@@ -137,11 +135,6 @@ public interface CacheServer {
*/
public static final boolean DEFAULT_TCP_NO_DELAY = true;
-
- public static final int HTTP_DEFAULT_PORT = 8080;
- public static final String HTTP_SERVICE_DEFAULT_BIND_ADDRESS = "";
-
-
/**
* Returns the port on which this cache server listens for clients.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java
index 6863782..5da63ad 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction.java
@@ -22,12 +22,13 @@ import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.management.internal.RestAgent;
/**
* The FindRestEnabledServersFunction class is a gemfire function that gives details about REST
* enabled gemfire servers.
* <p/>
- *
+ *
* @since GemFire 8.1
*/
@@ -42,11 +43,13 @@ public class FindRestEnabledServersFunction extends FunctionAdapter implements I
GemFireCacheImpl c = (GemFireCacheImpl) CacheFactory.getAnyInstance();
DistributionConfig config = InternalDistributedSystem.getAnyInstance().getConfig();
+ String bindAddress = RestAgent.getBindAddressForHttpService(config);
+
final String protocolType = config.getHttpServiceSSLEnabled() ? "https" : "http";
if (c.isRESTServiceRunning()) {
- context.getResultSender().lastResult(protocolType + "://"
- + config.getHttpServiceBindAddress() + ":" + config.getHttpServicePort());
+ context.getResultSender()
+ .lastResult(protocolType + "://" + bindAddress + ":" + config.getHttpServicePort());
} else {
context.getResultSender().lastResult("");
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java b/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
index 3f630ce..07e6e25 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/RestAgent.java
@@ -114,7 +114,7 @@ public class RestAgent {
public void startHttpService() {
// TODO: add a check that will make sure that we start HTTP service on
// non-manager data node
- String httpServiceBindAddress = getBindAddressForHttpService();
+ String httpServiceBindAddress = getBindAddressForHttpService(this.config);
logger.info("Attempting to start HTTP service on port ({}) at bind-address ({})...",
this.config.getHttpServicePort(), httpServiceBindAddress);
@@ -157,25 +157,25 @@ public class RestAgent {
}
}
- private String getBindAddressForHttpService() {
- java.lang.String bindAddress = this.config.getHttpServiceBindAddress();
- if (StringUtils.isBlank(bindAddress)) {
- if (StringUtils.isBlank(this.config.getServerBindAddress())) {
- if (StringUtils.isBlank(this.config.getBindAddress())) {
- try {
- bindAddress = SocketCreator.getLocalHost().getHostAddress();
- logger.info("RestAgent.getBindAddressForHttpService.localhost: "
- + SocketCreator.getLocalHost().getHostAddress());
- } catch (UnknownHostException e) {
- logger.error("LocalHost could not be found.", e);
- return bindAddress;
- }
- } else {
- bindAddress = this.config.getBindAddress();
- }
- } else {
- bindAddress = this.config.getServerBindAddress();
- }
+ public static String getBindAddressForHttpService(DistributionConfig config) {
+ String bindAddress = config.getHttpServiceBindAddress();
+ if (!StringUtils.isBlank(bindAddress))
+ return bindAddress;
+
+ bindAddress = config.getServerBindAddress();
+ if (!StringUtils.isBlank(bindAddress))
+ return bindAddress;
+
+ bindAddress = config.getBindAddress();
+ if (!StringUtils.isBlank(bindAddress))
+ return bindAddress;
+
+ try {
+ bindAddress = SocketCreator.getLocalHost().getHostAddress();
+ logger.info("RestAgent.getBindAddressForHttpService.localhost: "
+ + SocketCreator.getLocalHost().getHostAddress());
+ } catch (UnknownHostException e) {
+ logger.error("LocalHost could not be found.", e);
}
return bindAddress;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
index 9e23f98..912d8cc 100755
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommands.java
@@ -14,48 +14,33 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.apache.geode.distributed.ConfigurationProperties.BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.CACHE_XML_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_CONFIGURATION_DIR;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_TIME_STATISTICS;
+import static org.apache.geode.distributed.ConfigurationProperties.GROUPS;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOAD_CLUSTER_CONFIGURATION_FROM_DIR;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATOR_WAIT_TIME;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCK_MEMORY;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.MEMCACHED_PROTOCOL;
+import static org.apache.geode.distributed.ConfigurationProperties.OFF_HEAP_MEMORY_SIZE;
+import static org.apache.geode.distributed.ConfigurationProperties.REDIS_BIND_ADDRESS;
+import static org.apache.geode.distributed.ConfigurationProperties.REDIS_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.REDIS_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
+import static org.apache.geode.distributed.ConfigurationProperties.STATISTIC_ARCHIVE_FILE;
+import static org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
import static org.apache.geode.management.internal.cli.i18n.CliStrings.START_SERVER__PASSWORD;
-import java.awt.Desktop;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.EmptyStackException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.Stack;
-import java.util.TreeSet;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.management.Query;
-import javax.management.QueryExp;
-import javax.net.ssl.SSLException;
-import javax.net.ssl.SSLHandshakeException;
-
-import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
-import org.springframework.shell.core.annotation.CliCommand;
-import org.springframework.shell.core.annotation.CliOption;
-
import org.apache.geode.GemFireException;
import org.apache.geode.SystemFailure;
import org.apache.geode.cache.server.CacheServer;
@@ -71,13 +56,13 @@ import org.apache.geode.distributed.internal.tcpserver.TcpClient;
import org.apache.geode.internal.DistributionLocator;
import org.apache.geode.internal.GemFireVersion;
import org.apache.geode.internal.OSProcess;
-import org.apache.geode.internal.net.*;
import org.apache.geode.internal.cache.persistence.PersistentMemberPattern;
import org.apache.geode.internal.i18n.LocalizedStrings;
import org.apache.geode.internal.lang.ClassUtils;
import org.apache.geode.internal.lang.ObjectUtils;
import org.apache.geode.internal.lang.StringUtils;
import org.apache.geode.internal.lang.SystemUtils;
+import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.process.ClusterConfigurationNotAvailableException;
import org.apache.geode.internal.process.ProcessLauncherContext;
import org.apache.geode.internal.process.ProcessStreamReader;
@@ -116,13 +101,50 @@ import org.apache.geode.management.internal.configuration.messages.SharedConfigu
import org.apache.geode.management.internal.configuration.messages.SharedConfigurationStatusResponse;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.security.AuthenticationFailedException;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
+import java.awt.Desktop;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EmptyStackException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.Stack;
+import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.management.Query;
+import javax.management.QueryExp;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
/**
* The LauncherLifecycleCommands class encapsulates all GemFire launcher commands for GemFire tools
* (like starting GemFire Monitor (GFMon) and Visual Statistics Display (VSD)) as well external
* tools (like jconsole).
* <p>
- *
+ *
* @see org.apache.geode.distributed.LocatorLauncher
* @see org.apache.geode.distributed.ServerLauncher
* @see org.apache.geode.management.internal.cli.commands.AbstractCommandsSupport
@@ -1460,11 +1482,10 @@ public class LauncherLifecycleCommands extends AbstractCommandsSupport {
@CliOption(key = CliStrings.START_SERVER__REST_API, unspecifiedDefaultValue = "false",
specifiedDefaultValue = "true",
help = CliStrings.START_SERVER__REST_API__HELP) final Boolean startRestApi,
- @CliOption(key = CliStrings.START_SERVER__HTTP_SERVICE_PORT,
- unspecifiedDefaultValue = ("" + CacheServer.HTTP_DEFAULT_PORT),
+ @CliOption(key = CliStrings.START_SERVER__HTTP_SERVICE_PORT, unspecifiedDefaultValue = "",
help = CliStrings.START_SERVER__HTTP_SERVICE_PORT__HELP) final String httpServicePort,
@CliOption(key = CliStrings.START_SERVER__HTTP_SERVICE_BIND_ADDRESS,
- unspecifiedDefaultValue = CacheServer.HTTP_SERVICE_DEFAULT_BIND_ADDRESS,
+ unspecifiedDefaultValue = "",
help = CliStrings.START_SERVER__HTTP_SERVICE_BIND_ADDRESS__HELP) final String httpServiceBindAddress,
@CliOption(key = CliStrings.START_SERVER__USERNAME, unspecifiedDefaultValue = "",
help = CliStrings.START_SERVER__USERNAME__HELP) final String userName,
[61/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade
Swagger libraries
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/css/screen.css
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/css/screen.css b/geode-web-api/src/main/webapp/docs/css/screen.css
deleted file mode 100644
index 48c983a..0000000
--- a/geode-web-api/src/main/webapp/docs/css/screen.css
+++ /dev/null
@@ -1,1221 +0,0 @@
-/* Original style from softwaremaniacs.org (c) Ivan Sagalaev <Ma...@SoftwareManiacs.Org> */
-.swagger-section pre code {
- display: block;
- padding: 0.5em;
- background: #F0F0F0;
-}
-.swagger-section pre code,
-.swagger-section pre .subst,
-.swagger-section pre .tag .title,
-.swagger-section pre .lisp .title,
-.swagger-section pre .clojure .built_in,
-.swagger-section pre .nginx .title {
- color: black;
-}
-.swagger-section pre .string,
-.swagger-section pre .title,
-.swagger-section pre .constant,
-.swagger-section pre .parent,
-.swagger-section pre .tag .value,
-.swagger-section pre .rules .value,
-.swagger-section pre .rules .value .number,
-.swagger-section pre .preprocessor,
-.swagger-section pre .ruby .symbol,
-.swagger-section pre .ruby .symbol .string,
-.swagger-section pre .aggregate,
-.swagger-section pre .template_tag,
-.swagger-section pre .django .variable,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .addition,
-.swagger-section pre .flow,
-.swagger-section pre .stream,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .apache .cbracket,
-.swagger-section pre .tex .command,
-.swagger-section pre .tex .special,
-.swagger-section pre .erlang_repl .function_or_atom,
-.swagger-section pre .markdown .header {
- color: #800;
-}
-.swagger-section pre .comment,
-.swagger-section pre .annotation,
-.swagger-section pre .template_comment,
-.swagger-section pre .diff .header,
-.swagger-section pre .chunk,
-.swagger-section pre .markdown .blockquote {
- color: #888;
-}
-.swagger-section pre .number,
-.swagger-section pre .date,
-.swagger-section pre .regexp,
-.swagger-section pre .literal,
-.swagger-section pre .smalltalk .symbol,
-.swagger-section pre .smalltalk .char,
-.swagger-section pre .go .constant,
-.swagger-section pre .change,
-.swagger-section pre .markdown .bullet,
-.swagger-section pre .markdown .link_url {
- color: #080;
-}
-.swagger-section pre .label,
-.swagger-section pre .javadoc,
-.swagger-section pre .ruby .string,
-.swagger-section pre .decorator,
-.swagger-section pre .filter .argument,
-.swagger-section pre .localvars,
-.swagger-section pre .array,
-.swagger-section pre .attr_selector,
-.swagger-section pre .important,
-.swagger-section pre .pseudo,
-.swagger-section pre .pi,
-.swagger-section pre .doctype,
-.swagger-section pre .deletion,
-.swagger-section pre .envvar,
-.swagger-section pre .shebang,
-.swagger-section pre .apache .sqbracket,
-.swagger-section pre .nginx .built_in,
-.swagger-section pre .tex .formula,
-.swagger-section pre .erlang_repl .reserved,
-.swagger-section pre .prompt,
-.swagger-section pre .markdown .link_label,
-.swagger-section pre .vhdl .attribute,
-.swagger-section pre .clojure .attribute,
-.swagger-section pre .coffeescript .property {
- color: #8888ff;
-}
-.swagger-section pre .keyword,
-.swagger-section pre .id,
-.swagger-section pre .phpdoc,
-.swagger-section pre .title,
-.swagger-section pre .built_in,
-.swagger-section pre .aggregate,
-.swagger-section pre .css .tag,
-.swagger-section pre .javadoctag,
-.swagger-section pre .phpdoc,
-.swagger-section pre .yardoctag,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .winutils,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .go .typename,
-.swagger-section pre .tex .command,
-.swagger-section pre .markdown .strong,
-.swagger-section pre .request,
-.swagger-section pre .status {
- font-weight: bold;
-}
-.swagger-section pre .markdown .emphasis {
- font-style: italic;
-}
-.swagger-section pre .nginx .built_in {
- font-weight: normal;
-}
-.swagger-section pre .coffeescript .javascript,
-.swagger-section pre .javascript .xml,
-.swagger-section pre .tex .formula,
-.swagger-section pre .xml .javascript,
-.swagger-section pre .xml .vbscript,
-.swagger-section pre .xml .css,
-.swagger-section pre .xml .cdata {
- opacity: 0.5;
-}
-.swagger-section .swagger-ui-wrap {
- line-height: 1;
- font-family: "Droid Sans", sans-serif;
- max-width: 960px;
- margin-left: auto;
- margin-right: auto;
-}
-.swagger-section .swagger-ui-wrap b,
-.swagger-section .swagger-ui-wrap strong {
- font-family: "Droid Sans", sans-serif;
- font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap q,
-.swagger-section .swagger-ui-wrap blockquote {
- quotes: none;
-}
-.swagger-section .swagger-ui-wrap p {
- line-height: 1.4em;
- padding: 0 0 10px;
- color: #333333;
-}
-.swagger-section .swagger-ui-wrap q:before,
-.swagger-section .swagger-ui-wrap q:after,
-.swagger-section .swagger-ui-wrap blockquote:before,
-.swagger-section .swagger-ui-wrap blockquote:after {
- content: none;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu h1,
-.swagger-section .swagger-ui-wrap .heading_with_menu h2,
-.swagger-section .swagger-ui-wrap .heading_with_menu h3,
-.swagger-section .swagger-ui-wrap .heading_with_menu h4,
-.swagger-section .swagger-ui-wrap .heading_with_menu h5,
-.swagger-section .swagger-ui-wrap .heading_with_menu h6 {
- display: block;
- clear: none;
- float: left;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
- width: 60%;
-}
-.swagger-section .swagger-ui-wrap table {
- border-collapse: collapse;
- border-spacing: 0;
-}
-.swagger-section .swagger-ui-wrap table thead tr th {
- padding: 5px;
- font-size: 0.9em;
- color: #666666;
- border-bottom: 1px solid #999999;
-}
-.swagger-section .swagger-ui-wrap table tbody tr:last-child td {
- border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap table tbody tr.offset {
- background-color: #f0f0f0;
-}
-.swagger-section .swagger-ui-wrap table tbody tr td {
- padding: 6px;
- font-size: 0.9em;
- border-bottom: 1px solid #cccccc;
- vertical-align: top;
- line-height: 1.3em;
-}
-.swagger-section .swagger-ui-wrap ol {
- margin: 0px 0 10px;
- padding: 0 0 0 18px;
- list-style-type: decimal;
-}
-.swagger-section .swagger-ui-wrap ol li {
- padding: 5px 0px;
- font-size: 0.9em;
- color: #333333;
-}
-.swagger-section .swagger-ui-wrap ol,
-.swagger-section .swagger-ui-wrap ul {
- list-style: none;
-}
-.swagger-section .swagger-ui-wrap h1 a,
-.swagger-section .swagger-ui-wrap h2 a,
-.swagger-section .swagger-ui-wrap h3 a,
-.swagger-section .swagger-ui-wrap h4 a,
-.swagger-section .swagger-ui-wrap h5 a,
-.swagger-section .swagger-ui-wrap h6 a {
- text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap h1 a:hover,
-.swagger-section .swagger-ui-wrap h2 a:hover,
-.swagger-section .swagger-ui-wrap h3 a:hover,
-.swagger-section .swagger-ui-wrap h4 a:hover,
-.swagger-section .swagger-ui-wrap h5 a:hover,
-.swagger-section .swagger-ui-wrap h6 a:hover {
- text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap h1 span.divider,
-.swagger-section .swagger-ui-wrap h2 span.divider,
-.swagger-section .swagger-ui-wrap h3 span.divider,
-.swagger-section .swagger-ui-wrap h4 span.divider,
-.swagger-section .swagger-ui-wrap h5 span.divider,
-.swagger-section .swagger-ui-wrap h6 span.divider {
- color: #aaaaaa;
-}
-.swagger-section .swagger-ui-wrap a {
- color: #547f00;
-}
-.swagger-section .swagger-ui-wrap a img {
- border: none;
-}
-.swagger-section .swagger-ui-wrap article,
-.swagger-section .swagger-ui-wrap aside,
-.swagger-section .swagger-ui-wrap details,
-.swagger-section .swagger-ui-wrap figcaption,
-.swagger-section .swagger-ui-wrap figure,
-.swagger-section .swagger-ui-wrap footer,
-.swagger-section .swagger-ui-wrap header,
-.swagger-section .swagger-ui-wrap hgroup,
-.swagger-section .swagger-ui-wrap menu,
-.swagger-section .swagger-ui-wrap nav,
-.swagger-section .swagger-ui-wrap section,
-.swagger-section .swagger-ui-wrap summary {
- display: block;
-}
-.swagger-section .swagger-ui-wrap pre {
- font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
- background-color: #fcf6db;
- border: 1px solid #e5e0c6;
- padding: 10px;
-}
-.swagger-section .swagger-ui-wrap pre code {
- line-height: 1.6em;
- background: none;
-}
-.swagger-section .swagger-ui-wrap .content > .content-type > div > label {
- clear: both;
- display: block;
- color: #0F6AB4;
- font-size: 1.1em;
- margin: 0;
- padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap .content pre {
- font-size: 12px;
- margin-top: 5px;
- padding: 5px;
-}
-.swagger-section .swagger-ui-wrap .icon-btn {
- cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .info_title {
- padding-bottom: 10px;
- font-weight: bold;
- font-size: 25px;
-}
-.swagger-section .swagger-ui-wrap p.big,
-.swagger-section .swagger-ui-wrap div.big p {
- font-size: 1em;
- margin-bottom: 10px;
-}
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.string input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.url input,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.text textarea,
-.swagger-section .swagger-ui-wrap form.fullwidth ol li.numeric input {
- width: 500px !important;
-}
-.swagger-section .swagger-ui-wrap .info_license {
- padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_tos {
- padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .message-fail {
- color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap .info_contact {
- padding-bottom: 5px;
-}
-.swagger-section .swagger-ui-wrap .info_description {
- padding-bottom: 10px;
- font-size: 15px;
-}
-.swagger-section .swagger-ui-wrap .markdown ol li,
-.swagger-section .swagger-ui-wrap .markdown ul li {
- padding: 3px 0px;
- line-height: 1.4em;
- color: #333333;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input {
- display: block;
- padding: 4px;
- width: auto;
- clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.string input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.url input.title,
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.numeric input.title {
- font-size: 1.3em;
-}
-.swagger-section .swagger-ui-wrap table.fullwidth {
- width: 100%;
-}
-.swagger-section .swagger-ui-wrap .model-signature {
- font-family: "Droid Sans", sans-serif;
- font-size: 1em;
- line-height: 1.5em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a {
- text-decoration: none;
- color: #AAA;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav a:hover {
- text-decoration: underline;
- color: black;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-nav .selected {
- color: black;
- text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propType {
- color: #5555aa;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre:hover {
- background-color: #ffffdd;
-}
-.swagger-section .swagger-ui-wrap .model-signature pre {
- font-size: .85em;
- line-height: 1.2em;
- overflow: auto;
- max-height: 200px;
- cursor: pointer;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav {
- display: block;
- margin: 0;
- padding: 0;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li:last-child {
- padding-right: 0;
- border-right: none;
-}
-.swagger-section .swagger-ui-wrap .model-signature ul.signature-nav li {
- float: left;
- margin: 0 5px 5px 0;
- padding: 2px 5px 2px 0;
- border-right: 1px solid #ddd;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOpt {
- color: #555;
-}
-.swagger-section .swagger-ui-wrap .model-signature .snippet small {
- font-size: 0.75em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propOptKey {
- font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .strong {
- font-weight: bold;
- color: #000;
- font-size: .9em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description div {
- font-size: 0.9em;
- line-height: 1.5em;
- margin-left: 1em;
-}
-.swagger-section .swagger-ui-wrap .model-signature .description .stronger {
- font-weight: bold;
- color: #000;
-}
-.swagger-section .swagger-ui-wrap .model-signature .propName {
- font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .model-signature .signature-container {
- clear: both;
-}
-.swagger-section .swagger-ui-wrap .body-textarea {
- width: 300px;
- height: 100px;
- border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap .markdown p code,
-.swagger-section .swagger-ui-wrap .markdown li code {
- font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
- background-color: #f0f0f0;
- color: black;
- padding: 1px 3px;
-}
-.swagger-section .swagger-ui-wrap .required {
- font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap input.parameter {
- width: 300px;
- border: 1px solid #aaa;
-}
-.swagger-section .swagger-ui-wrap h1 {
- color: black;
- font-size: 1.5em;
- line-height: 1.3em;
- padding: 10px 0 10px 0;
- font-family: "Droid Sans", sans-serif;
- font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu {
- float: none;
- clear: both;
- overflow: hidden;
- display: block;
-}
-.swagger-section .swagger-ui-wrap .heading_with_menu ul {
- display: block;
- clear: none;
- float: right;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
- margin-top: 10px;
-}
-.swagger-section .swagger-ui-wrap h2 {
- color: black;
- font-size: 1.3em;
- padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap h2 a {
- color: black;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub {
- font-size: 0.7em;
- color: #999999;
- font-style: italic;
-}
-.swagger-section .swagger-ui-wrap h2 span.sub a {
- color: #777777;
-}
-.swagger-section .swagger-ui-wrap span.weak {
- color: #666666;
-}
-.swagger-section .swagger-ui-wrap .message-success {
- color: #89BF04;
-}
-.swagger-section .swagger-ui-wrap caption,
-.swagger-section .swagger-ui-wrap th,
-.swagger-section .swagger-ui-wrap td {
- text-align: left;
- font-weight: normal;
- vertical-align: middle;
-}
-.swagger-section .swagger-ui-wrap .code {
- font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.text textarea {
- font-family: "Droid Sans", sans-serif;
- height: 250px;
- padding: 4px;
- display: block;
- clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.select select {
- display: block;
- clear: both;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean {
- float: none;
- clear: both;
- overflow: hidden;
- display: block;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean label {
- display: block;
- float: left;
- clear: none;
- margin: 0;
- padding: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.boolean input {
- display: block;
- float: left;
- clear: none;
- margin: 0 5px 0 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li.required label {
- color: black;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label {
- display: block;
- clear: both;
- width: auto;
- padding: 0 0 3px;
- color: #666666;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li label abbr {
- padding-left: 3px;
- color: #888888;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.inputs ol li p.inline-hints {
- margin-left: 0;
- font-style: italic;
- font-size: 0.9em;
- margin: 0;
-}
-.swagger-section .swagger-ui-wrap form.formtastic fieldset.buttons {
- margin: 0;
- padding: 0;
-}
-.swagger-section .swagger-ui-wrap span.blank,
-.swagger-section .swagger-ui-wrap span.empty {
- color: #888888;
- font-style: italic;
-}
-.swagger-section .swagger-ui-wrap .markdown h3 {
- color: #547f00;
-}
-.swagger-section .swagger-ui-wrap .markdown h4 {
- color: #666666;
-}
-.swagger-section .swagger-ui-wrap .markdown pre {
- font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
- background-color: #fcf6db;
- border: 1px solid #e5e0c6;
- padding: 10px;
- margin: 0 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown pre code {
- line-height: 1.6em;
-}
-.swagger-section .swagger-ui-wrap div.gist {
- margin: 20px 0 25px 0 !important;
-}
-.swagger-section .swagger-ui-wrap ul#resources {
- font-family: "Droid Sans", sans-serif;
- font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource {
- border-bottom: 1px solid #dddddd;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading h2 a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading h2 a {
- color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:hover div.heading ul.options li a,
-.swagger-section .swagger-ui-wrap ul#resources li.resource.active div.heading ul.options li a {
- color: #555555;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource:last-child {
- border-bottom: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading {
- border: 1px solid transparent;
- float: none;
- clear: both;
- overflow: hidden;
- display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options {
- overflow: hidden;
- padding: 0;
- display: block;
- clear: none;
- float: right;
- margin: 14px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li {
- float: left;
- clear: none;
- margin: 0;
- padding: 2px 10px;
- border-right: 1px solid #dddddd;
- color: #666666;
- font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a {
- color: #aaaaaa;
- text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover {
- text-decoration: underline;
- color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li a.active {
- text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.first {
- padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options li.last {
- padding-right: 0;
- border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading ul.options.first {
- padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 {
- color: #999999;
- padding-left: 0;
- display: block;
- clear: none;
- float: left;
- font-family: "Droid Sans", sans-serif;
- font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a {
- color: #999999;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource div.heading h2 a:hover {
- color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation {
- float: none;
- clear: both;
- overflow: hidden;
- display: block;
- margin: 0 0 10px;
- padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading {
- float: none;
- clear: both;
- overflow: hidden;
- display: block;
- margin: 0;
- padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 {
- display: block;
- clear: none;
- float: left;
- width: auto;
- margin: 0;
- padding: 0;
- line-height: 1.1em;
- color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path {
- padding-left: 10px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a {
- color: black;
- text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.path a:hover {
- text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span.http_method a {
- text-transform: uppercase;
- text-decoration: none;
- color: white;
- display: inline-block;
- width: 50px;
- font-size: 0.7em;
- text-align: center;
- padding: 7px 0 4px;
- -moz-border-radius: 2px;
- -webkit-border-radius: 2px;
- -o-border-radius: 2px;
- -ms-border-radius: 2px;
- -khtml-border-radius: 2px;
- border-radius: 2px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading h3 span {
- margin: 0;
- padding: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options {
- overflow: hidden;
- padding: 0;
- display: block;
- clear: none;
- float: right;
- margin: 6px 10px 0 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li {
- float: left;
- clear: none;
- margin: 0;
- padding: 2px 10px;
- font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li a {
- text-decoration: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.heading ul.options li.access {
- color: black;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content {
- border-top: none;
- padding: 10px;
- -moz-border-radius-bottomleft: 6px;
- -webkit-border-bottom-left-radius: 6px;
- -o-border-bottom-left-radius: 6px;
- -ms-border-bottom-left-radius: 6px;
- -khtml-border-bottom-left-radius: 6px;
- border-bottom-left-radius: 6px;
- -moz-border-radius-bottomright: 6px;
- -webkit-border-bottom-right-radius: 6px;
- -o-border-bottom-right-radius: 6px;
- -ms-border-bottom-right-radius: 6px;
- -khtml-border-bottom-right-radius: 6px;
- border-bottom-right-radius: 6px;
- margin: 0 0 20px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content h4 {
- font-size: 1.1em;
- margin: 0;
- padding: 15px 0 5px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header {
- float: none;
- clear: both;
- overflow: hidden;
- display: block;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header a {
- padding: 4px 0 0 10px;
- display: inline-block;
- font-size: 0.9em;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header img {
- display: block;
- clear: none;
- float: right;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.sandbox_header input.submit {
- display: block;
- clear: none;
- float: left;
- padding: 6px 8px;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content form input[type='text'].error {
- outline: 2px solid black;
- outline-color: #cc0000;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation div.content div.response div.block pre {
- font-family: "Anonymous Pro", "Menlo", "Consolas", "Bitstream Vera Sans Mono", "Courier New", monospace;
- padding: 10px;
- font-size: 0.9em;
- max-height: 400px;
- overflow-y: auto;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading {
- background-color: #f9f2e9;
- border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading h3 span.http_method a {
- background-color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li {
- border-right: 1px solid #dddddd;
- border-right-color: #f0e0ca;
- color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li a {
- color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content {
- background-color: #faf5ee;
- border: 1px solid #f0e0ca;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content h4 {
- color: #c5862b;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content div.sandbox_header a {
- color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading {
- background-color: #fcffcd;
- border: 1px solid black;
- border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading h3 span.http_method a {
- text-transform: uppercase;
- background-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li {
- border-right: 1px solid #dddddd;
- border-right-color: #ffd20f;
- color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li a {
- color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content {
- background-color: #fcffcd;
- border: 1px solid black;
- border-color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content h4 {
- color: #ffd20f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content div.sandbox_header a {
- color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading {
- background-color: #f5e8e8;
- border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading h3 span.http_method a {
- text-transform: uppercase;
- background-color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li {
- border-right: 1px solid #dddddd;
- border-right-color: #e8c6c7;
- color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li a {
- color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
- background-color: #f7eded;
- border: 1px solid #e8c6c7;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content h4 {
- color: #a41e22;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content div.sandbox_header a {
- color: #c8787a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading {
- background-color: #e7f6ec;
- border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading h3 span.http_method a {
- background-color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li {
- border-right: 1px solid #dddddd;
- border-right-color: #c3e8d1;
- color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li a {
- color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content {
- background-color: #ebf7f0;
- border: 1px solid #c3e8d1;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content h4 {
- color: #10a54a;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content div.sandbox_header a {
- color: #6fc992;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading {
- background-color: #FCE9E3;
- border: 1px solid #F5D5C3;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading h3 span.http_method a {
- background-color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li {
- border-right: 1px solid #dddddd;
- border-right-color: #f0cecb;
- color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li a {
- color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content {
- background-color: #faf0ef;
- border: 1px solid #f0cecb;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content h4 {
- color: #D38042;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content div.sandbox_header a {
- color: #dcb67f;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading {
- background-color: #e7f0f7;
- border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading h3 span.http_method a {
- background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li {
- border-right: 1px solid #dddddd;
- border-right-color: #c3d9ec;
- color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li a {
- color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content {
- background-color: #ebf3f9;
- border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content h4 {
- color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content div.sandbox_header a {
- color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading {
- background-color: #e7f0f7;
- border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading h3 span.http_method a {
- background-color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li {
- border-right: 1px solid #dddddd;
- border-right-color: #c3d9ec;
- color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.heading ul.options li a {
- color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content {
- background-color: #ebf3f9;
- border: 1px solid #c3d9ec;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content h4 {
- color: #0f6ab4;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.options div.content div.sandbox_header a {
- color: #6fa5d2;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.content,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.content {
- border-top: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li:last-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.get div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.post div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.head div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.put div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.patch div.heading ul.options li.last,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations li.operation.delete div.heading ul.options li.last {
- padding-right: 0;
- border-right: none;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:hover,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a:active,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li a.active {
- text-decoration: underline;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations ul.options li.first {
- padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations:first-child,
-.swagger-section .swagger-ui-wrap ul#resources li.resource ul.endpoints li.endpoint ul.operations.first {
- padding-left: 0;
-}
-.swagger-section .swagger-ui-wrap p#colophon {
- margin: 0 15px 40px 15px;
- padding: 10px 0;
- font-size: 0.8em;
- border-top: 1px solid #dddddd;
- font-family: "Droid Sans", sans-serif;
- color: #999999;
- font-style: italic;
-}
-.swagger-section .swagger-ui-wrap p#colophon a {
- text-decoration: none;
- color: #547f00;
-}
-.swagger-section .swagger-ui-wrap h3 {
- color: black;
- font-size: 1.1em;
- padding: 10px 0 10px 0;
-}
-.swagger-section .swagger-ui-wrap .markdown ol,
-.swagger-section .swagger-ui-wrap .markdown ul {
- font-family: "Droid Sans", sans-serif;
- margin: 5px 0 10px;
- padding: 0 0 0 18px;
- list-style-type: disc;
-}
-.swagger-section .swagger-ui-wrap form.form_box {
- background-color: #ebf3f9;
- border: 1px solid #c3d9ec;
- padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box label {
- color: #0f6ab4 !important;
-}
-.swagger-section .swagger-ui-wrap form.form_box input[type=submit] {
- display: block;
- padding: 10px;
-}
-.swagger-section .swagger-ui-wrap form.form_box p.weak {
- font-size: 0.8em;
-}
-.swagger-section .swagger-ui-wrap form.form_box p {
- font-size: 0.9em;
- padding: 0 0 15px;
- color: #7e7b6d;
-}
-.swagger-section .swagger-ui-wrap form.form_box p a {
- color: #646257;
-}
-.swagger-section .swagger-ui-wrap form.form_box p strong {
- color: black;
-}
-.swagger-section .title {
- font-style: bold;
-}
-.swagger-section .secondary_form {
- display: none;
-}
-.swagger-section .main_image {
- display: block;
- margin-left: auto;
- margin-right: auto;
-}
-.swagger-section .oauth_body {
- margin-left: 100px;
- margin-right: 100px;
-}
-.swagger-section .oauth_submit {
- text-align: center;
-}
-.swagger-section .api-popup-dialog {
- z-index: 10000;
- position: absolute;
- width: 500px;
- background: #FFF;
- padding: 20px;
- border: 1px solid #ccc;
- border-radius: 5px;
- display: none;
- font-size: 13px;
- color: #777;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
- font-size: 24px;
- padding: 10px 0;
-}
-.swagger-section .api-popup-dialog .api-popup-title {
- font-size: 24px;
- padding: 10px 0;
-}
-.swagger-section .api-popup-dialog p.error-msg {
- padding-left: 5px;
- padding-bottom: 5px;
-}
-.swagger-section .api-popup-dialog button.api-popup-authbtn {
- height: 30px;
-}
-.swagger-section .api-popup-dialog button.api-popup-cancel {
- height: 30px;
-}
-.swagger-section .api-popup-scopes {
- padding: 10px 20px;
-}
-.swagger-section .api-popup-scopes li {
- padding: 5px 0;
- line-height: 20px;
-}
-.swagger-section .api-popup-scopes .api-scope-desc {
- padding-left: 20px;
- font-style: italic;
-}
-.swagger-section .api-popup-scopes li input {
- position: relative;
- top: 2px;
-}
-.swagger-section .api-popup-actions {
- padding-top: 10px;
-}
-.swagger-section .access {
- float: right;
-}
-.swagger-section .auth {
- float: right;
-}
-.swagger-section #api_information_panel {
- position: absolute;
- background: #FFF;
- border: 1px solid #ccc;
- border-radius: 5px;
- display: none;
- font-size: 13px;
- max-width: 300px;
- line-height: 30px;
- color: black;
- padding: 5px;
-}
-.swagger-section #api_information_panel p .api-msg-enabled {
- color: green;
-}
-.swagger-section #api_information_panel p .api-msg-disabled {
- color: red;
-}
-.swagger-section .api-ic {
- height: 18px;
- vertical-align: middle;
- display: inline-block;
- background: url(../images/explorer_icons.png) no-repeat;
-}
-.swagger-section .ic-info {
- background-position: 0 0;
- width: 18px;
- margin-top: -7px;
- margin-left: 4px;
-}
-.swagger-section .ic-warning {
- background-position: -60px 0;
- width: 18px;
- margin-top: -7px;
- margin-left: 4px;
-}
-.swagger-section .ic-error {
- background-position: -30px 0;
- width: 18px;
- margin-top: -7px;
- margin-left: 4px;
-}
-.swagger-section .ic-off {
- background-position: -90px 0;
- width: 58px;
- margin-top: -4px;
- cursor: pointer;
-}
-.swagger-section .ic-on {
- background-position: -160px 0;
- width: 58px;
- margin-top: -4px;
- cursor: pointer;
-}
-.swagger-section #header {
- background-color: #01786e;
- padding: 14px;
-}
-.swagger-section #header a#logo {
- font-size: 1.5em;
- font-weight: bold;
- text-decoration: none;
- background: transparent url(../images/logo_small.png) no-repeat left center;
- padding: 20px 0 20px 40px;
- color: white;
-}
-.swagger-section #header form#api_selector {
- display: block;
- clear: none;
- float: right;
-}
-.swagger-section #header form#api_selector .input {
- display: block;
- clear: none;
- float: left;
- margin: 0 10px 0 0;
-}
-.swagger-section #header form#api_selector .input input#input_apiKey {
- width: 200px;
-}
-.swagger-section #header form#api_selector .input input#input_baseUrl {
- width: 400px;
-}
-.swagger-section #header form#api_selector .input a#explore {
- display: block;
- text-decoration: none;
- font-weight: bold;
- padding: 6px 8px;
- font-size: 0.9em;
- color: white;
- background-color: #547f00;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- -o-border-radius: 4px;
- -ms-border-radius: 4px;
- -khtml-border-radius: 4px;
- border-radius: 4px;
-}
-.swagger-section #header form#api_selector .input a#explore:hover {
- background-color: #547f00;
-}
-.swagger-section #header form#api_selector .input input {
- font-size: 0.9em;
- padding: 3px;
- margin: 0;
-}
-.swagger-section #content_message {
- margin: 10px 15px;
- font-style: italic;
- color: #999999;
-}
-.swagger-section #message-bar {
- min-height: 30px;
- text-align: center;
- padding-top: 10px;
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/images/explorer_icons.png
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/images/explorer_icons.png b/geode-web-api/src/main/webapp/docs/images/explorer_icons.png
deleted file mode 100755
index ed9d2ff..0000000
Binary files a/geode-web-api/src/main/webapp/docs/images/explorer_icons.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/images/logo_small.png
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/images/logo_small.png b/geode-web-api/src/main/webapp/docs/images/logo_small.png
deleted file mode 100755
index 5496a65..0000000
Binary files a/geode-web-api/src/main/webapp/docs/images/logo_small.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/images/pet_store_api.png
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/images/pet_store_api.png b/geode-web-api/src/main/webapp/docs/images/pet_store_api.png
deleted file mode 100755
index f9f9cd4..0000000
Binary files a/geode-web-api/src/main/webapp/docs/images/pet_store_api.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/images/throbber.gif
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/images/throbber.gif b/geode-web-api/src/main/webapp/docs/images/throbber.gif
deleted file mode 100755
index 0639388..0000000
Binary files a/geode-web-api/src/main/webapp/docs/images/throbber.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/images/wordnik_api.png
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/images/wordnik_api.png b/geode-web-api/src/main/webapp/docs/images/wordnik_api.png
deleted file mode 100755
index dca4f14..0000000
Binary files a/geode-web-api/src/main/webapp/docs/images/wordnik_api.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/index.html
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/index.html b/geode-web-api/src/main/webapp/docs/index.html
index 7dfc3a5..021fbc2 100644
--- a/geode-web-api/src/main/webapp/docs/index.html
+++ b/geode-web-api/src/main/webapp/docs/index.html
@@ -1,81 +1 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>Swagger UI</title>
- <link href='https://fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>
- <link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
- <link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
- <link href='css/screen.css' media='print' rel='stylesheet' type='text/css'/>
- <script type="text/javascript" src="lib/shred.bundle.js"></script>
- <script src='lib/jquery-1.8.0.min.js' type='text/javascript'></script>
- <script src='lib/jquery.slideto.min.js' type='text/javascript'></script>
- <script src='lib/jquery.wiggle.min.js' type='text/javascript'></script>
- <script src='lib/jquery.ba-bbq.min.js' type='text/javascript'></script>
- <script src='lib/handlebars-1.0.0.js' type='text/javascript'></script>
- <script src='lib/underscore-min.js' type='text/javascript'></script>
- <script src='lib/backbone-min.js' type='text/javascript'></script>
- <script src='lib/swagger.js' type='text/javascript'></script>
- <script src='swagger-ui.js' type='text/javascript'></script>
- <script src='lib/highlight.7.3.pack.js' type='text/javascript'></script>
-
- <!-- enabling this will enable oauth2 implicit scope support -->
- <script src='lib/swagger-oauth.js' type='text/javascript'></script>
-
- <script type="text/javascript">
- $(function () {
- var apiUrl = window.location.protocol + "//" + window.location.host;
- //+ ":" + window.location.port;
- if (window.location.pathname.indexOf('/docs') > 0) {
- apiUrl += window.location.pathname.substring(0, window.location.pathname.indexOf('/docs'))
- }
- apiUrl += "/api-docs";
- window.swaggerUi = new SwaggerUi({
- url: apiUrl,
- dom_id: "swagger-ui-container",
- supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
- onComplete: function(swaggerApi, swaggerUi){
- log("Loaded SwaggerUI");
-
- if(typeof initOAuth == "function") {
- /*
- initOAuth({
- clientId: "your-client-id",
- realm: "your-realms",
- appName: "your-app-name"
- });
- */
- }
- $('pre code').each(function(i, e) {
- hljs.highlightBlock(e)
- });
- },
- onFailure: function(data) {
- log("Unable to Load SwaggerUI");
- },
- docExpansion: "none"
- });
-
- $('#input_apiKey').change(function() {
- var key = $('#input_apiKey')[0].value;
- log("key: " + key);
- if(key && key.trim() != "") {
- log("added key " + key);
- window.authorizations.add("key", new ApiKeyAuthorization("api_key", key, "query"));
- }
- })
- window.swaggerUi.load();
- });
- </script>
-</head>
-
-<body class="swagger-section">
-<div id='header'>
- <div class="swagger-ui-wrap">
- </div>
-</div>
-
-<div id="message-bar" class="swagger-ui-wrap"> </div>
-<div id="swagger-ui-container" class="swagger-ui-wrap"></div>
-</body>
-</html>
+<meta http-equiv="refresh" content="0; URL='/geode/swagger-ui.html'"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/backbone-min.js
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/docs/lib/backbone-min.js b/geode-web-api/src/main/webapp/docs/lib/backbone-min.js
deleted file mode 100644
index a22a0f0..0000000
--- a/geode-web-api/src/main/webapp/docs/lib/backbone-min.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// Backbone.js 0.9.2
-
-// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
-// Backbone may be freely distributed under the MIT license.
-// For all details and documentation:
-// http://backbonejs.org
-(function(){var l=this,y=l.Backbone,z=Array.prototype.slice,A=Array.prototype.splice,g;g="undefined"!==typeof exports?exports:l.Backbone={};g.VERSION="0.9.2";var f=l._;!f&&"undefined"!==typeof require&&(f=require("underscore"));var i=l.jQuery||l.Zepto||l.ender;g.setDomLibrary=function(a){i=a};g.noConflict=function(){l.Backbone=y;return this};g.emulateHTTP=!1;g.emulateJSON=!1;var p=/\s+/,k=g.Events={on:function(a,b,c){var d,e,f,g,j;if(!b)return this;a=a.split(p);for(d=this._callbacks||(this._callbacks=
-{});e=a.shift();)f=(j=d[e])?j.tail:{},f.next=g={},f.context=c,f.callback=b,d[e]={tail:g,next:j?j.next:f};return this},off:function(a,b,c){var d,e,h,g,j,q;if(e=this._callbacks){if(!a&&!b&&!c)return delete this._callbacks,this;for(a=a?a.split(p):f.keys(e);d=a.shift();)if(h=e[d],delete e[d],h&&(b||c))for(g=h.tail;(h=h.next)!==g;)if(j=h.callback,q=h.context,b&&j!==b||c&&q!==c)this.on(d,j,q);return this}},trigger:function(a){var b,c,d,e,f,g;if(!(d=this._callbacks))return this;f=d.all;a=a.split(p);for(g=
-z.call(arguments,1);b=a.shift();){if(c=d[b])for(e=c.tail;(c=c.next)!==e;)c.callback.apply(c.context||this,g);if(c=f){e=c.tail;for(b=[b].concat(g);(c=c.next)!==e;)c.callback.apply(c.context||this,b)}}return this}};k.bind=k.on;k.unbind=k.off;var o=g.Model=function(a,b){var c;a||(a={});b&&b.parse&&(a=this.parse(a));if(c=n(this,"defaults"))a=f.extend({},c,a);b&&b.collection&&(this.collection=b.collection);this.attributes={};this._escapedAttributes={};this.cid=f.uniqueId("c");this.changed={};this._silent=
-{};this._pending={};this.set(a,{silent:!0});this.changed={};this._silent={};this._pending={};this._previousAttributes=f.clone(this.attributes);this.initialize.apply(this,arguments)};f.extend(o.prototype,k,{changed:null,_silent:null,_pending:null,idAttribute:"id",initialize:function(){},toJSON:function(){return f.clone(this.attributes)},get:function(a){return this.attributes[a]},escape:function(a){var b;if(b=this._escapedAttributes[a])return b;b=this.get(a);return this._escapedAttributes[a]=f.escape(null==
-b?"":""+b)},has:function(a){return null!=this.get(a)},set:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c||(c={});if(!d)return this;d instanceof o&&(d=d.attributes);if(c.unset)for(e in d)d[e]=void 0;if(!this._validate(d,c))return!1;this.idAttribute in d&&(this.id=d[this.idAttribute]);var b=c.changes={},h=this.attributes,g=this._escapedAttributes,j=this._previousAttributes||{};for(e in d){a=d[e];if(!f.isEqual(h[e],a)||c.unset&&f.has(h,e))delete g[e],(c.silent?this._silent:
-b)[e]=!0;c.unset?delete h[e]:h[e]=a;!f.isEqual(j[e],a)||f.has(h,e)!=f.has(j,e)?(this.changed[e]=a,c.silent||(this._pending[e]=!0)):(delete this.changed[e],delete this._pending[e])}c.silent||this.change(c);return this},unset:function(a,b){(b||(b={})).unset=!0;return this.set(a,null,b)},clear:function(a){(a||(a={})).unset=!0;return this.set(f.clone(this.attributes),a)},fetch:function(a){var a=a?f.clone(a):{},b=this,c=a.success;a.success=function(d,e,f){if(!b.set(b.parse(d,f),a))return!1;c&&c(b,d)};
-a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},save:function(a,b,c){var d,e;f.isObject(a)||null==a?(d=a,c=b):(d={},d[a]=b);c=c?f.clone(c):{};if(c.wait){if(!this._validate(d,c))return!1;e=f.clone(this.attributes)}a=f.extend({},c,{silent:!0});if(d&&!this.set(d,c.wait?a:c))return!1;var h=this,i=c.success;c.success=function(a,b,e){b=h.parse(a,e);if(c.wait){delete c.wait;b=f.extend(d||{},b)}if(!h.set(b,c))return false;i?i(h,a):h.trigger("sync",h,a,c)};c.error=g.wrapError(c.error,
-h,c);b=this.isNew()?"create":"update";b=(this.sync||g.sync).call(this,b,this,c);c.wait&&this.set(e,a);return b},destroy:function(a){var a=a?f.clone(a):{},b=this,c=a.success,d=function(){b.trigger("destroy",b,b.collection,a)};if(this.isNew())return d(),!1;a.success=function(e){a.wait&&d();c?c(b,e):b.trigger("sync",b,e,a)};a.error=g.wrapError(a.error,b,a);var e=(this.sync||g.sync).call(this,"delete",this,a);a.wait||d();return e},url:function(){var a=n(this,"urlRoot")||n(this.collection,"url")||t();
-return this.isNew()?a:a+("/"==a.charAt(a.length-1)?"":"/")+encodeURIComponent(this.id)},parse:function(a){return a},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return null==this.id},change:function(a){a||(a={});var b=this._changing;this._changing=!0;for(var c in this._silent)this._pending[c]=!0;var d=f.extend({},a.changes,this._silent);this._silent={};for(c in d)this.trigger("change:"+c,this,this.get(c),a);if(b)return this;for(;!f.isEmpty(this._pending);){this._pending=
-{};this.trigger("change",this,a);for(c in this.changed)!this._pending[c]&&!this._silent[c]&&delete this.changed[c];this._previousAttributes=f.clone(this.attributes)}this._changing=!1;return this},hasChanged:function(a){return!arguments.length?!f.isEmpty(this.changed):f.has(this.changed,a)},changedAttributes:function(a){if(!a)return this.hasChanged()?f.clone(this.changed):!1;var b,c=!1,d=this._previousAttributes,e;for(e in a)if(!f.isEqual(d[e],b=a[e]))(c||(c={}))[e]=b;return c},previous:function(a){return!arguments.length||
-!this._previousAttributes?null:this._previousAttributes[a]},previousAttributes:function(){return f.clone(this._previousAttributes)},isValid:function(){return!this.validate(this.attributes)},_validate:function(a,b){if(b.silent||!this.validate)return!0;var a=f.extend({},this.attributes,a),c=this.validate(a,b);if(!c)return!0;b&&b.error?b.error(this,c,b):this.trigger("error",this,c,b);return!1}});var r=g.Collection=function(a,b){b||(b={});b.model&&(this.model=b.model);b.comparator&&(this.comparator=b.comparator);
-this._reset();this.initialize.apply(this,arguments);a&&this.reset(a,{silent:!0,parse:b.parse})};f.extend(r.prototype,k,{model:o,initialize:function(){},toJSON:function(a){return this.map(function(b){return b.toJSON(a)})},add:function(a,b){var c,d,e,g,i,j={},k={},l=[];b||(b={});a=f.isArray(a)?a.slice():[a];c=0;for(d=a.length;c<d;c++){if(!(e=a[c]=this._prepareModel(a[c],b)))throw Error("Can't add an invalid model to a collection");g=e.cid;i=e.id;j[g]||this._byCid[g]||null!=i&&(k[i]||this._byId[i])?
-l.push(c):j[g]=k[i]=e}for(c=l.length;c--;)a.splice(l[c],1);c=0;for(d=a.length;c<d;c++)(e=a[c]).on("all",this._onModelEvent,this),this._byCid[e.cid]=e,null!=e.id&&(this._byId[e.id]=e);this.length+=d;A.apply(this.models,[null!=b.at?b.at:this.models.length,0].concat(a));this.comparator&&this.sort({silent:!0});if(b.silent)return this;c=0;for(d=this.models.length;c<d;c++)if(j[(e=this.models[c]).cid])b.index=c,e.trigger("add",e,this,b);return this},remove:function(a,b){var c,d,e,g;b||(b={});a=f.isArray(a)?
-a.slice():[a];c=0;for(d=a.length;c<d;c++)if(g=this.getByCid(a[c])||this.get(a[c]))delete this._byId[g.id],delete this._byCid[g.cid],e=this.indexOf(g),this.models.splice(e,1),this.length--,b.silent||(b.index=e,g.trigger("remove",g,this,b)),this._removeReference(g);return this},push:function(a,b){a=this._prepareModel(a,b);this.add(a,b);return a},pop:function(a){var b=this.at(this.length-1);this.remove(b,a);return b},unshift:function(a,b){a=this._prepareModel(a,b);this.add(a,f.extend({at:0},b));return a},
-shift:function(a){var b=this.at(0);this.remove(b,a);return b},get:function(a){return null==a?void 0:this._byId[null!=a.id?a.id:a]},getByCid:function(a){return a&&this._byCid[a.cid||a]},at:function(a){return this.models[a]},where:function(a){return f.isEmpty(a)?[]:this.filter(function(b){for(var c in a)if(a[c]!==b.get(c))return!1;return!0})},sort:function(a){a||(a={});if(!this.comparator)throw Error("Cannot sort a set without a comparator");var b=f.bind(this.comparator,this);1==this.comparator.length?
-this.models=this.sortBy(b):this.models.sort(b);a.silent||this.trigger("reset",this,a);return this},pluck:function(a){return f.map(this.models,function(b){return b.get(a)})},reset:function(a,b){a||(a=[]);b||(b={});for(var c=0,d=this.models.length;c<d;c++)this._removeReference(this.models[c]);this._reset();this.add(a,f.extend({silent:!0},b));b.silent||this.trigger("reset",this,b);return this},fetch:function(a){a=a?f.clone(a):{};void 0===a.parse&&(a.parse=!0);var b=this,c=a.success;a.success=function(d,
-e,f){b[a.add?"add":"reset"](b.parse(d,f),a);c&&c(b,d)};a.error=g.wrapError(a.error,b,a);return(this.sync||g.sync).call(this,"read",this,a)},create:function(a,b){var c=this,b=b?f.clone(b):{},a=this._prepareModel(a,b);if(!a)return!1;b.wait||c.add(a,b);var d=b.success;b.success=function(e,f){b.wait&&c.add(e,b);d?d(e,f):e.trigger("sync",a,f,b)};a.save(null,b);return a},parse:function(a){return a},chain:function(){return f(this.models).chain()},_reset:function(){this.length=0;this.models=[];this._byId=
-{};this._byCid={}},_prepareModel:function(a,b){b||(b={});a instanceof o?a.collection||(a.collection=this):(b.collection=this,a=new this.model(a,b),a._validate(a.attributes,b)||(a=!1));return a},_removeReference:function(a){this==a.collection&&delete a.collection;a.off("all",this._onModelEvent,this)},_onModelEvent:function(a,b,c,d){("add"==a||"remove"==a)&&c!=this||("destroy"==a&&this.remove(b,d),b&&a==="change:"+b.idAttribute&&(delete this._byId[b.previous(b.idAttribute)],this._byId[b.id]=b),this.trigger.apply(this,
-arguments))}});f.each("forEach,each,map,reduce,reduceRight,find,detect,filter,select,reject,every,all,some,any,include,contains,invoke,max,min,sortBy,sortedIndex,toArray,size,first,initial,rest,last,without,indexOf,shuffle,lastIndexOf,isEmpty,groupBy".split(","),function(a){r.prototype[a]=function(){return f[a].apply(f,[this.models].concat(f.toArray(arguments)))}});var u=g.Router=function(a){a||(a={});a.routes&&(this.routes=a.routes);this._bindRoutes();this.initialize.apply(this,arguments)},B=/:\w+/g,
-C=/\*\w+/g,D=/[-[\]{}()+?.,\\^$|#\s]/g;f.extend(u.prototype,k,{initialize:function(){},route:function(a,b,c){g.history||(g.history=new m);f.isRegExp(a)||(a=this._routeToRegExp(a));c||(c=this[b]);g.history.route(a,f.bind(function(d){d=this._extractParameters(a,d);c&&c.apply(this,d);this.trigger.apply(this,["route:"+b].concat(d));g.history.trigger("route",this,b,d)},this));return this},navigate:function(a,b){g.history.navigate(a,b)},_bindRoutes:function(){if(this.routes){var a=[],b;for(b in this.routes)a.unshift([b,
-this.routes[b]]);b=0;for(var c=a.length;b<c;b++)this.route(a[b][0],a[b][1],this[a[b][1]])}},_routeToRegExp:function(a){a=a.replace(D,"\\$&").replace(B,"([^/]+)").replace(C,"(.*?)");return RegExp("^"+a+"$")},_extractParameters:function(a,b){return a.exec(b).slice(1)}});var m=g.History=function(){this.handlers=[];f.bindAll(this,"checkUrl")},s=/^[#\/]/,E=/msie [\w.]+/;m.started=!1;f.extend(m.prototype,k,{interval:50,getHash:function(a){return(a=(a?a.location:window.location).href.match(/#(.*)$/))?a[1]:
-""},getFragment:function(a,b){if(null==a)if(this._hasPushState||b){var a=window.location.pathname,c=window.location.search;c&&(a+=c)}else a=this.getHash();a.indexOf(this.options.root)||(a=a.substr(this.options.root.length));return a.replace(s,"")},start:function(a){if(m.started)throw Error("Backbone.history has already been started");m.started=!0;this.options=f.extend({},{root:"/"},this.options,a);this._wantsHashChange=!1!==this.options.hashChange;this._wantsPushState=!!this.options.pushState;this._hasPushState=
-!(!this.options.pushState||!window.history||!window.history.pushState);var a=this.getFragment(),b=document.documentMode;if(b=E.exec(navigator.userAgent.toLowerCase())&&(!b||7>=b))this.iframe=i('<iframe src="javascript:0" tabindex="-1" />').hide().appendTo("body")[0].contentWindow,this.navigate(a);this._hasPushState?i(window).bind("popstate",this.checkUrl):this._wantsHashChange&&"onhashchange"in window&&!b?i(window).bind("hashchange",this.checkUrl):this._wantsHashChange&&(this._checkUrlInterval=setInterval(this.checkUrl,
-this.interval));this.fragment=a;a=window.location;b=a.pathname==this.options.root;if(this._wantsHashChange&&this._wantsPushState&&!this._hasPushState&&!b)return this.fragment=this.getFragment(null,!0),window.location.replace(this.options.root+"#"+this.fragment),!0;this._wantsPushState&&this._hasPushState&&b&&a.hash&&(this.fragment=this.getHash().replace(s,""),window.history.replaceState({},document.title,a.protocol+"//"+a.host+this.options.root+this.fragment));if(!this.options.silent)return this.loadUrl()},
-stop:function(){i(window).unbind("popstate",this.checkUrl).unbind("hashchange",this.checkUrl);clearInterval(this._checkUrlInterval);m.started=!1},route:function(a,b){this.handlers.unshift({route:a,callback:b})},checkUrl:function(){var a=this.getFragment();a==this.fragment&&this.iframe&&(a=this.getFragment(this.getHash(this.iframe)));if(a==this.fragment)return!1;this.iframe&&this.navigate(a);this.loadUrl()||this.loadUrl(this.getHash())},loadUrl:function(a){var b=this.fragment=this.getFragment(a);return f.any(this.handlers,
-function(a){if(a.route.test(b))return a.callback(b),!0})},navigate:function(a,b){if(!m.started)return!1;if(!b||!0===b)b={trigger:b};var c=(a||"").replace(s,"");this.fragment!=c&&(this._hasPushState?(0!=c.indexOf(this.options.root)&&(c=this.options.root+c),this.fragment=c,window.history[b.replace?"replaceState":"pushState"]({},document.title,c)):this._wantsHashChange?(this.fragment=c,this._updateHash(window.location,c,b.replace),this.iframe&&c!=this.getFragment(this.getHash(this.iframe))&&(b.replace||
-this.iframe.document.open().close(),this._updateHash(this.iframe.location,c,b.replace))):window.location.assign(this.options.root+a),b.trigger&&this.loadUrl(a))},_updateHash:function(a,b,c){c?a.replace(a.toString().replace(/(javascript:|#).*$/,"")+"#"+b):a.hash=b}});var v=g.View=function(a){this.cid=f.uniqueId("view");this._configure(a||{});this._ensureElement();this.initialize.apply(this,arguments);this.delegateEvents()},F=/^(\S+)\s*(.*)$/,w="model,collection,el,id,attributes,className,tagName".split(",");
-f.extend(v.prototype,k,{tagName:"div",$:function(a){return this.$el.find(a)},initialize:function(){},render:function(){return this},remove:function(){this.$el.remove();return this},make:function(a,b,c){a=document.createElement(a);b&&i(a).attr(b);c&&i(a).html(c);return a},setElement:function(a,b){this.$el&&this.undelegateEvents();this.$el=a instanceof i?a:i(a);this.el=this.$el[0];!1!==b&&this.delegateEvents();return this},delegateEvents:function(a){if(a||(a=n(this,"events"))){this.undelegateEvents();
-for(var b in a){var c=a[b];f.isFunction(c)||(c=this[a[b]]);if(!c)throw Error('Method "'+a[b]+'" does not exist');var d=b.match(F),e=d[1],d=d[2],c=f.bind(c,this),e=e+(".delegateEvents"+this.cid);""===d?this.$el.bind(e,c):this.$el.delegate(d,e,c)}}},undelegateEvents:function(){this.$el.unbind(".delegateEvents"+this.cid)},_configure:function(a){this.options&&(a=f.extend({},this.options,a));for(var b=0,c=w.length;b<c;b++){var d=w[b];a[d]&&(this[d]=a[d])}this.options=a},_ensureElement:function(){if(this.el)this.setElement(this.el,
-!1);else{var a=n(this,"attributes")||{};this.id&&(a.id=this.id);this.className&&(a["class"]=this.className);this.setElement(this.make(this.tagName,a),!1)}}});o.extend=r.extend=u.extend=v.extend=function(a,b){var c=G(this,a,b);c.extend=this.extend;return c};var H={create:"POST",update:"PUT","delete":"DELETE",read:"GET"};g.sync=function(a,b,c){var d=H[a];c||(c={});var e={type:d,dataType:"json"};c.url||(e.url=n(b,"url")||t());if(!c.data&&b&&("create"==a||"update"==a))e.contentType="application/json",
-e.data=JSON.stringify(b.toJSON());g.emulateJSON&&(e.contentType="application/x-www-form-urlencoded",e.data=e.data?{model:e.data}:{});if(g.emulateHTTP&&("PUT"===d||"DELETE"===d))g.emulateJSON&&(e.data._method=d),e.type="POST",e.beforeSend=function(a){a.setRequestHeader("X-HTTP-Method-Override",d)};"GET"!==e.type&&!g.emulateJSON&&(e.processData=!1);return i.ajax(f.extend(e,c))};g.wrapError=function(a,b,c){return function(d,e){e=d===b?e:d;a?a(b,e,c):b.trigger("error",b,e,c)}};var x=function(){},G=function(a,
-b,c){var d;d=b&&b.hasOwnProperty("constructor")?b.constructor:function(){a.apply(this,arguments)};f.extend(d,a);x.prototype=a.prototype;d.prototype=new x;b&&f.extend(d.prototype,b);c&&f.extend(d,c);d.prototype.constructor=d;d.__super__=a.prototype;return d},n=function(a,b){return!a||!a[b]?null:f.isFunction(a[b])?a[b]():a[b]},t=function(){throw Error('A "url" property or function must be specified');}}).call(this);
[19/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
index 6c76f69..951b364 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -30,9 +28,8 @@ import org.apache.geode.internal.statistics.platform.ProcessStats;
import java.util.*;
/**
- * Contains the logic for evaluating the health of a GemFire
- * distributed system member according to the thresholds provided in a
- * {@link MemberHealthConfig}.
+ * Contains the logic for evaluating the health of a GemFire distributed system member according to
+ * the thresholds provided in a {@link MemberHealthConfig}.
*
* @see VMStats
* @see ProcessStats
@@ -52,8 +49,8 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
/** The description of the member being evaluated */
private String description;
-// /** Statistics about this VM (may be null) */
-// private VMStatsContract vmStats;
+ // /** Statistics about this VM (may be null) */
+ // private VMStatsContract vmStats;
/** Statistics about this process (may be null) */
private ProcessStats processStats;
@@ -64,13 +61,12 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
/** The previous value of the reply timeouts stat */
private long prevReplyTimeouts;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>MemberHealthEvaluator</code>
*/
- MemberHealthEvaluator(GemFireHealthConfig config,
- DM dm) {
+ MemberHealthEvaluator(GemFireHealthConfig config, DM dm) {
super(config, dm);
this.config = config;
@@ -79,12 +75,12 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
GemFireStatSampler sampler = system.getStatSampler();
if (sampler != null) {
// Sampling is enabled
-// this.vmStats = sampler.getVMStats();
+ // this.vmStats = sampler.getVMStats();
this.processStats = sampler.getProcessStats();
}
this.dmStats = dm.getStats();
-
+
StringBuffer sb = new StringBuffer();
sb.append("Application VM member ");
sb.append(dm.getId());
@@ -96,7 +92,7 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
this.description = sb.toString();
}
- //////////////////// Instance Methods ////////////////////
+ //////////////////// Instance Methods ////////////////////
@Override
protected String getDescription() {
@@ -104,10 +100,9 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
}
/**
- * Checks to make sure that the {@linkplain
- * ProcessStats#getProcessSize VM's process size} is less than the
- * {@linkplain MemberHealthConfig#getMaxVMProcessSize threshold}.
- * If not, the status is "okay" health.
+ * Checks to make sure that the {@linkplain ProcessStats#getProcessSize VM's process size} is less
+ * than the {@linkplain MemberHealthConfig#getMaxVMProcessSize threshold}. If not, the status is
+ * "okay" health.
*/
void checkVMProcessSize(List status) {
// There is no need to check isFirstEvaluation()
@@ -118,32 +113,35 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
long vmSize = this.processStats.getProcessSize();
long threshold = this.config.getMaxVMProcessSize();
if (vmSize > threshold) {
- String s = LocalizedStrings.MemberHealthEvaluator_THE_SIZE_OF_THIS_VM_0_MEGABYTES_EXCEEDS_THE_THRESHOLD_1_MEGABYTES.toLocalizedString(new Object[] {Long.valueOf(vmSize), Long.valueOf(threshold)});
+ String s =
+ LocalizedStrings.MemberHealthEvaluator_THE_SIZE_OF_THIS_VM_0_MEGABYTES_EXCEEDS_THE_THRESHOLD_1_MEGABYTES
+ .toLocalizedString(new Object[] {Long.valueOf(vmSize), Long.valueOf(threshold)});
status.add(okayHealth(s));
}
}
/**
* Checks to make sure that the size of the distribution manager's
- * {@linkplain DMStats#getOverflowQueueSize() overflow} message
- * queue does not exceed the {@linkplain
- * MemberHealthConfig#getMaxMessageQueueSize threshold}. If not,
- * the status is "okay" health.
+ * {@linkplain DMStats#getOverflowQueueSize() overflow} message queue does not exceed the
+ * {@linkplain MemberHealthConfig#getMaxMessageQueueSize threshold}. If not, the status is "okay"
+ * health.
*/
void checkMessageQueueSize(List status) {
long threshold = this.config.getMaxMessageQueueSize();
long overflowSize = this.dmStats.getOverflowQueueSize();
if (overflowSize > threshold) {
- String s = LocalizedStrings.MemberHealthEvaluator_THE_SIZE_OF_THE_OVERFLOW_QUEUE_0_EXCEEDS_THE_THRESHOLD_1.toLocalizedString(new Object[] { Long.valueOf(overflowSize), Long.valueOf(threshold)});
+ String s =
+ LocalizedStrings.MemberHealthEvaluator_THE_SIZE_OF_THE_OVERFLOW_QUEUE_0_EXCEEDS_THE_THRESHOLD_1
+ .toLocalizedString(
+ new Object[] {Long.valueOf(overflowSize), Long.valueOf(threshold)});
status.add(okayHealth(s));
}
}
/**
- * Checks to make sure that the number of {@linkplain
- * DMStats#getReplyTimeouts reply timeouts} does not exceed the
- * {@linkplain MemberHealthConfig#getMaxReplyTimeouts threshold}.
- * If not, the status is "okay" health.
+ * Checks to make sure that the number of {@linkplain DMStats#getReplyTimeouts reply timeouts}
+ * does not exceed the {@linkplain MemberHealthConfig#getMaxReplyTimeouts threshold}. If not, the
+ * status is "okay" health.
*/
void checkReplyTimeouts(List status) {
if (isFirstEvaluation()) {
@@ -151,10 +149,12 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
}
long threshold = this.config.getMaxReplyTimeouts();
- long deltaReplyTimeouts =
- this.dmStats.getReplyTimeouts() - prevReplyTimeouts;
+ long deltaReplyTimeouts = this.dmStats.getReplyTimeouts() - prevReplyTimeouts;
if (deltaReplyTimeouts > threshold) {
- String s = LocalizedStrings.MemberHealthEvaluator_THE_NUMBER_OF_MESSAGE_REPLY_TIMEOUTS_0_EXCEEDS_THE_THRESHOLD_1.toLocalizedString(new Object[] { Long.valueOf(deltaReplyTimeouts), Long.valueOf(threshold)});
+ String s =
+ LocalizedStrings.MemberHealthEvaluator_THE_NUMBER_OF_MESSAGE_REPLY_TIMEOUTS_0_EXCEEDS_THE_THRESHOLD_1
+ .toLocalizedString(
+ new Object[] {Long.valueOf(deltaReplyTimeouts), Long.valueOf(threshold)});
status.add(okayHealth(s));
}
}
@@ -168,54 +168,59 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
if (mcastMessages > 100000) { // avoid initial state & int overflow
// the ratio we actually use here is (retransmit requests) / (mcast datagram writes)
// a single retransmit request may include multiple missed messages
- double ratio = (this.dmStats.getMcastRetransmits() * 1.0) /
- (this.dmStats.getMcastWrites() * 1.0);
+ double ratio =
+ (this.dmStats.getMcastRetransmits() * 1.0) / (this.dmStats.getMcastWrites() * 1.0);
if (ratio > threshold) {
- String s = "The number of message retransmissions (" +
- ratio + ") exceeds the threshold (" + threshold + ")";
+ String s = "The number of message retransmissions (" + ratio + ") exceeds the threshold ("
+ + threshold + ")";
status.add(okayHealth(s));
}
}
}
-
-/**
- * The function keeps updating the health of the cache based on
- * roles required by the regions and their reliablity policies.
- *
- * */
-
- void checkCacheRequiredRolesMeet(List status){
- // will have to call here okeyHealth() or poorHealth()
- //GemFireCache cache = (GemFireCache)CacheFactory.getAnyInstance();
-
- //CachePerfStats cPStats= null;
- try{
- GemFireCacheImpl cache = (GemFireCacheImpl)CacheFactory.getAnyInstance();
- CachePerfStats cPStats= null;
- cPStats= cache.getCachePerfStats();
-
- if(cPStats.getReliableRegionsMissingFullAccess()> 0){
- // health is okay.
- int numRegions = cPStats.getReliableRegionsMissingFullAccess();
- status.add(okayHealth(LocalizedStrings.MemberHealthEvaluator_THERE_ARE_0_REGIONS_MISSING_REQUIRED_ROLES_BUT_ARE_CONFIGURED_FOR_FULL_ACCESS.toLocalizedString(Integer.valueOf(numRegions))));
- }else if(cPStats.getReliableRegionsMissingLimitedAccess() > 0){
- // health is poor
- int numRegions = cPStats.getReliableRegionsMissingLimitedAccess();
- status.add(poorHealth(LocalizedStrings.MemberHealthEvaluator_THERE_ARE_0_REGIONS_MISSING_REQUIRED_ROLES_AND_CONFIGURED_WITH_LIMITED_ACCESS.toLocalizedString(Integer.valueOf(numRegions))));
- }else if (cPStats.getReliableRegionsMissingNoAccess() > 0){
- // health is poor
- int numRegions = cPStats.getReliableRegionsMissingNoAccess();
- status.add(poorHealth(LocalizedStrings.MemberHealthEvaluator_THERE_ARE_0_REGIONS_MISSING_REQUIRED_ROLES_AND_CONFIGURED_WITHOUT_ACCESS.toLocalizedString(Integer.valueOf(numRegions))));
- }//else{
- // health is good/okay
- // status.add(okayHealth("All regions have there required roles meet"));
- //}
- }
- catch (CancelException ignore) {
- }
+
+ /**
+ * The function keeps updating the health of the cache based on roles required by the regions and
+ * their reliablity policies.
+ *
+ */
+
+ void checkCacheRequiredRolesMeet(List status) {
+ // will have to call here okeyHealth() or poorHealth()
+ // GemFireCache cache = (GemFireCache)CacheFactory.getAnyInstance();
+
+ // CachePerfStats cPStats= null;
+ try {
+ GemFireCacheImpl cache = (GemFireCacheImpl) CacheFactory.getAnyInstance();
+ CachePerfStats cPStats = null;
+ cPStats = cache.getCachePerfStats();
+
+ if (cPStats.getReliableRegionsMissingFullAccess() > 0) {
+ // health is okay.
+ int numRegions = cPStats.getReliableRegionsMissingFullAccess();
+ status.add(okayHealth(
+ LocalizedStrings.MemberHealthEvaluator_THERE_ARE_0_REGIONS_MISSING_REQUIRED_ROLES_BUT_ARE_CONFIGURED_FOR_FULL_ACCESS
+ .toLocalizedString(Integer.valueOf(numRegions))));
+ } else if (cPStats.getReliableRegionsMissingLimitedAccess() > 0) {
+ // health is poor
+ int numRegions = cPStats.getReliableRegionsMissingLimitedAccess();
+ status.add(poorHealth(
+ LocalizedStrings.MemberHealthEvaluator_THERE_ARE_0_REGIONS_MISSING_REQUIRED_ROLES_AND_CONFIGURED_WITH_LIMITED_ACCESS
+ .toLocalizedString(Integer.valueOf(numRegions))));
+ } else if (cPStats.getReliableRegionsMissingNoAccess() > 0) {
+ // health is poor
+ int numRegions = cPStats.getReliableRegionsMissingNoAccess();
+ status.add(poorHealth(
+ LocalizedStrings.MemberHealthEvaluator_THERE_ARE_0_REGIONS_MISSING_REQUIRED_ROLES_AND_CONFIGURED_WITHOUT_ACCESS
+ .toLocalizedString(Integer.valueOf(numRegions))));
+ } // else{
+ // health is good/okay
+ // status.add(okayHealth("All regions have there required roles meet"));
+ // }
+ } catch (CancelException ignore) {
+ }
}
-
+
/**
* Updates the previous values of statistics
*/
@@ -228,7 +233,7 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
checkVMProcessSize(status);
checkMessageQueueSize(status);
checkReplyTimeouts(status);
- // will have to add another call to check for roles
+ // will have to add another call to check for roles
// missing and reliablity attributed.
checkCacheRequiredRolesMeet(status);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
index f90a8e7..7025721 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupRequest.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -44,20 +42,19 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LocalizedMessage;
/**
- * A request to from an admin VM to all non admin members
- * to start a backup. In the prepare phase of the backup,
- * the members will suspend bucket destroys to make sure
- * buckets aren't missed during the backup.
+ * A request to from an admin VM to all non admin members to start a backup. In the prepare phase of
+ * the backup, the members will suspend bucket destroys to make sure buckets aren't missed during
+ * the backup.
*
*
*/
-public class PrepareBackupRequest extends CliLegacyMessage {
+public class PrepareBackupRequest extends CliLegacyMessage {
private static final Logger logger = LogService.getLogger();
-
+
public PrepareBackupRequest() {
-
+
}
-
+
public static Map<DistributedMember, Set<PersistentID>> send(DM dm, Set recipients) {
PrepareBackupRequest request = new PrepareBackupRequest();
request.setRecipients(recipients);
@@ -68,31 +65,32 @@ public class PrepareBackupRequest extends CliLegacyMessage {
try {
replyProcessor.waitForReplies();
} catch (ReplyException e) {
- if(!(e.getCause() instanceof CancelException)) {
+ if (!(e.getCause() instanceof CancelException)) {
throw e;
}
} catch (InterruptedException e) {
e.printStackTrace();
}
- AdminResponse response = request.createResponse((DistributionManager)dm);
+ AdminResponse response = request.createResponse((DistributionManager) dm);
response.setSender(dm.getDistributionManagerId());
replyProcessor.process(response);
return replyProcessor.results;
}
-
+
@Override
protected AdminResponse createResponse(DistributionManager dm) {
GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
HashSet<PersistentID> persistentIds;
- if(cache == null) {
+ if (cache == null) {
persistentIds = new HashSet<PersistentID>();
} else {
try {
BackupManager manager = cache.startBackup(getSender());
persistentIds = manager.prepareBackup();
- } catch(IOException e) {
- logger.error(LocalizedMessage.create(LocalizedStrings.CliLegacyMessage_ERROR, this.getClass()), e);
- return AdminFailureResponse.create(dm, getSender(), e);
+ } catch (IOException e) {
+ logger.error(
+ LocalizedMessage.create(LocalizedStrings.CliLegacyMessage_ERROR, this.getClass()), e);
+ return AdminFailureResponse.create(dm, getSender(), e);
}
}
@@ -103,13 +101,15 @@ public class PrepareBackupRequest extends CliLegacyMessage {
public int getDSFID() {
return PREPARE_BACKUP_REQUEST;
}
-
+
private static class PrepareBackupReplyProcessor extends AdminMultipleReplyProcessor {
- Map<DistributedMember, Set<PersistentID>> results = Collections.synchronizedMap(new HashMap<DistributedMember, Set<PersistentID>>());
+ Map<DistributedMember, Set<PersistentID>> results =
+ Collections.synchronizedMap(new HashMap<DistributedMember, Set<PersistentID>>());
+
public PrepareBackupReplyProcessor(DM dm, Collection initMembers) {
super(dm, initMembers);
}
-
+
@Override
protected boolean stopBecauseOfExceptions() {
return false;
@@ -117,16 +117,17 @@ public class PrepareBackupRequest extends CliLegacyMessage {
@Override
protected void process(DistributionMessage msg, boolean warn) {
- if(msg instanceof PrepareBackupResponse) {
- final HashSet<PersistentID> persistentIds = ((PrepareBackupResponse) msg).getPersistentIds();
- if(persistentIds != null && !persistentIds.isEmpty()) {
+ if (msg instanceof PrepareBackupResponse) {
+ final HashSet<PersistentID> persistentIds =
+ ((PrepareBackupResponse) msg).getPersistentIds();
+ if (persistentIds != null && !persistentIds.isEmpty()) {
results.put(msg.getSender(), persistentIds);
}
}
super.process(msg, warn);
}
-
-
+
+
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupResponse.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupResponse.java b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupResponse.java
index 4368cce..2ba6817 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupResponse.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/PrepareBackupResponse.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -34,16 +32,17 @@ import org.apache.geode.internal.admin.remote.AdminResponse;
public class PrepareBackupResponse extends AdminResponse {
private HashSet<PersistentID> persistentIds;
-
+
public PrepareBackupResponse() {
super();
}
- public PrepareBackupResponse(InternalDistributedMember sender, HashSet<PersistentID> persistentIds) {
+ public PrepareBackupResponse(InternalDistributedMember sender,
+ HashSet<PersistentID> persistentIds) {
this.setRecipient(sender);
this.persistentIds = persistentIds;
}
-
+
public HashSet<PersistentID> getPersistentIds() {
return persistentIds;
}
@@ -58,7 +57,7 @@ public class PrepareBackupResponse extends AdminResponse {
@Override
public void toData(DataOutput out) throws IOException {
- super.toData(out);
+ super.toData(out);
DataSerializer.writeHashSet(persistentIds, out);
}
@@ -73,7 +72,7 @@ public class PrepareBackupResponse extends AdminResponse {
public int getDSFID() {
return PREPARE_BACKUP_RESPONSE;
}
-
+
@Override
public String toString() {
return getClass().getName() + ": " + persistentIds;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticImpl.java
index 987bdfa..517f0a0 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -22,75 +20,73 @@ import org.apache.geode.internal.admin.Stat;
/**
* Implementation of a single statistic in a <code>StatisticResource</code>
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*
*/
-public class StatisticImpl
-implements org.apache.geode.admin.Statistic {
+public class StatisticImpl implements org.apache.geode.admin.Statistic {
private static final long serialVersionUID = 3899296873901634399L;
-
+
private Stat internalStat;
- protected StatisticImpl() {
- }
+ protected StatisticImpl() {}
protected StatisticImpl(Stat internalStat) {
this.internalStat = internalStat;
}
-
+
/**
- * @return the identifying name of this stat
+ * @return the identifying name of this stat
*/
public String getName() {
return this.internalStat.getName();
}
-
+
/**
- * @return the value of this stat as a <code>java.lang.Number</code>
+ * @return the value of this stat as a <code>java.lang.Number</code>
*/
public Number getValue() {
return this.internalStat.getValue();
}
-
+
/**
* @return a display string for the unit of measurement (if any) this stat represents
*/
public String getUnits() {
return this.internalStat.getUnits();
}
-
+
/**
* @return true if this stat represents a numeric value which always increases
*/
public boolean isCounter() {
return this.internalStat.isCounter();
}
-
+
/**
* @return the full description of this stat
*/
public String getDescription() {
return this.internalStat.getDescription();
}
-
+
/**
- * Sets the internal stat which allows us to reuse the wrapper object and
- * handle refreshes along with isWriteable set to false on the attribute.
+ * Sets the internal stat which allows us to reuse the wrapper object and handle refreshes along
+ * with isWriteable set to false on the attribute.
*/
protected void setStat(Stat internalStat) {
this.internalStat = internalStat;
}
-
- /**
- * Returns a string representation of the object.
- *
- * @return a string representation of the object
- */
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return a string representation of the object
+ */
@Override
- public String toString() {
- return getName();
- }
-
+ public String toString() {
+ return getName();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
index 9458759..c6f60cb 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/StatisticResourceImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -23,19 +21,18 @@ import org.apache.geode.internal.Assert;
import org.apache.geode.internal.admin.Stat;
import org.apache.geode.internal.admin.StatResource;
import org.apache.geode.internal.i18n.LocalizedStrings;
-//import org.apache.geode.internal.admin.SystemMember;
+// import org.apache.geode.internal.admin.SystemMember;
import java.util.ArrayList;
-//import java.util.Date;
+// import java.util.Date;
import java.util.List;
/**
* Provides monitoring of a statistic resource.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
-public class StatisticResourceImpl
-implements org.apache.geode.admin.StatisticResource {
+public class StatisticResourceImpl implements org.apache.geode.admin.StatisticResource {
/** The underlying remote StatResource which this object delegates to */
protected StatResource statResource;
@@ -49,22 +46,21 @@ implements org.apache.geode.admin.StatisticResource {
protected SystemMember member;
/** The array of statistics in this resource */
protected Statistic[] statistics; // = new Statistic[0];
-
+
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
-
+
/**
* Constructs an instance of StatisticResourceImpl.
*
- * @param statResource the admin StatResource to manage/monitor
- * @param member the SystemMember owning this resource
- * @exception org.apache.geode.admin.AdminException
- * if unable to create this StatisticResource for administration
+ * @param statResource the admin StatResource to manage/monitor
+ * @param member the SystemMember owning this resource
+ * @exception org.apache.geode.admin.AdminException if unable to create this StatisticResource for
+ * administration
*/
- public StatisticResourceImpl(StatResource statResource,
- SystemMember member)
- throws org.apache.geode.admin.AdminException {
+ public StatisticResourceImpl(StatResource statResource, SystemMember member)
+ throws org.apache.geode.admin.AdminException {
this.statResource = statResource;
this.member = member;
this.name = this.statResource.getName();
@@ -73,31 +69,30 @@ implements org.apache.geode.admin.StatisticResource {
}
// -------------------------------------------------------------------------
- // Attributes accessors and mutators
+ // Attributes accessors and mutators
// -------------------------------------------------------------------------
- public String getName() {
- return this.name;
- }
-
- public String getDescription() {
- return this.description;
- }
-
+ public String getName() {
+ return this.name;
+ }
+
+ public String getDescription() {
+ return this.description;
+ }
+
public String getType() {
return this.type;
}
-
- public String getOwner() {
- return this.member.toString();
- }
-
+
+ public String getOwner() {
+ return this.member.toString();
+ }
+
public Statistic[] getStatistics() {
if (this.statistics == null) {
try {
refresh();
- }
- catch (AdminException e) {
+ } catch (AdminException e) {
this.statistics = new Statistic[0];
}
}
@@ -107,9 +102,9 @@ implements org.apache.geode.admin.StatisticResource {
public long getUniqueId() {
return this.statResource.getResourceUniqueID();
}
-
+
// -------------------------------------------------------------------------
- // Operations
+ // Operations
// -------------------------------------------------------------------------
public void refresh() throws org.apache.geode.admin.AdminException {
@@ -118,9 +113,11 @@ implements org.apache.geode.admin.StatisticResource {
stats = this.statResource.getStats();
}
if (stats == null || stats.length < 1) {
- throw new AdminException(LocalizedStrings.StatisticResourceImpl_FAILED_TO_REFRESH_STATISTICS_0_FOR_1.toLocalizedString(getType()+"-"+getName(), getOwner()));
+ throw new AdminException(
+ LocalizedStrings.StatisticResourceImpl_FAILED_TO_REFRESH_STATISTICS_0_FOR_1
+ .toLocalizedString(getType() + "-" + getName(), getOwner()));
}
-
+
if (this.statistics == null || this.statistics.length < 1) {
// define new statistics instances...
List statList = new ArrayList();
@@ -128,8 +125,7 @@ implements org.apache.geode.admin.StatisticResource {
statList.add(createStatistic(stats[i]));
}
this.statistics = (Statistic[]) statList.toArray(new Statistic[0]);
- }
- else {
+ } else {
// update the existing instances...
for (int i = 0; i < stats.length; i++) {
updateStatistic(stats[i]);
@@ -138,44 +134,44 @@ implements org.apache.geode.admin.StatisticResource {
}
// -------------------------------------------------------------------------
- // Non-public implementation methods
+ // Non-public implementation methods
// -------------------------------------------------------------------------
-
+
/**
- * Updates the value of the {@link Statistic} corresponding to the internal
+ * Updates the value of the {@link Statistic} corresponding to the internal
* {@link org.apache.geode.internal.admin.Stat}
*
- * @param stat the internal stat to use in updating the matching statistic
+ * @param stat the internal stat to use in updating the matching statistic
*/
private void updateStatistic(Stat stat) {
for (int i = 0; i < this.statistics.length; i++) {
if (this.statistics[i].getName().equals(stat.getName())) {
- ((StatisticImpl)this.statistics[i]).setStat(stat);
+ ((StatisticImpl) this.statistics[i]).setStat(stat);
return;
}
}
Assert.assertTrue(false, "Unknown stat: " + stat.getName());
}
-
+
/**
- * Creates a new {@link StatisticImpl} to represent the internal {@link
- * org.apache.geode.internal.admin.Stat}
+ * Creates a new {@link StatisticImpl} to represent the internal
+ * {@link org.apache.geode.internal.admin.Stat}
*
- * @param stat the internal stat to wrap in a new statistic
+ * @param stat the internal stat to wrap in a new statistic
*/
protected Statistic createStatistic(Stat stat) {
return new StatisticImpl(stat);
}
-
- /**
- * Returns a string representation of the object.
- *
- * @return a string representation of the object
- */
+
+ /**
+ * Returns a string representation of the object.
+ *
+ * @return a string representation of the object
+ */
@Override
- public String toString() {
- return getName();
- }
-
+ public String toString() {
+ return getName();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
index 546983c..4e530ef 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberBridgeServerImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -32,7 +30,7 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
* @since GemFire 4.0
*/
public class SystemMemberBridgeServerImpl
- implements SystemMemberCacheServer, SystemMemberBridgeServer {
+ implements SystemMemberCacheServer, SystemMemberBridgeServer {
/** The VM in which the bridge server resides */
private final GemFireVM vm;
@@ -43,31 +41,31 @@ public class SystemMemberBridgeServerImpl
/** Information about the bridge server */
private AdminBridgeServer bridgeInfo;
- ///////////////////// Constructors /////////////////////
+ ///////////////////// Constructors /////////////////////
/**
- * Creates a new <code>SystemMemberBridgeServerImpl</code> that
- * administers the given bridge server in the given VM.
+ * Creates a new <code>SystemMemberBridgeServerImpl</code> that administers the given bridge
+ * server in the given VM.
*/
- protected SystemMemberBridgeServerImpl(SystemMemberCacheImpl cache,
- AdminBridgeServer bridgeInfo)
-
- throws AdminException {
+ protected SystemMemberBridgeServerImpl(SystemMemberCacheImpl cache, AdminBridgeServer bridgeInfo)
+
+ throws AdminException {
this.vm = cache.getVM();
this.cache = cache.getCacheInfo();
this.bridgeInfo = bridgeInfo;
}
- //////////////////// Instance Methods ////////////////////
+ //////////////////// Instance Methods ////////////////////
/**
- * Throws an <code>AdminException</code> if this bridge server is
- * running.
+ * Throws an <code>AdminException</code> if this bridge server is running.
*/
private void checkRunning() throws AdminException {
if (this.isRunning()) {
- throw new AdminException(LocalizedStrings.SystemMemberBridgeServerImpl_CANNOT_CHANGE_THE_CONFIGURATION_OF_A_RUNNING_BRIDGE_SERVER.toLocalizedString());
+ throw new AdminException(
+ LocalizedStrings.SystemMemberBridgeServerImpl_CANNOT_CHANGE_THE_CONFIGURATION_OF_A_RUNNING_BRIDGE_SERVER
+ .toLocalizedString());
}
}
@@ -101,11 +99,13 @@ public class SystemMemberBridgeServerImpl
public void refresh() {
try {
- this.bridgeInfo =
- this.vm.getBridgeInfo(this.cache, this.bridgeInfo.getId());
+ this.bridgeInfo = this.vm.getBridgeInfo(this.cache, this.bridgeInfo.getId());
} catch (AdminException ex) {
- throw new InternalGemFireException(LocalizedStrings.SystemMemberBridgeServerImpl_UNEXPECTED_EXCEPTION_WHILE_REFRESHING.toLocalizedString(), ex);
+ throw new InternalGemFireException(
+ LocalizedStrings.SystemMemberBridgeServerImpl_UNEXPECTED_EXCEPTION_WHILE_REFRESHING
+ .toLocalizedString(),
+ ex);
}
}
@@ -144,12 +144,12 @@ public class SystemMemberBridgeServerImpl
public int getSocketBufferSize() {
return this.bridgeInfo.getSocketBufferSize();
}
-
+
public void setTcpDelay(boolean setting) throws AdminException {
checkRunning();
this.bridgeInfo.setTcpNoDelay(setting);
}
-
+
public boolean getTcpDelay() {
return this.bridgeInfo.getTcpNoDelay();
}
@@ -207,15 +207,16 @@ public class SystemMemberBridgeServerImpl
public String[] getGroups() {
return this.bridgeInfo.getGroups();
}
-
+
public String getLoadProbe() {
return this.bridgeInfo.getLoadProbe().toString();
}
public void setLoadProbe(ServerLoadProbe loadProbe) throws AdminException {
checkRunning();
- if(!(loadProbe instanceof Serializable)) {
- throw new IllegalArgumentException("Load probe must be Serializable to be used with admin API");
+ if (!(loadProbe instanceof Serializable)) {
+ throw new IllegalArgumentException(
+ "Load probe must be Serializable to be used with admin API");
}
this.bridgeInfo.setLoadProbe(loadProbe);
}
@@ -228,6 +229,6 @@ public class SystemMemberBridgeServerImpl
checkRunning();
this.bridgeInfo.setLoadPollInterval(loadPollInterval);
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
index e4f7e60..b6b386e 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -21,32 +19,28 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.cache.Operation;
/**
- * An event that describes an operation on a cache.
- * Instances of this are delivered to a {@link SystemMemberCacheListener} when a
- * a cache is created or closed.
+ * An event that describes an operation on a cache. Instances of this are delivered to a
+ * {@link SystemMemberCacheListener} when a a cache is created or closed.
*
* @since GemFire 5.0
*/
-public class SystemMemberCacheEventImpl
- extends SystemMembershipEventImpl
- implements SystemMemberCacheEvent
-{
+public class SystemMemberCacheEventImpl extends SystemMembershipEventImpl
+ implements SystemMemberCacheEvent {
/** The operation done by this event */
private Operation op;
- /////////////////////// Constructors ///////////////////////
+ /////////////////////// Constructors ///////////////////////
/**
- * Creates a new <code>SystemMemberCacheEvent</code> for the member
- * with the given id.
+ * Creates a new <code>SystemMemberCacheEvent</code> for the member with the given id.
*/
protected SystemMemberCacheEventImpl(DistributedMember id, Operation op) {
super(id);
this.op = op;
}
- ///////////////////// Instance Methods /////////////////////
+ ///////////////////// Instance Methods /////////////////////
public Operation getOperation() {
return this.op;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
index 43f9b89..8afafdb 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheEventProcessor.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -38,14 +36,15 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.logging.LogService;
/**
- * This class processes the message to be delivered to admin node.
- * [This needs to be redesigned and reimplemented... see 32887]
+ * This class processes the message to be delivered to admin node. [This needs to be redesigned and
+ * reimplemented... see 32887]
+ *
* @since GemFire 5.0
*/
public class SystemMemberCacheEventProcessor {
private static final Logger logger = LogService.getLogger();
-
+
/*
* Sends cache create/close message to Admin VMs
*/
@@ -57,7 +56,7 @@ public class SystemMemberCacheEventProcessor {
* Sends region creation/destroy message to Admin VMs
*/
public static void send(Cache c, Region region, Operation op) {
- InternalDistributedSystem system = (InternalDistributedSystem)c.getDistributedSystem();
+ InternalDistributedSystem system = (InternalDistributedSystem) c.getDistributedSystem();
Set recps = system.getDistributionManager().getAdminMemberSet();
// @todo darrel: find out if any of these guys have region listeners
if (recps.isEmpty()) {
@@ -73,10 +72,9 @@ public class SystemMemberCacheEventProcessor {
msg.op = op;
system.getDistributionManager().putOutgoing(msg);
}
-
-
- public static final class SystemMemberCacheMessage extends HighPriorityDistributionMessage
- {
+
+
+ public static final class SystemMemberCacheMessage extends HighPriorityDistributionMessage {
protected String regionPath;
protected Operation op;
@@ -85,15 +83,16 @@ public class SystemMemberCacheEventProcessor {
AdminDistributedSystemImpl admin = AdminDistributedSystemImpl.getConnectedInstance();
if (admin == null) {
if (logger.isDebugEnabled()) {
- logger.debug("Ignoring message because there is no admin distributed system present: {}", this);
+ logger.debug("Ignoring message because there is no admin distributed system present: {}",
+ this);
}
- return; // probably shutting down or still connecting
+ return; // probably shutting down or still connecting
}
List listeners = admin.getCacheListeners();
Iterator itr = listeners.iterator();
SystemMemberCacheListener listener = null;
- while(itr.hasNext()){
- listener = (SystemMemberCacheListener)itr.next();
+ while (itr.hasNext()) {
+ listener = (SystemMemberCacheListener) itr.next();
if (this.regionPath == null) {
SystemMemberCacheEvent event = new SystemMemberCacheEventImpl(getSender(), this.op);
if (this.op == Operation.CACHE_CREATE) {
@@ -102,7 +101,8 @@ public class SystemMemberCacheEventProcessor {
listener.afterCacheClose(event);
}
} else {
- SystemMemberRegionEvent event = new SystemMemberRegionEventImpl(getSender(), this.op, this.regionPath);
+ SystemMemberRegionEvent event =
+ new SystemMemberRegionEventImpl(getSender(), this.op, this.regionPath);
if (this.op.isRegionDestroy()) {
listener.afterRegionLoss(event);
} else {
@@ -117,8 +117,7 @@ public class SystemMemberCacheEventProcessor {
}
@Override
- public void fromData(DataInput in)
- throws IOException, ClassNotFoundException {
+ public void fromData(DataInput in) throws IOException, ClassNotFoundException {
super.fromData(in);
this.regionPath = DataSerializer.readString(in);
this.op = Operation.fromOrdinal(in.readByte());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
index 7c1ba71..62076f0 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberCacheImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -28,28 +26,28 @@ import java.util.*;
/**
* View of a GemFire system member's cache.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
public class SystemMemberCacheImpl implements SystemMemberCache {
protected final GemFireVM vm;
protected CacheInfo info;
protected Statistic[] statistics;
- /** Maps the id of a bridge server to its SystemMemberBridgeServer */
+ /** Maps the id of a bridge server to its SystemMemberBridgeServer */
private ObjIdMap bridgeServers = new ObjIdMap();
-
+
// constructors
- public SystemMemberCacheImpl(GemFireVM vm)
- throws CacheDoesNotExistException
- {
+ public SystemMemberCacheImpl(GemFireVM vm) throws CacheDoesNotExistException {
this.vm = vm;
this.info = vm.getCacheInfo();
if (this.info == null) {
- throw new CacheDoesNotExistException(LocalizedStrings.SystemMemberCacheImpl_THE_VM_0_DOES_NOT_CURRENTLY_HAVE_A_CACHE.toLocalizedString(vm.getId()));
+ throw new CacheDoesNotExistException(
+ LocalizedStrings.SystemMemberCacheImpl_THE_VM_0_DOES_NOT_CURRENTLY_HAVE_A_CACHE
+ .toLocalizedString(vm.getId()));
}
initStats();
}
-
+
// attributes
/**
* The name of the cache.
@@ -61,6 +59,7 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
}
return result;
}
+
/**
* Value that uniquely identifies an instance of a cache for a given member.
*/
@@ -71,27 +70,35 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
public boolean isClosed() {
return this.info.isClosed();
}
+
public int getLockTimeout() {
return this.info.getLockTimeout();
}
+
public void setLockTimeout(int seconds) throws AdminException {
this.info = this.vm.setCacheLockTimeout(this.info, seconds);
}
+
public int getLockLease() {
return this.info.getLockLease();
}
+
public void setLockLease(int seconds) throws AdminException {
this.info = this.vm.setCacheLockLease(this.info, seconds);
}
+
public int getSearchTimeout() {
return this.info.getSearchTimeout();
}
+
public void setSearchTimeout(int seconds) throws AdminException {
this.info = this.vm.setCacheSearchTimeout(this.info, seconds);
}
+
public int getUpTime() {
return this.info.getUpTime();
}
+
public java.util.Set getRootRegionNames() {
Set set = this.info.getRootRegionNames();
if (set == null) {
@@ -115,29 +122,25 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
}
}
- public GemFireMemberStatus getSnapshot()
- {
- //System.out.println(">>>SystemMemberCacheJmxImpl::getSnapshot:pre::: " + this.vm);
- GemFireMemberStatus stat = this.vm.getSnapshot();
- //System.out.println(">>>SystemMemberCacheJmxImpl::getSnapshot:post::: " + stat);
- return stat;
+ public GemFireMemberStatus getSnapshot() {
+ // System.out.println(">>>SystemMemberCacheJmxImpl::getSnapshot:pre::: " + this.vm);
+ GemFireMemberStatus stat = this.vm.getSnapshot();
+ // System.out.println(">>>SystemMemberCacheJmxImpl::getSnapshot:post::: " + stat);
+ return stat;
}
- public RegionSubRegionSnapshot getRegionSnapshot()
- {
- //System.out.println(">>>SystemMemberCacheJmxImpl::getRegionSnapshot:pre::: " + this.vm);
- RegionSubRegionSnapshot snap = this.vm.getRegionSnapshot();
- //System.out.println(">>>SystemMemberCacheJmxImpl::getRegionSnapshot:post::: " + snap);
- return snap;
+ public RegionSubRegionSnapshot getRegionSnapshot() {
+ // System.out.println(">>>SystemMemberCacheJmxImpl::getRegionSnapshot:pre::: " + this.vm);
+ RegionSubRegionSnapshot snap = this.vm.getRegionSnapshot();
+ // System.out.println(">>>SystemMemberCacheJmxImpl::getRegionSnapshot:post::: " + snap);
+ return snap;
}
-
+
public Statistic[] getStatistics() {
return this.statistics;
}
- public SystemMemberRegion getRegion(String path)
- throws org.apache.geode.admin.AdminException
- {
+ public SystemMemberRegion getRegion(String path) throws org.apache.geode.admin.AdminException {
Region r = this.vm.getRegion(this.info, path);
if (r == null) {
return null;
@@ -146,10 +149,8 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
}
}
- public SystemMemberRegion createRegion(String name,
- RegionAttributes attrs)
- throws AdminException
- {
+ public SystemMemberRegion createRegion(String name, RegionAttributes attrs)
+ throws AdminException {
Region r = this.vm.createVMRootRegion(this.info, name, attrs);
if (r == null) {
return null;
@@ -158,11 +159,9 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
return createSystemMemberRegion(r);
}
}
-
- public SystemMemberRegion createVMRegion(String name,
- RegionAttributes attrs)
- throws AdminException
- {
+
+ public SystemMemberRegion createVMRegion(String name, RegionAttributes attrs)
+ throws AdminException {
return createRegion(name, attrs);
}
@@ -181,7 +180,7 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
this.statistics = new Statistic[0];
return;
}
-
+
// define new statistics instances...
List statList = new ArrayList();
for (int i = 0; i < stats.length; i++) {
@@ -189,6 +188,7 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
}
this.statistics = (Statistic[]) statList.toArray(new Statistic[statList.size()]);
}
+
private void updateStats() {
StatResource resource = this.info.getPerfStats();
if (resource == null) {
@@ -201,7 +201,7 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
if (stats == null || stats.length < 1) {
return;
}
-
+
for (int i = 0; i < stats.length; i++) {
updateStatistic(stats[i]);
}
@@ -210,7 +210,7 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
private void updateStatistic(Stat stat) {
for (int i = 0; i < this.statistics.length; i++) {
if (this.statistics[i].getName().equals(stat.getName())) {
- ((StatisticImpl)this.statistics[i]).setStat(stat);
+ ((StatisticImpl) this.statistics[i]).setStat(stat);
return;
}
}
@@ -218,9 +218,8 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
}
/**
- * Returns the <code>CacheInfo</code> that describes this cache.
- * Note that this operation does not {@link #refresh} the
- * <code>CacheInfo</code>.
+ * Returns the <code>CacheInfo</code> that describes this cache. Note that this operation does not
+ * {@link #refresh} the <code>CacheInfo</code>.
*/
public CacheInfo getCacheInfo() {
return this.info;
@@ -233,33 +232,29 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
protected Statistic createStatistic(Stat stat) {
return new StatisticImpl(stat);
}
+
protected SystemMemberRegion createSystemMemberRegion(Region r)
- throws org.apache.geode.admin.AdminException
- {
+ throws org.apache.geode.admin.AdminException {
SystemMemberRegionImpl sysMemberRegion = new SystemMemberRegionImpl(this, r);
sysMemberRegion.refresh();
return sysMemberRegion;
}
- public SystemMemberCacheServer addCacheServer()
- throws AdminException {
+ public SystemMemberCacheServer addCacheServer() throws AdminException {
AdminBridgeServer bridge = this.vm.addCacheServer(this.info);
- SystemMemberCacheServer admin =
- createSystemMemberBridgeServer(bridge);
+ SystemMemberCacheServer admin = createSystemMemberBridgeServer(bridge);
bridgeServers.put(bridge.getId(), admin);
return admin;
}
- private Collection getCacheServersCollection()
- throws AdminException {
+ private Collection getCacheServersCollection() throws AdminException {
Collection bridges = new ArrayList();
int[] bridgeIds = this.info.getBridgeServerIds();
for (int i = 0; i < bridgeIds.length; i++) {
int id = bridgeIds[i];
- SystemMemberBridgeServer bridge =
- (SystemMemberBridgeServer) bridgeServers.get(id);
+ SystemMemberBridgeServer bridge = (SystemMemberBridgeServer) bridgeServers.get(id);
if (bridge == null) {
AdminBridgeServer info = this.vm.getBridgeInfo(this.info, id);
if (info != null) {
@@ -275,21 +270,17 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
return bridges;
}
- public SystemMemberCacheServer[] getCacheServers()
- throws AdminException {
+ public SystemMemberCacheServer[] getCacheServers() throws AdminException {
Collection bridges = getCacheServersCollection();
- SystemMemberCacheServer[] array =
- new SystemMemberCacheServer[bridges.size()];
+ SystemMemberCacheServer[] array = new SystemMemberCacheServer[bridges.size()];
return (SystemMemberCacheServer[]) bridges.toArray(array);
};
/**
- * Creates a new instance of <Code>SystemMemberBridgeServer</code>
- * with the given configuration.
+ * Creates a new instance of <Code>SystemMemberBridgeServer</code> with the given configuration.
*/
- protected SystemMemberBridgeServerImpl
- createSystemMemberBridgeServer(AdminBridgeServer bridge)
- throws AdminException {
+ protected SystemMemberBridgeServerImpl createSystemMemberBridgeServer(AdminBridgeServer bridge)
+ throws AdminException {
return new SystemMemberBridgeServerImpl(this, bridge);
}
@@ -297,8 +288,8 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
public boolean isServer() throws AdminException {
return this.info.isServer();
}
-
-
+
+
/**
* Returns a string representation of the object.
*
@@ -306,7 +297,7 @@ public class SystemMemberCacheImpl implements SystemMemberCache {
*/
@Override
public String toString() {
- return getName();
+ return getName();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
index 57db801..1e2d2a7 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberImpl.java
@@ -1,18 +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
+ * 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.admin.internal;
@@ -38,17 +36,16 @@ import java.util.*;
/**
* Member of a GemFire system.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
-public class SystemMemberImpl
-implements org.apache.geode.admin.SystemMember,
- org.apache.geode.admin.internal.ConfigurationParameterListener {
+public class SystemMemberImpl implements org.apache.geode.admin.SystemMember,
+ org.apache.geode.admin.internal.ConfigurationParameterListener {
private static final Logger logger = LogService.getLogger();
-
- /** Identifying name of this member.
- * Note that by default this is the string form of internalId but the
- * ManagedSystemMemberImpl subclass resets it to getNewId()
+
+ /**
+ * Identifying name of this member. Note that by default this is the string form of internalId but
+ * the ManagedSystemMemberImpl subclass resets it to getNewId()
*/
protected String id;
@@ -62,10 +59,12 @@ implements org.apache.geode.admin.SystemMember,
protected String host;
/** The internal configuration this impl delegates to for runtime config */
-// private Config config;
+ // private Config config;
- /** The configuration parameters for this member. Maps the name of
- the ConfigurationParameter to the ConfigurationParameter. */
+ /**
+ * The configuration parameters for this member. Maps the name of the ConfigurationParameter to
+ * the ConfigurationParameter.
+ */
protected Map parms = new HashMap();
/** The {@link AdminDistributedSystem} this is a member of */
@@ -73,69 +72,60 @@ implements org.apache.geode.admin.SystemMember,
/** Internal GemFire vm to delegate to */
private GemFireVM vm;
-
+
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
- /**
- * Constructs new <code>SystemMemberImpl</code> for a
- * <code>ManagedEntity</code> that has yet to be started.
+ /**
+ * Constructs new <code>SystemMemberImpl</code> for a <code>ManagedEntity</code> that has yet to
+ * be started.
*
- * @param system the distributed system this member belongs to
+ * @param system the distributed system this member belongs to
*/
- protected SystemMemberImpl(AdminDistributedSystem system)
- throws AdminException {
+ protected SystemMemberImpl(AdminDistributedSystem system) throws AdminException {
this.system = system;
refreshConfig(getDefaultConfig());
}
- /**
- * Constructs new <code>SystemMemberImpl</code> from the given
- * <code>GemFireVM</code>. This constructor is invoked when we
- * discover a new member of the distributed system.
+ /**
+ * Constructs new <code>SystemMemberImpl</code> from the given <code>GemFireVM</code>. This
+ * constructor is invoked when we discover a new member of the distributed system.
*
- * @param system the distributed system this member belongs to
+ * @param system the distributed system this member belongs to
* @param vm internal GemFire vm to delegate to
*/
- public SystemMemberImpl(AdminDistributedSystem system,
- GemFireVM vm)
- throws AdminException {
+ public SystemMemberImpl(AdminDistributedSystem system, GemFireVM vm) throws AdminException {
this(system);
setGemFireVM(vm);
}
/**
- * Constructs the instance of SystemMember using the corresponding
- * InternalDistributedMember instance of a DS member for the given
- * AdminDistributedSystem.
+ * Constructs the instance of SystemMember using the corresponding InternalDistributedMember
+ * instance of a DS member for the given AdminDistributedSystem.
+ *
+ * @param system Current AdminDistributedSystem instance
+ * @param member InternalDistributedMember instance for which a SystemMember instance is to be
+ * constructed.
+ * @throws AdminException if construction of SystemMember fails
*
- * @param system
- * Current AdminDistributedSystem instance
- * @param member
- * InternalDistributedMember instance for which a SystemMember
- * instance is to be constructed.
- * @throws AdminException
- * if construction of SystemMember fails
- *
* @since GemFire 6.5
*/
- protected SystemMemberImpl(AdminDistributedSystem system,
- InternalDistributedMember member)
- throws AdminException {
+ protected SystemMemberImpl(AdminDistributedSystem system, InternalDistributedMember member)
+ throws AdminException {
this(system);
updateByInternalDistributedMember(member);
}
// -------------------------------------------------------------------------
- // Attribute accessors and mutators
+ // Attribute accessors and mutators
// -------------------------------------------------------------------------
/**
- * Returns a <code>Config</code> object with the appropriate default
- * values for a newly-created system member.
+ * Returns a <code>Config</code> object with the appropriate default values for a newly-created
+ * system member.
*/
protected Config getDefaultConfig() {
Properties props = new Properties();
@@ -145,7 +135,7 @@ implements org.apache.geode.admin.SystemMember,
public final AdminDistributedSystem getDistributedSystem() {
return this.system;
}
-
+
public final InternalDistributedMember getInternalId() {
return internalId;
}
@@ -157,39 +147,42 @@ implements org.apache.geode.admin.SystemMember,
public final String getName() {
return this.name;
}
-
+
public String getHost() {
return this.host;
}
-
+
public final InetAddress getHostAddress() {
return InetAddressUtil.toInetAddress(this.getHost());
}
// -------------------------------------------------------------------------
- // Operations
+ // Operations
// -------------------------------------------------------------------------
-
+
public final String getLog() {
String childTail = null;
String mainTail = null;
GemFireVM vm = getGemFireVM();
if (vm != null) {
String[] log = vm.getSystemLogs();
- if (log != null && log.length > 0) mainTail = log[0];
- if (log != null && log.length > 1) childTail = log[1];
+ if (log != null && log.length > 0)
+ mainTail = log[0];
+ if (log != null && log.length > 1)
+ childTail = log[1];
}
-
+
if (childTail == null && mainTail == null) {
- return LocalizedStrings.SystemMemberImpl_NO_LOG_FILE_CONFIGURED_LOG_MESSAGES_WILL_BE_DIRECTED_TO_STDOUT.toLocalizedString();
- }
- else {
+ return LocalizedStrings.SystemMemberImpl_NO_LOG_FILE_CONFIGURED_LOG_MESSAGES_WILL_BE_DIRECTED_TO_STDOUT
+ .toLocalizedString();
+ } else {
StringBuffer result = new StringBuffer();
if (mainTail != null) {
result.append(mainTail);
}
if (childTail != null) {
- result.append("\n" + LocalizedStrings.SystemMemberImpl_TAIL_OF_CHILD_LOG.toLocalizedString() + "\n");
+ result.append(
+ "\n" + LocalizedStrings.SystemMemberImpl_TAIL_OF_CHILD_LOG.toLocalizedString() + "\n");
result.append(childTail);
}
return result.toString();
@@ -198,27 +191,28 @@ implements org.apache.geode.admin.SystemMember,
public final java.util.Properties getLicense() {
GemFireVM vm = getGemFireVM();
- if (vm == null) return null;
+ if (vm == null)
+ return null;
return new Properties();
}
public final String getVersion() {
GemFireVM vm = getGemFireVM();
- if (vm == null) return null;
+ if (vm == null)
+ return null;
return vm.getVersionInfo();
}
- public StatisticResource[] getStat(String statisticsTypeName)
- throws org.apache.geode.admin.AdminException {
+ public StatisticResource[] getStat(String statisticsTypeName)
+ throws org.apache.geode.admin.AdminException {
StatisticResource[] res = new StatisticResource[0];
if (this.vm != null) {
res = getStatsImpl(this.vm.getStats(statisticsTypeName));
}
- return res.length==0 ? null : res;
+ return res.length == 0 ? null : res;
}
- public StatisticResource[] getStats()
- throws org.apache.geode.admin.AdminException {
+ public StatisticResource[] getStats() throws org.apache.geode.admin.AdminException {
StatisticResource[] statsImpl = new StatisticResource[0];
if (this.vm != null) {
statsImpl = getStatsImpl(this.vm.getStats(null));
@@ -236,11 +230,10 @@ implements org.apache.geode.admin.SystemMember,
}
}
- public final SystemMemberCache getCache()
- throws org.apache.geode.admin.AdminException
- {
+ public final SystemMemberCache getCache() throws org.apache.geode.admin.AdminException {
GemFireVM vm = getGemFireVM(); // fix for bug 33505
- if (vm == null) return null;
+ if (vm == null)
+ return null;
try {
return createSystemMemberCache(vm);
@@ -251,55 +244,55 @@ implements org.apache.geode.admin.SystemMember,
return null;
}
}
-
- public void refreshConfig()
- throws org.apache.geode.admin.AdminException {
+
+ public void refreshConfig() throws org.apache.geode.admin.AdminException {
GemFireVM vm = getGemFireVM();
- if (vm == null) return;
+ if (vm == null)
+ return;
refreshConfig(vm.getConfig());
}
-
+
/**
- * Sets the value of this system member's distribution-related
- * configuration based on the given <code>Config</code> object.
+ * Sets the value of this system member's distribution-related configuration based on the given
+ * <code>Config</code> object.
*/
- public final void refreshConfig(Config config)
- throws org.apache.geode.admin.AdminException {
+ public final void refreshConfig(Config config) throws org.apache.geode.admin.AdminException {
if (config == null) {
- throw new AdminException(LocalizedStrings.SystemMemberImpl_FAILED_TO_REFRESH_CONFIGURATION_PARAMETERS_FOR_0.toLocalizedString(new Object[] {getId()}));
+ throw new AdminException(
+ LocalizedStrings.SystemMemberImpl_FAILED_TO_REFRESH_CONFIGURATION_PARAMETERS_FOR_0
+ .toLocalizedString(new Object[] {getId()}));
}
-
+
String[] names = config.getAttributeNames();
if (names == null || names.length < 1) {
- throw new AdminException(LocalizedStrings.SystemMemberImpl_FAILED_TO_REFRESH_CONFIGURATION_PARAMETERS_FOR_0.toLocalizedString(new Object[] {getId()}));
+ throw new AdminException(
+ LocalizedStrings.SystemMemberImpl_FAILED_TO_REFRESH_CONFIGURATION_PARAMETERS_FOR_0
+ .toLocalizedString(new Object[] {getId()}));
}
-
+
for (int i = 0; i < names.length; i++) {
String name = names[i];
Object value = config.getAttributeObject(name);
if (value != null) {
- ConfigurationParameter parm = createConfigurationParameter(
- name, // name
- config.getAttributeDescription(name), // description
- value, // value
- config.getAttributeType(name), // valueType
- config.isAttributeModifiable(name) ); // isModifiable
+ ConfigurationParameter parm = createConfigurationParameter(name, // name
+ config.getAttributeDescription(name), // description
+ value, // value
+ config.getAttributeType(name), // valueType
+ config.isAttributeModifiable(name)); // isModifiable
((ConfigurationParameterImpl) parm).addConfigurationParameterListener(this);
this.parms.put(name, parm);
}
}
}
-
+
public final ConfigurationParameter[] getConfiguration() {
- ConfigurationParameter[] array =
- new ConfigurationParameter[this.parms.size()];
+ ConfigurationParameter[] array = new ConfigurationParameter[this.parms.size()];
this.parms.values().toArray(array);
return array;
}
-
- public ConfigurationParameter[]
- setConfiguration(ConfigurationParameter[] parms)
- throws AdminException {
+
+ public ConfigurationParameter[] setConfiguration(ConfigurationParameter[] parms)
+ throws AdminException {
for (int i = 0; i < parms.length; i++) {
ConfigurationParameter parm = parms[i];
@@ -308,7 +301,7 @@ implements org.apache.geode.admin.SystemMember,
GemFireVM vm = getGemFireVM();
if (vm != null) {
- // update internal vm's config...
+ // update internal vm's config...
Config config = vm.getConfig();
for (int i = 0; i < parms.length; i++) {
config.setAttributeObject(parms[i].getName(), parms[i].getValue(), ConfigSource.runtime());
@@ -318,19 +311,19 @@ implements org.apache.geode.admin.SystemMember,
return this.getConfiguration();
}
-
+
public SystemMemberType getType() {
return SystemMemberType.APPLICATION;
}
-
+
// -------------------------------------------------------------------------
- // Listener callbacks
+ // Listener callbacks
// -------------------------------------------------------------------------
-
+
// -- org.apache.geode.admin.internal.ConfigurationParameterListener ---
public void configurationParameterValueChanged(ConfigurationParameter parm) {
try {
- setConfiguration(new ConfigurationParameter[] { parm });
+ setConfiguration(new ConfigurationParameter[] {parm});
} catch (org.apache.geode.admin.AdminException e) {
// this shouldn't occur since this is a config listener method...
logger.warn(e.getMessage(), e);
@@ -338,18 +331,18 @@ implements org.apache.geode.admin.SystemMember,
} catch (java.lang.Exception e) {
logger.warn(e.getMessage(), e);
}
-// catch (java.lang.RuntimeException e) {
-// logWriter.warning(e);
-// throw e;
-// }
+ // catch (java.lang.RuntimeException e) {
+ // logWriter.warning(e);
+ // throw e;
+ // }
catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -358,32 +351,30 @@ implements org.apache.geode.admin.SystemMember,
throw e;
}
}
-
+
// -------------------------------------------------------------------------
- // Overridden method(s) from java.lang.Object
+ // Overridden method(s) from java.lang.Object
// -------------------------------------------------------------------------
-
+
@Override
public String toString() {
return getName();
}
-
+
// -------------------------------------------------------------------------
- // Template methods with default behavior impl'ed. Override if needed.
+ // Template methods with default behavior impl'ed. Override if needed.
// -------------------------------------------------------------------------
-
+
/**
- * Returns the <code>GemFireVM</code> that underlies this
- * <code>SystemMember</code>.
+ * Returns the <code>GemFireVM</code> that underlies this <code>SystemMember</code>.
*/
protected final GemFireVM getGemFireVM() {
return this.vm;
}
/**
- * Sets the <code>GemFireVM</code> that underlies this
- * <code>SystemMember</code>. This method is used when a member,
- * such as a cache server, is started by the admin API.
+ * Sets the <code>GemFireVM</code> that underlies this <code>SystemMember</code>. This method is
+ * used when a member, such as a cache server, is started by the admin API.
*/
void setGemFireVM(GemFireVM vm) throws AdminException {
this.vm = vm;
@@ -410,23 +401,19 @@ implements org.apache.geode.admin.SystemMember,
}
/**
- * Updates this SystemMember instance using the corresponding
- * InternalDistributedMember
+ * Updates this SystemMember instance using the corresponding InternalDistributedMember
+ *
+ * @param member InternalDistributedMember instance to update this SystemMember
*
- * @param member
- * InternalDistributedMember instance to update this SystemMember
- *
* @since GemFire 6.5
*/
- private void updateByInternalDistributedMember(
- InternalDistributedMember member) {
+ private void updateByInternalDistributedMember(InternalDistributedMember member) {
if (member != null) {
this.internalId = member;
- this.id = this.internalId.toString();
- this.host = this.internalId.getHost();
- this.name = this.internalId.getName();
- if (this.name == null ||
- DistributionConfig.DEFAULT_NAME.equals(this.name)) {
+ this.id = this.internalId.toString();
+ this.host = this.internalId.getHost();
+ this.name = this.internalId.getName();
+ if (this.name == null || DistributionConfig.DEFAULT_NAME.equals(this.name)) {
/*
* name could be null & referring to description of a fix for 32877
*/
@@ -434,52 +421,47 @@ implements org.apache.geode.admin.SystemMember,
}
}
}
-
+
/**
* Template method for creating {@link StatisticResource}.
*
- * @param stat the internal stat resource to wrap with {@link StatisticResource}
+ * @param stat the internal stat resource to wrap with {@link StatisticResource}
* @return new impl instance of {@link StatisticResource}
*/
protected StatisticResource createStatisticResource(StatResource stat)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
return new StatisticResourceImpl(stat, this);
}
-
+
/**
* Template method for creating {@link ConfigurationParameter}.
*
- * @param name the name of this parameter which cannot change
- * @param description full description to use
- * @param value the value of this parameter
- * @param type the class type of the value
- * @param userModifiable true if this is modifiable; false if read-only
+ * @param name the name of this parameter which cannot change
+ * @param description full description to use
+ * @param value the value of this parameter
+ * @param type the class type of the value
+ * @param userModifiable true if this is modifiable; false if read-only
* @return new impl instance of {@link ConfigurationParameter}
*/
- protected ConfigurationParameter createConfigurationParameter(String name,
- String description,
- Object value,
- Class type,
- boolean userModifiable) {
- return new ConfigurationParameterImpl(
- name, description, value, type, userModifiable);
- }
-
+ protected ConfigurationParameter createConfigurationParameter(String name, String description,
+ Object value, Class type, boolean userModifiable) {
+ return new ConfigurationParameterImpl(name, description, value, type, userModifiable);
+ }
+
/**
* Template method for creating {@link SystemMemberCache}.
*
- * @param vm the GemFire vm to retrieve cache info from
+ * @param vm the GemFire vm to retrieve cache info from
* @return new impl instance of {@link SystemMemberCache}
*/
protected SystemMemberCache createSystemMemberCache(GemFireVM vm)
- throws org.apache.geode.admin.AdminException
- {
+ throws org.apache.geode.admin.AdminException {
return new SystemMemberCacheImpl(vm);
}
/** Wrap the internal stats with impls of {@link StatisticResource} */
protected StatisticResource[] getStatsImpl(StatResource[] stats)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
List statList = new ArrayList();
for (int i = 0; i < stats.length; i++) {
statList.add(createStatisticResource(stats[i]));
@@ -497,9 +479,9 @@ implements org.apache.geode.admin.SystemMember,
}
return roleNames;
}
-
+
public DistributedMember getDistributedMember() {
- return this.internalId;
+ return this.internalId;
}
}
[38/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 0299615..c90a7a4 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -100,91 +98,75 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
public static final String PEOPLE_REGION_NAME = "People";
- //private static RestTemplate restTemplate;
-
- private static final String findAllPeopleQuery = "/queries?id=findAllPeople&q=SELECT%20*%20FROM%20/People";
- private static final String findPeopleByGenderQuery = "/queries?id=filterByGender&q=SELECT%20*%20from%20/People%20where%20gender=$1";
- private static final String findPeopleByLastNameQuery = "/queries?id=filterByLastName&q=SELECT%20*%20from%20/People%20where%20lastName=$1";
-
- private static final String[] PARAM_QUERY_IDS_ARRAY = { "findAllPeople",
- "filterByGender", "filterByLastName" };
-
- final static String QUERY_ARGS = "["
- + "{"
- + "\"@type\": \"string\","
- + "\"@value\": \"Patel\""
- + "}"
- + "]";
-
- final static String PERSON_AS_JSON_CAS = "{"
- + "\"@old\" :"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 101," + " \"firstName\": \"Mithali\","
- + " \"middleName\": \"Dorai\"," + " \"lastName\": \"Raj\","
- + " \"birthDate\": \"12/04/1982\"," + "\"gender\": \"FEMALE\""
- + "},"
- + "\"@new\" :"
- + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 1101," + " \"firstName\": \"Virat\","
- + " \"middleName\": \"Premkumar\"," + " \"lastName\": \"Kohli\","
- + " \"birthDate\": \"08/11/1988\"," + "\"gender\": \"MALE\""
- + "}"
- + "}";
-
- final static String PERSON_AS_JSON_REPLACE = "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 501," + " \"firstName\": \"Barack\","
- + " \"middleName\": \"Hussein\"," + " \"lastName\": \"Obama\","
- + " \"birthDate\": \"04/08/1961\"," + "\"gender\": \"MALE\""
- + "}";
+ // private static RestTemplate restTemplate;
+
+ private static final String findAllPeopleQuery =
+ "/queries?id=findAllPeople&q=SELECT%20*%20FROM%20/People";
+ private static final String findPeopleByGenderQuery =
+ "/queries?id=filterByGender&q=SELECT%20*%20from%20/People%20where%20gender=$1";
+ private static final String findPeopleByLastNameQuery =
+ "/queries?id=filterByLastName&q=SELECT%20*%20from%20/People%20where%20lastName=$1";
+
+ private static final String[] PARAM_QUERY_IDS_ARRAY =
+ {"findAllPeople", "filterByGender", "filterByLastName"};
+
+ final static String QUERY_ARGS =
+ "[" + "{" + "\"@type\": \"string\"," + "\"@value\": \"Patel\"" + "}" + "]";
+
+ final static String PERSON_AS_JSON_CAS = "{" + "\"@old\" :" + "{"
+ + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\"," + "\"id\": 101,"
+ + " \"firstName\": \"Mithali\"," + " \"middleName\": \"Dorai\"," + " \"lastName\": \"Raj\","
+ + " \"birthDate\": \"12/04/1982\"," + "\"gender\": \"FEMALE\"" + "}," + "\"@new\" :" + "{"
+ + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\"," + "\"id\": 1101,"
+ + " \"firstName\": \"Virat\"," + " \"middleName\": \"Premkumar\","
+ + " \"lastName\": \"Kohli\"," + " \"birthDate\": \"08/11/1988\"," + "\"gender\": \"MALE\""
+ + "}" + "}";
+
+ final static String PERSON_AS_JSON_REPLACE =
+ "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\"," + "\"id\": 501,"
+ + " \"firstName\": \"Barack\"," + " \"middleName\": \"Hussein\","
+ + " \"lastName\": \"Obama\"," + " \"birthDate\": \"04/08/1961\"," + "\"gender\": \"MALE\""
+ + "}";
private static final String PERSON_LIST_AS_JSON = "[" + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 3," + " \"firstName\": \"Nishka3\","
- + " \"middleName\": \"Nilkanth3\"," + " \"lastName\": \"Patel3\","
- + " \"birthDate\": \"07/31/2009\"," + "\"gender\": \"FEMALE\"" + "},"
- + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 4," + " \"firstName\": \"Tanay4\","
- + " \"middleName\": \"kiran4\"," + " \"lastName\": \"Patel4\","
- + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}," + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 5," + " \"firstName\": \"Nishka5\","
- + " \"middleName\": \"Nilkanth5\"," + " \"lastName\": \"Patel5\","
- + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\"" + "},"
- + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 6," + " \"firstName\": \"Tanay6\","
- + " \"middleName\": \"Kiran6\"," + " \"lastName\": \"Patel\","
- + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}," + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 7," + " \"firstName\": \"Nishka7\","
- + " \"middleName\": \"Nilkanth7\"," + " \"lastName\": \"Patel\","
- + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\"" + "},"
- + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 8," + " \"firstName\": \"Tanay8\","
- + " \"middleName\": \"kiran8\"," + " \"lastName\": \"Patel\","
- + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}," + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 9," + " \"firstName\": \"Nishka9\","
- + " \"middleName\": \"Nilkanth9\"," + " \"lastName\": \"Patel\","
- + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\"" + "},"
- + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 10," + " \"firstName\": \"Tanay10\","
- + " \"middleName\": \"kiran10\"," + " \"lastName\": \"Patel\","
- + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}," + "{"
- + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 11," + " \"firstName\": \"Nishka11\","
- + " \"middleName\": \"Nilkanth11\"," + " \"lastName\": \"Patel\","
- + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\"" + "},"
- + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
- + "\"id\": 12," + " \"firstName\": \"Tanay12\","
- + " \"middleName\": \"kiran12\"," + " \"lastName\": \"Patel\","
- + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\"" + "}" + "]";
+ + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\"," + "\"id\": 3,"
+ + " \"firstName\": \"Nishka3\"," + " \"middleName\": \"Nilkanth3\","
+ + " \"lastName\": \"Patel3\"," + " \"birthDate\": \"07/31/2009\"," + "\"gender\": \"FEMALE\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
+ + "\"id\": 4," + " \"firstName\": \"Tanay4\"," + " \"middleName\": \"kiran4\","
+ + " \"lastName\": \"Patel4\"," + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
+ + "\"id\": 5," + " \"firstName\": \"Nishka5\"," + " \"middleName\": \"Nilkanth5\","
+ + " \"lastName\": \"Patel5\"," + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
+ + "\"id\": 6," + " \"firstName\": \"Tanay6\"," + " \"middleName\": \"Kiran6\","
+ + " \"lastName\": \"Patel\"," + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
+ + "\"id\": 7," + " \"firstName\": \"Nishka7\"," + " \"middleName\": \"Nilkanth7\","
+ + " \"lastName\": \"Patel\"," + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
+ + "\"id\": 8," + " \"firstName\": \"Tanay8\"," + " \"middleName\": \"kiran8\","
+ + " \"lastName\": \"Patel\"," + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
+ + "\"id\": 9," + " \"firstName\": \"Nishka9\"," + " \"middleName\": \"Nilkanth9\","
+ + " \"lastName\": \"Patel\"," + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
+ + "\"id\": 10," + " \"firstName\": \"Tanay10\"," + " \"middleName\": \"kiran10\","
+ + " \"lastName\": \"Patel\"," + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
+ + "\"id\": 11," + " \"firstName\": \"Nishka11\"," + " \"middleName\": \"Nilkanth11\","
+ + " \"lastName\": \"Patel\"," + " \"birthDate\": \"31/09/2009\"," + "\"gender\": \"FEMALE\""
+ + "}," + "{" + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
+ + "\"id\": 12," + " \"firstName\": \"Tanay12\"," + " \"middleName\": \"kiran12\","
+ + " \"lastName\": \"Patel\"," + " \"birthDate\": \"23/08/2012\"," + "\"gender\": \"MALE\""
+ + "}" + "]";
public RestAPIsAndInterOpsDUnitTest() {
super();
- this.helper = new ManagementTestBase() {{}};
+ this.helper = new ManagementTestBase() {
+ {
+ }
+ };
}
@@ -198,19 +180,19 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
disconnectAllFromDS();
}
- public String startBridgeServerWithRestService(final String hostName, final String[] groups, final String locators, final String[] regions,
- final ServerLoadProbe probe) {
+ public String startBridgeServerWithRestService(final String hostName, final String[] groups,
+ final String locators, final String[] regions, final ServerLoadProbe probe) {
final int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();
- //create Cache of given VM and start HTTP service with REST APIs service
+ // create Cache of given VM and start HTTP service with REST APIs service
startBridgeServer(hostName, serverPort, groups, locators, regions, probe);
return "http://" + hostName + ":" + serverPort + urlContext + "/v1";
}
@SuppressWarnings("deprecation")
- protected int startBridgeServer(String hostName, int restServicerPort, final String[] groups, final String locators, final String[] regions,
- final ServerLoadProbe probe) {
+ protected int startBridgeServer(String hostName, int restServicerPort, final String[] groups,
+ final String locators, final String[] regions, final ServerLoadProbe probe) {
Properties props = new Properties();
props.setProperty(MCAST_PORT, String.valueOf(0));
@@ -249,12 +231,17 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
assertNotNull(cache);
Region<String, Object> region = cache.getRegion(PEOPLE_REGION_NAME);
- //put person object
- final Person person1 = new Person(101L, "Mithali", "Dorai", "Raj", DateTimeUtils.createDate(1982, Calendar.DECEMBER, 4), Gender.FEMALE);
- final Person person2 = new Person(102L, "Sachin", "Ramesh", "Tendulkar", DateTimeUtils.createDate(1975, Calendar.DECEMBER, 14), Gender.MALE);
- final Person person3 = new Person(103L, "Saurabh", "Baburav", "Ganguly", DateTimeUtils.createDate(1972, Calendar.AUGUST, 29), Gender.MALE);
- final Person person4 = new Person(104L, "Rahul", "subrymanyam", "Dravid", DateTimeUtils.createDate(1979, Calendar.MARCH, 17), Gender.MALE);
- final Person person5 = new Person(105L, "Jhulan", "Chidambaram", "Goswami", DateTimeUtils.createDate(1983, Calendar.NOVEMBER, 25), Gender.FEMALE);
+ // put person object
+ final Person person1 = new Person(101L, "Mithali", "Dorai", "Raj",
+ DateTimeUtils.createDate(1982, Calendar.DECEMBER, 4), Gender.FEMALE);
+ final Person person2 = new Person(102L, "Sachin", "Ramesh", "Tendulkar",
+ DateTimeUtils.createDate(1975, Calendar.DECEMBER, 14), Gender.MALE);
+ final Person person3 = new Person(103L, "Saurabh", "Baburav", "Ganguly",
+ DateTimeUtils.createDate(1972, Calendar.AUGUST, 29), Gender.MALE);
+ final Person person4 = new Person(104L, "Rahul", "subrymanyam", "Dravid",
+ DateTimeUtils.createDate(1979, Calendar.MARCH, 17), Gender.MALE);
+ final Person person5 = new Person(105L, "Jhulan", "Chidambaram", "Goswami",
+ DateTimeUtils.createDate(1983, Calendar.NOVEMBER, 25), Gender.FEMALE);
region.put("1", person1);
region.put("2", person2);
@@ -262,18 +249,29 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
region.put("4", person4);
region.put("5", person5);
- final Person person6 = new Person(101L, "Rahul", "Rajiv", "Gndhi", DateTimeUtils.createDate(1970, Calendar.MAY, 14), Gender.MALE);
- final Person person7 = new Person(102L, "Narendra", "Damodar", "Modi", DateTimeUtils.createDate(1945, Calendar.DECEMBER, 24), Gender.MALE);
- final Person person8 = new Person(103L, "Atal", "Bihari", "Vajpayee", DateTimeUtils.createDate(1920, Calendar.AUGUST, 9), Gender.MALE);
- final Person person9 = new Person(104L, "Soniya", "Rajiv", "Gandhi", DateTimeUtils.createDate(1929, Calendar.MARCH, 27), Gender.FEMALE);
- final Person person10 = new Person(104L, "Priyanka", "Robert", "Gandhi", DateTimeUtils.createDate(1973, Calendar.APRIL, 15), Gender.FEMALE);
-
- final Person person11 = new Person(104L, "Murali", "Manohar", "Joshi", DateTimeUtils.createDate(1923, Calendar.APRIL, 25), Gender.MALE);
- final Person person12 = new Person(104L, "Lalkrishna", "Parmhansh", "Advani", DateTimeUtils.createDate(1910, Calendar.JANUARY, 01), Gender.MALE);
- final Person person13 = new Person(104L, "Shushma", "kumari", "Swaraj", DateTimeUtils.createDate(1943, Calendar.AUGUST, 10), Gender.FEMALE);
- final Person person14 = new Person(104L, "Arun", "raman", "jetly", DateTimeUtils.createDate(1942, Calendar.OCTOBER, 27), Gender.MALE);
- final Person person15 = new Person(104L, "Amit", "kumar", "shah", DateTimeUtils.createDate(1958, Calendar.DECEMBER, 21), Gender.MALE);
- final Person person16 = new Person(104L, "Shila", "kumari", "Dixit", DateTimeUtils.createDate(1927, Calendar.FEBRUARY, 15), Gender.FEMALE);
+ final Person person6 = new Person(101L, "Rahul", "Rajiv", "Gndhi",
+ DateTimeUtils.createDate(1970, Calendar.MAY, 14), Gender.MALE);
+ final Person person7 = new Person(102L, "Narendra", "Damodar", "Modi",
+ DateTimeUtils.createDate(1945, Calendar.DECEMBER, 24), Gender.MALE);
+ final Person person8 = new Person(103L, "Atal", "Bihari", "Vajpayee",
+ DateTimeUtils.createDate(1920, Calendar.AUGUST, 9), Gender.MALE);
+ final Person person9 = new Person(104L, "Soniya", "Rajiv", "Gandhi",
+ DateTimeUtils.createDate(1929, Calendar.MARCH, 27), Gender.FEMALE);
+ final Person person10 = new Person(104L, "Priyanka", "Robert", "Gandhi",
+ DateTimeUtils.createDate(1973, Calendar.APRIL, 15), Gender.FEMALE);
+
+ final Person person11 = new Person(104L, "Murali", "Manohar", "Joshi",
+ DateTimeUtils.createDate(1923, Calendar.APRIL, 25), Gender.MALE);
+ final Person person12 = new Person(104L, "Lalkrishna", "Parmhansh", "Advani",
+ DateTimeUtils.createDate(1910, Calendar.JANUARY, 01), Gender.MALE);
+ final Person person13 = new Person(104L, "Shushma", "kumari", "Swaraj",
+ DateTimeUtils.createDate(1943, Calendar.AUGUST, 10), Gender.FEMALE);
+ final Person person14 = new Person(104L, "Arun", "raman", "jetly",
+ DateTimeUtils.createDate(1942, Calendar.OCTOBER, 27), Gender.MALE);
+ final Person person15 = new Person(104L, "Amit", "kumar", "shah",
+ DateTimeUtils.createDate(1958, Calendar.DECEMBER, 21), Gender.MALE);
+ final Person person16 = new Person(104L, "Shila", "kumari", "Dixit",
+ DateTimeUtils.createDate(1927, Calendar.FEBRUARY, 15), Gender.FEMALE);
Map<String, Object> userMap = new HashMap<String, Object>();
userMap.put("6", person6);
@@ -338,8 +336,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
HttpEntity entity = listAllQueriesResponse.getEntity();
InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- content));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(content));
String line;
StringBuffer sb = new StringBuffer();
while ((line = reader.readLine()) != null) {
@@ -352,14 +349,13 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
JSONObject jsonObject = new JSONObject(sb.toString());
JSONArray jsonArray = jsonObject.getJSONArray("queries");
for (int i = 0; i < jsonArray.length(); i++) {
- assertTrue(
- "PREPARE_PARAMETERIZED_QUERY: function IDs are not matched",
- Arrays.asList(PARAM_QUERY_IDS_ARRAY).contains(
- jsonArray.getJSONObject(i).getString("id")));
+ assertTrue("PREPARE_PARAMETERIZED_QUERY: function IDs are not matched", Arrays
+ .asList(PARAM_QUERY_IDS_ARRAY).contains(jsonArray.getJSONObject(i).getString("id")));
}
}
- // Query TestCase-3 :: Run the specified named query passing in scalar values for query parameters.
+ // Query TestCase-3 :: Run the specified named query passing in scalar values for query
+ // parameters.
{
currentQueryOp = "filterByLastName";
CloseableHttpClient httpclient = HttpClients.createDefault();
@@ -384,7 +380,8 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
Region<String, Object> region = cache.getRegion(PEOPLE_REGION_NAME);
{
- Person expectedPerson = new Person(3L, "Nishka3", "Nilkanth3", "Patel3", DateTimeUtils.createDate(2009, Calendar.JULY, 31), Gender.FEMALE);
+ Person expectedPerson = new Person(3L, "Nishka3", "Nilkanth3", "Patel3",
+ DateTimeUtils.createDate(2009, Calendar.JULY, 31), Gender.FEMALE);
Object value = region.get("3");
if (value instanceof PdxInstance) {
PdxInstance pi3 = (PdxInstance) value;
@@ -396,32 +393,32 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
assertEquals(actualPerson.getBirthDate(), expectedPerson.getBirthDate());
assertEquals(actualPerson.getGender(), expectedPerson.getGender());
} else if (value instanceof Person) {
- fail("VerifyUpdatesInClientCache, Get on key 3, Expected to get value of type PdxInstance ");
+ fail(
+ "VerifyUpdatesInClientCache, Get on key 3, Expected to get value of type PdxInstance ");
}
}
- //TODO: uncomment it once following issue encountered in put?op=CAS is fixed or document the issue
+ // TODO: uncomment it once following issue encountered in put?op=CAS is fixed or document the
+ // issue
// CAS functionality is not working in following test case
// step-1: Java client, Region.put("K", A);
- //Step-2: Rest CAS request for key "K" with data "@old" = A. CAS is failing as existing PdxInstance in cache and
- // PdxInstance generated from JSON (CAS request) does not match as their value's type are getting changed
+ // Step-2: Rest CAS request for key "K" with data "@old" = A. CAS is failing as existing
+ // PdxInstance in cache and
+ // PdxInstance generated from JSON (CAS request) does not match as their value's type are
+ // getting changed
/*
- //verify update on key "1"
+ * //verify update on key "1" { Object obj = region.get("1"); if (obj instanceof PdxInstance) {
+ * PdxInstance pi = (PdxInstance)obj; Person p1 = (Person)pi.getObject();
+ * System.out.println("Nilkanth1 : verifyUpdatesInClientCache() : GET ON KEY=1" +
+ * p1.toString()); }else {
+ * System.out.println("Nilkanth1 : verifyUpdatesInClientCache() GET ON KEY=1 returned OBJECT: "
+ * + obj.toString()); } }
+ */
+
+ // verify update on key "2"
{
- Object obj = region.get("1");
- if (obj instanceof PdxInstance) {
- PdxInstance pi = (PdxInstance)obj;
- Person p1 = (Person)pi.getObject();
- System.out.println("Nilkanth1 : verifyUpdatesInClientCache() : GET ON KEY=1" + p1.toString());
- }else {
- System.out.println("Nilkanth1 : verifyUpdatesInClientCache() GET ON KEY=1 returned OBJECT: " + obj.toString());
- }
- }
- */
-
- //verify update on key "2"
- {
- Person expectedPerson = new Person(501L, "Barack", "Hussein", "Obama", DateTimeUtils.createDate(1961, Calendar.APRIL, 8), Gender.MALE);
+ Person expectedPerson = new Person(501L, "Barack", "Hussein", "Obama",
+ DateTimeUtils.createDate(1961, Calendar.APRIL, 8), Gender.MALE);
Object value = region.get("2");
if (value instanceof PdxInstance) {
PdxInstance pi3 = (PdxInstance) value;
@@ -433,11 +430,12 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
assertEquals(actualPerson.getBirthDate(), expectedPerson.getBirthDate());
assertEquals(actualPerson.getGender(), expectedPerson.getGender());
} else {
- fail("VerifyUpdatesInClientCache, Get on key 2, Expected to get value of type PdxInstance ");
+ fail(
+ "VerifyUpdatesInClientCache, Get on key 2, Expected to get value of type PdxInstance ");
}
}
- //verify Deleted key "13"
+ // verify Deleted key "13"
{
Object obj = region.get("13");
assertEquals(obj, null);
@@ -455,13 +453,12 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
}
public void doUpdatesUsingRestApis(String restEndpoint) {
- //UPdate keys using REST calls
+ // UPdate keys using REST calls
{
try {
CloseableHttpClient httpclient = HttpClients.createDefault();
- HttpPut put = new HttpPut(restEndpoint
- + "/People/3,4,5,6,7,8,9,10,11,12");
+ HttpPut put = new HttpPut(restEndpoint + "/People/3,4,5,6,7,8,9,10,11,12");
put.addHeader("Content-Type", "application/json");
put.addHeader("Accept", "application/json");
StringEntity entity = new StringEntity(PERSON_LIST_AS_JSON);
@@ -472,7 +469,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
}
}
- //Delete Single keys
+ // Delete Single keys
{
try {
CloseableHttpClient httpclient = HttpClients.createDefault();
@@ -485,7 +482,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
}
}
- //Delete set of keys
+ // Delete set of keys
{
try {
CloseableHttpClient httpclient = HttpClients.createDefault();
@@ -498,34 +495,29 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
}
}
- //REST put?op=CAS for key 1
+ // REST put?op=CAS for key 1
/*
- try {
- {
- HttpEntity<Object> entity = new HttpEntity<Object>(PERSON_AS_JSON_CAS, headers);
- ResponseEntity<String> result = RestTestUtils.getRestTemplate().exchange(
- restEndpoint + "/People/1?op=cas",
- HttpMethod.PUT, entity, String.class);
- }
- } catch (HttpClientErrorException e) {
-
- fail("Caught HttpClientErrorException while doing put with op=cas");
- }catch (HttpServerErrorException se) {
- fail("Caught HttpServerErrorException while doing put with op=cas");
- }
- */
-
- //REST put?op=REPLACE for key 2
+ * try { { HttpEntity<Object> entity = new HttpEntity<Object>(PERSON_AS_JSON_CAS, headers);
+ * ResponseEntity<String> result = RestTestUtils.getRestTemplate().exchange( restEndpoint +
+ * "/People/1?op=cas", HttpMethod.PUT, entity, String.class); } } catch
+ * (HttpClientErrorException e) {
+ *
+ * fail("Caught HttpClientErrorException while doing put with op=cas"); }catch
+ * (HttpServerErrorException se) {
+ * fail("Caught HttpServerErrorException while doing put with op=cas"); }
+ */
+
+ // REST put?op=REPLACE for key 2
{
- /*HttpEntity<Object> entity = new HttpEntity<Object>(PERSON_AS_JSON_REPLACE, headers);
- ResponseEntity<String> result = RestTestUtils.getRestTemplate().exchange(
- restEndpoint + "/People/2?op=replace",
- HttpMethod.PUT, entity, String.class);*/
+ /*
+ * HttpEntity<Object> entity = new HttpEntity<Object>(PERSON_AS_JSON_REPLACE, headers);
+ * ResponseEntity<String> result = RestTestUtils.getRestTemplate().exchange( restEndpoint +
+ * "/People/2?op=replace", HttpMethod.PUT, entity, String.class);
+ */
try {
CloseableHttpClient httpclient = HttpClients.createDefault();
- HttpPut put = new HttpPut(restEndpoint
- + "/People/2?op=replace");
+ HttpPut put = new HttpPut(restEndpoint + "/People/2?op=replace");
put.addHeader("Content-Type", "application/json");
put.addHeader("Accept", "application/json");
StringEntity entity = new StringEntity(PERSON_AS_JSON_REPLACE);
@@ -548,21 +540,20 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
response = httpclient.execute(get);
HttpEntity entity = response.getEntity();
InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- content));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(content));
String line;
StringBuffer str = new StringBuffer();
while ((line = reader.readLine()) != null) {
str.append(line);
}
- //validate the satus code
+ // validate the satus code
assertEquals(response.getStatusLine().getStatusCode(), 200);
if (response.getStatusLine().getStatusCode() == 200) {
JSONArray jsonArray = new JSONArray(str.toString());
- //verify total number of REST service endpoints in DS
+ // verify total number of REST service endpoints in DS
assertEquals(jsonArray.length(), 2);
}
@@ -581,12 +572,12 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
public void doGetsUsingRestApis(String restEndpoint) {
- //HttpHeaders headers = setAcceptAndContentTypeHeaders();
+ // HttpHeaders headers = setAcceptAndContentTypeHeaders();
String currentOperation = null;
JSONObject jObject;
JSONArray jArray;
try {
- //1. Get on key="1" and validate result.
+ // 1. Get on key="1" and validate result.
{
currentOperation = "GET on key 1";
@@ -598,8 +589,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
HttpEntity entity = response.getEntity();
InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- content));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(content));
String line;
StringBuffer str = new StringBuffer();
while ((line = reader.readLine()) != null) {
@@ -615,7 +605,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
assertEquals(jObject.get("gender"), Gender.FEMALE.name());
}
- //2. Get on key="16" and validate result.
+ // 2. Get on key="16" and validate result.
{
currentOperation = "GET on key 16";
@@ -627,8 +617,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
HttpEntity entity = response.getEntity();
InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- content));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(content));
String line;
StringBuffer str = new StringBuffer();
while ((line = reader.readLine()) != null) {
@@ -644,7 +633,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
assertEquals(jObject.get("gender"), Gender.FEMALE.name());
}
- //3. Get all (getAll) entries in Region
+ // 3. Get all (getAll) entries in Region
{
HttpGet get = new HttpGet(restEndpoint + "/People");
@@ -657,8 +646,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
HttpEntity entity = result.getEntity();
InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- content));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(content));
String line;
StringBuffer sb = new StringBuffer();
while ((line = reader.readLine()) != null) {
@@ -675,7 +663,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
}
}
- //4. GetAll?limit=10 (10 entries) and verify results
+ // 4. GetAll?limit=10 (10 entries) and verify results
{
HttpGet get = new HttpGet(restEndpoint + "/People?limit=10");
get.addHeader("Content-Type", "application/json");
@@ -687,8 +675,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
HttpEntity entity = response.getEntity();
InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- content));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(content));
String line;
StringBuffer str = new StringBuffer();
while ((line = reader.readLine()) != null) {
@@ -704,7 +691,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
}
}
- //5. Get keys - List all keys in region
+ // 5. Get keys - List all keys in region
{
HttpGet get = new HttpGet(restEndpoint + "/People/keys");
@@ -717,8 +704,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
HttpEntity entity = response.getEntity();
InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- content));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(content));
String line;
StringBuffer str = new StringBuffer();
while ((line = reader.readLine()) != null) {
@@ -734,7 +720,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
}
}
- //6. Get data for specific keys
+ // 6. Get data for specific keys
{
HttpGet get = new HttpGet(restEndpoint + "/People/1,3,5,7,9,11");
@@ -747,8 +733,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
HttpEntity entity = response.getEntity();
InputStream content = entity.getContent();
- BufferedReader reader = new BufferedReader(new InputStreamReader(
- content));
+ BufferedReader reader = new BufferedReader(new InputStreamReader(content));
String line;
StringBuffer str = new StringBuffer();
while ((line = reader.readLine()) != null) {
@@ -772,8 +757,8 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
public void createRegionInClientCache() {
ClientCache cache = GemFireCacheImpl.getInstance();
assertNotNull(cache);
- ClientRegionFactory<String, Object> crf = cache
- .createClientRegionFactory(ClientRegionShortcut.PROXY);
+ ClientRegionFactory<String, Object> crf =
+ cache.createClientRegionFactory(ClientRegionShortcut.PROXY);
Region<String, Object> region = crf.create(PEOPLE_REGION_NAME);
}
@@ -782,8 +767,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
Cache cache = GemFireCacheImpl.getInstance();
assertNotNull(cache);
- RegionFactory<String, Object> rf = cache
- .createRegionFactory(RegionShortcut.REPLICATE);
+ RegionFactory<String, Object> rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
Region<String, Object> region = rf.create(PEOPLE_REGION_NAME);
}
@@ -811,12 +795,14 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
String locators = locatorHostName + "[" + locatorPort + "]";
// start manager (peer cache)
- manager.invoke(() -> startManager(/* groups */null, locators, new String[] { REGION_NAME }, CacheServer.DEFAULT_LOAD_PROBE));
+ manager.invoke(() -> startManager(/* groups */null, locators, new String[] {REGION_NAME},
+ CacheServer.DEFAULT_LOAD_PROBE));
- //start startCacheServer With RestService enabled
+ // start startCacheServer With RestService enabled
final String serverHostName = server.getHost().getHostName();
- String restEndpoint = (String) server.invoke(() -> startBridgeServerWithRestService(serverHostName, null, locators
- , new String[] { REGION_NAME }, CacheServer.DEFAULT_LOAD_PROBE));
+ String restEndpoint =
+ (String) server.invoke(() -> startBridgeServerWithRestService(serverHostName, null,
+ locators, new String[] {REGION_NAME}, CacheServer.DEFAULT_LOAD_PROBE));
// create a client cache
client.invoke(() -> createClientCache(locatorHostName, locatorPort));
@@ -829,18 +815,18 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
// do some person puts from clientcache
client.invoke(() -> doPutsInClientCache());
- //TEST: fetch all available REST endpoints
+ // TEST: fetch all available REST endpoints
fetchRestServerEndpoints(restEndpoint);
// Controller VM - config REST Client and make HTTP calls
doGetsUsingRestApis(restEndpoint);
- //update Data using REST APIs
+ // update Data using REST APIs
doUpdatesUsingRestApis(restEndpoint);
client.invoke(() -> verifyUpdatesInClientCache());
- //Querying
+ // Querying
doQueryOpsUsingRestApis(restEndpoint);
// stop the client and make sure the bridge server notifies
@@ -854,18 +840,16 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
private void createClientCache(final String host, final int port) throws Exception {
// Connect using the GemFire locator and create a Caching_Proxy cache
- ClientCache c = new ClientCacheFactory().setPdxReadSerialized(true).addPoolLocator(host, port)
- .create();
+ ClientCache c =
+ new ClientCacheFactory().setPdxReadSerialized(true).addPoolLocator(host, port).create();
- c.createClientRegionFactory(
- ClientRegionShortcut.PROXY).create(REGION_NAME);
+ c.createClientRegionFactory(ClientRegionShortcut.PROXY).create(REGION_NAME);
}
- private int startManager(final String[] groups, final String locators, final String[] regions
- , final ServerLoadProbe probe) throws IOException {
+ private int startManager(final String[] groups, final String locators, final String[] regions,
+ final ServerLoadProbe probe) throws IOException {
Properties props = new Properties();
- props
- .setProperty(MCAST_PORT, String.valueOf(0));
+ props.setProperty(MCAST_PORT, String.valueOf(0));
props.setProperty(LOCATORS, locators);
props.setProperty(JMX_MANAGER, "true");
@@ -873,7 +857,7 @@ public class RestAPIsAndInterOpsDUnitTest extends LocatorTestBase {
props.setProperty(JMX_MANAGER_PORT, "0");
final int httpPort = AvailablePortHelper.getRandomAvailableTCPPort();
- //Set REST service related configuration
+ // Set REST service related configuration
props.setProperty(START_DEV_REST_API, "true");
props.setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
props.setProperty(HTTP_SERVICE_PORT, String.valueOf(httpPort));
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
index 75eedd5..eae528c 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnGroupsFunctionExecutionDUnitTest.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -58,13 +56,19 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
}
private void setupCacheWithGroupsAndFunction() {
- restURLs.add(vm0.invoke("createCacheWithGroups", () -> createCacheWithGroups(vm0.getHost().getHostName(), "g0,gm", urlContext)));
- restURLs.add(vm1.invoke("createCacheWithGroups", () -> createCacheWithGroups(vm1.getHost().getHostName(), "g1", urlContext)));
- restURLs.add(vm2.invoke("createCacheWithGroups", () -> createCacheWithGroups(vm2.getHost().getHostName(), "g0,g1", urlContext)));
-
- vm0.invoke("registerFunction(new OnGroupsFunction())", () -> FunctionService.registerFunction(new OnGroupsFunction()));
- vm1.invoke("registerFunction(new OnGroupsFunction())", () -> FunctionService.registerFunction(new OnGroupsFunction()));
- vm2.invoke("registerFunction(new OnGroupsFunction())", () -> FunctionService.registerFunction(new OnGroupsFunction()));
+ restURLs.add(vm0.invoke("createCacheWithGroups",
+ () -> createCacheWithGroups(vm0.getHost().getHostName(), "g0,gm", urlContext)));
+ restURLs.add(vm1.invoke("createCacheWithGroups",
+ () -> createCacheWithGroups(vm1.getHost().getHostName(), "g1", urlContext)));
+ restURLs.add(vm2.invoke("createCacheWithGroups",
+ () -> createCacheWithGroups(vm2.getHost().getHostName(), "g0,g1", urlContext)));
+
+ vm0.invoke("registerFunction(new OnGroupsFunction())",
+ () -> FunctionService.registerFunction(new OnGroupsFunction()));
+ vm1.invoke("registerFunction(new OnGroupsFunction())",
+ () -> FunctionService.registerFunction(new OnGroupsFunction()));
+ vm2.invoke("registerFunction(new OnGroupsFunction())",
+ () -> FunctionService.registerFunction(new OnGroupsFunction()));
}
@Test
@@ -72,7 +76,8 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
setupCacheWithGroupsAndFunction();
for (int i = 0; i < 10; i++) {
- CloseableHttpResponse response = executeFunctionThroughRestCall("OnGroupsFunction", null, null, null, "g0,g1", null);
+ CloseableHttpResponse response =
+ executeFunctionThroughRestCall("OnGroupsFunction", null, null, null, "g0,g1", null);
assertHttpResponse(response, 200, 3);
}
@@ -86,9 +91,11 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
public void testonGroupsExecutionOnAllMembersWithFilter() {
setupCacheWithGroupsAndFunction();
- //Execute function randomly (in iteration) on all available (per VM) REST end-points and verify its result
+ // Execute function randomly (in iteration) on all available (per VM) REST end-points and verify
+ // its result
for (int i = 0; i < 10; i++) {
- CloseableHttpResponse response = executeFunctionThroughRestCall("OnGroupsFunction", null, "someKey", null, "g1", null);
+ CloseableHttpResponse response =
+ executeFunctionThroughRestCall("OnGroupsFunction", null, "someKey", null, "g1", null);
assertHttpResponse(response, 500, 0);
}
@@ -100,22 +107,25 @@ public class RestAPIsOnGroupsFunctionExecutionDUnitTest extends RestAPITestBase
public void testBasicP2PFunctionSelectedGroup() {
setupCacheWithGroupsAndFunction();
- //Step-3 : Execute function randomly (in iteration) on all available (per VM) REST end-points and verify its result
+ // Step-3 : Execute function randomly (in iteration) on all available (per VM) REST end-points
+ // and verify its result
for (int i = 0; i < 5; i++) {
- CloseableHttpResponse response = executeFunctionThroughRestCall("OnGroupsFunction", null, null, null, "no%20such%20group", null);
+ CloseableHttpResponse response = executeFunctionThroughRestCall("OnGroupsFunction", null,
+ null, null, "no%20such%20group", null);
assertHttpResponse(response, 500, 0);
}
assertCorrectInvocationCount(0, vm0, vm1, vm2);
for (int i = 0; i < 5; i++) {
- CloseableHttpResponse response = executeFunctionThroughRestCall("OnGroupsFunction", null, null, null, "gm", null);
+ CloseableHttpResponse response =
+ executeFunctionThroughRestCall("OnGroupsFunction", null, null, null, "gm", null);
assertHttpResponse(response, 200, 1);
}
assertCorrectInvocationCount(5, vm0, vm1, vm2);
- resetInvocationCounts(vm0,vm1,vm2);
+ resetInvocationCounts(vm0, vm1, vm2);
restURLs.clear();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index 64fbba6..3907bfc 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -1,18 +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
+ * 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.rest.internal.web.controllers;
@@ -63,7 +61,8 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
Cache c = null;
try {
- c = CacheFactory.getInstance(new RestAPIsOnMembersFunctionExecutionDUnitTest().getSystem(props));
+ c = CacheFactory
+ .getInstance(new RestAPIsOnMembersFunctionExecutionDUnitTest().getSystem(props));
c.close();
} catch (CacheClosedException ignore) {
}
@@ -86,7 +85,8 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
createCacheForVMs();
for (int i = 0; i < 10; i++) {
- CloseableHttpResponse response = executeFunctionThroughRestCall("OnMembersFunction", null, null, null, null, null);
+ CloseableHttpResponse response =
+ executeFunctionThroughRestCall("OnMembersFunction", null, null, null, null, null);
assertHttpResponse(response, 200, 4);
}
@@ -96,14 +96,14 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
}
private void createCacheForVMs() {
- restURLs.add(vm0.invoke("createCacheAndRegisterFunction", () -> createCacheAndRegisterFunction(vm0.getHost()
- .getHostName(), "m1")));
- restURLs.add(vm1.invoke("createCacheAndRegisterFunction", () -> createCacheAndRegisterFunction(vm1.getHost()
- .getHostName(), "m2")));
- restURLs.add(vm2.invoke("createCacheAndRegisterFunction", () -> createCacheAndRegisterFunction(vm2.getHost()
- .getHostName(), "m3")));
- restURLs.add(vm3.invoke("createCacheAndRegisterFunction", () -> createCacheAndRegisterFunction(vm3.getHost()
- .getHostName(), "m4")));
+ restURLs.add(vm0.invoke("createCacheAndRegisterFunction",
+ () -> createCacheAndRegisterFunction(vm0.getHost().getHostName(), "m1")));
+ restURLs.add(vm1.invoke("createCacheAndRegisterFunction",
+ () -> createCacheAndRegisterFunction(vm1.getHost().getHostName(), "m2")));
+ restURLs.add(vm2.invoke("createCacheAndRegisterFunction",
+ () -> createCacheAndRegisterFunction(vm2.getHost().getHostName(), "m3")));
+ restURLs.add(vm3.invoke("createCacheAndRegisterFunction",
+ () -> createCacheAndRegisterFunction(vm3.getHost().getHostName(), "m4")));
}
@Test
@@ -111,7 +111,8 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
createCacheForVMs();
for (int i = 0; i < 10; i++) {
- CloseableHttpResponse response = executeFunctionThroughRestCall("OnMembersFunction", null, null, null, null, "m1,m2,m3");
+ CloseableHttpResponse response =
+ executeFunctionThroughRestCall("OnMembersFunction", null, null, null, null, "m1,m2,m3");
assertHttpResponse(response, 200, 3);
}
@@ -125,7 +126,8 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
createCacheForVMs();
for (int i = 0; i < 10; i++) {
- CloseableHttpResponse response = executeFunctionThroughRestCall("OnMembersFunction", null, "key2", null, null, "m1,m2,m3");
+ CloseableHttpResponse response =
+ executeFunctionThroughRestCall("OnMembersFunction", null, "key2", null, null, "m1,m2,m3");
assertHttpResponse(response, 500, 0);
}
[17/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
index 5ff4bfa..1bfddf2 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -49,26 +47,25 @@ import java.util.concurrent.atomic.AtomicInteger;
/**
* Provides MBean support for managing a GemFire distributed system.
* <p>
- * TODO: refactor to implement DistributedSystem and delegate to instance of
- * DistributedSystemImpl. Wrap all delegate calls w/ e.printStackTrace() since
- * the HttpAdaptor devours them (what to do w/ template methods then?)
+ * TODO: refactor to implement DistributedSystem and delegate to instance of DistributedSystemImpl.
+ * Wrap all delegate calls w/ e.printStackTrace() since the HttpAdaptor devours them (what to do w/
+ * template methods then?)
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
-public class AdminDistributedSystemJmxImpl
- extends AdminDistributedSystemImpl
- implements ManagedResource, DistributedSystemConfig, StatAlertsAggregator {
+public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
+ implements ManagedResource, DistributedSystemConfig, StatAlertsAggregator {
private static final Logger logger = LogService.getLogger();
-
+
private Properties mailProps;
// The file name where the StatAlertDefinitions would be serialized
private String statAlertDefnSerFile = System.getProperty("user.dir");
-
- /**
- * Simple counter incrementing on each notification. This this currently
- * resets at every restart of Agent
+
+ /**
+ * Simple counter incrementing on each notification. This this currently resets at every restart
+ * of Agent
*/
private final AtomicInteger notificationSequenceNumber = new AtomicInteger();
@@ -78,8 +75,7 @@ public class AdminDistributedSystemJmxImpl
private volatile boolean isRmiClientCountZero;
/**
- * Variable to indicate if Statistics Alert definitions could be persisted
- * across runs/sessions.
+ * Variable to indicate if Statistics Alert definitions could be persisted across runs/sessions.
*/
private volatile boolean canPersistStatAlertDefs = true;
@@ -87,15 +83,13 @@ public class AdminDistributedSystemJmxImpl
private CacheAndRegionListenerImpl cacheRegionListener;
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
-
+
/**
- * Constructs new DistributedSystemJmxImpl and registers an MBean to represent
- * it.
+ * Constructs new DistributedSystemJmxImpl and registers an MBean to represent it.
*
- * @param config
- * configuration defining the JMX agent.
+ * @param config configuration defining the JMX agent.
*/
public AdminDistributedSystemJmxImpl(AgentConfigImpl config)
throws org.apache.geode.admin.AdminException {
@@ -116,12 +110,9 @@ public class AdminDistributedSystemJmxImpl
private void initMailProps(AgentConfigImpl config) {
mailProps = new Properties();
- mailProps.put(MailManager.PROPERTY_MAIL_FROM,
- config.getEmailNotificationFrom());
- mailProps.put(MailManager.PROPERTY_MAIL_HOST,
- config.getEmailNotificationHost());
- mailProps.put(MailManager.PROPERTY_MAIL_TO_LIST,
- config.getEmailNotificationToList());
+ mailProps.put(MailManager.PROPERTY_MAIL_FROM, config.getEmailNotificationFrom());
+ mailProps.put(MailManager.PROPERTY_MAIL_HOST, config.getEmailNotificationHost());
+ mailProps.put(MailManager.PROPERTY_MAIL_TO_LIST, config.getEmailNotificationToList());
}
private void initStateSaveFile(AgentConfigImpl agentConfig) {
@@ -129,23 +120,23 @@ public class AdminDistributedSystemJmxImpl
AgentConfigImpl impl = (AgentConfigImpl) agentConfig;
File propFile = impl.getPropertyFile();
- if (propFile!=null) {
- if (propFile.isDirectory()) {
- statAlertDefnSerFile = propFile.getAbsolutePath();
- } else if (propFile.getParentFile()!=null) {
- statAlertDefnSerFile = propFile.getParentFile().getAbsolutePath();
- }
+ if (propFile != null) {
+ if (propFile.isDirectory()) {
+ statAlertDefnSerFile = propFile.getAbsolutePath();
+ } else if (propFile.getParentFile() != null) {
+ statAlertDefnSerFile = propFile.getParentFile().getAbsolutePath();
+ }
}
statAlertDefnSerFile = statAlertDefnSerFile + File.separator + agentConfig.getStateSaveFile();
}
-
+
// -------------------------------------------------------------------------
- // MBean operations
+ // MBean operations
// -------------------------------------------------------------------------
-
+
/**
- * Registers the MBeans for monitoring the health of GemFire
+ * Registers the MBeans for monitoring the health of GemFire
*
* @see org.apache.geode.admin.internal.AdminDistributedSystemImpl#getGemFireHealth
*/
@@ -156,49 +147,37 @@ public class AdminDistributedSystemJmxImpl
}
/**
- * Creates a new DistributionLocator for this system and registers an MBean
- * for managing it.
+ * Creates a new DistributionLocator for this system and registers an MBean for managing it.
* <p>
- * If the Locator already exists, then this will simply register an MBean
- * for it.
+ * If the Locator already exists, then this will simply register an MBean for it.
*
- * @param host the host name or IP address of the locator
- * @param port the port the locator service listens on
- * @param workingDirectory directory path for the locator and its log
- * @param productDirectory directory path to the GemFire product to use
+ * @param host the host name or IP address of the locator
+ * @param port the port the locator service listens on
+ * @param workingDirectory directory path for the locator and its log
+ * @param productDirectory directory path to the GemFire product to use
*/
- public ObjectName createDistributionLocator(String host,
- int port,
- String workingDirectory,
- String productDirectory)
- throws MalformedObjectNameException {
- return createDistributionLocator(
- host, port, workingDirectory, productDirectory, getRemoteCommand());
- }
-
+ public ObjectName createDistributionLocator(String host, int port, String workingDirectory,
+ String productDirectory) throws MalformedObjectNameException {
+ return createDistributionLocator(host, port, workingDirectory, productDirectory,
+ getRemoteCommand());
+ }
+
/**
- * Creates a new DistributionLocator for this system and registers an MBean
- * for managing it.
+ * Creates a new DistributionLocator for this system and registers an MBean for managing it.
* <p>
- * If the Locator already exists, then this will simply register an MBean
- * for it.
+ * If the Locator already exists, then this will simply register an MBean for it.
*
- * @param host the host name or IP address of the locator
- * @param port the port the locator service listens on
- * @param workingDirectory directory path for the locator and its log
- * @param productDirectory directory path to the GemFire product to use
- * @param remoteCommand formatted remote command to control remotely
+ * @param host the host name or IP address of the locator
+ * @param port the port the locator service listens on
+ * @param workingDirectory directory path for the locator and its log
+ * @param productDirectory directory path to the GemFire product to use
+ * @param remoteCommand formatted remote command to control remotely
*/
- public ObjectName createDistributionLocator(String host,
- int port,
- String workingDirectory,
- String productDirectory,
- String remoteCommand)
- throws MalformedObjectNameException {
+ public ObjectName createDistributionLocator(String host, int port, String workingDirectory,
+ String productDirectory, String remoteCommand) throws MalformedObjectNameException {
try {
- DistributionLocatorJmxImpl locator =
- (DistributionLocatorJmxImpl) addDistributionLocator();
-
+ DistributionLocatorJmxImpl locator = (DistributionLocatorJmxImpl) addDistributionLocator();
+
DistributionLocatorConfig config = locator.getConfig();
config.setHost(host);
config.setPort(port);
@@ -212,12 +191,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -226,28 +205,26 @@ public class AdminDistributedSystemJmxImpl
throw e;
}
}
-
+
// -------------------------------------------------------------------------
- // Template methods overriden from superclass...
+ // Template methods overriden from superclass...
// -------------------------------------------------------------------------
-
+
/** Override createSystemMember by instantiating SystemMemberJmxImpl */
@Override
protected SystemMember createSystemMember(ApplicationVM app)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
return new SystemMemberJmxImpl(this, app);
}
/**
- * Constructs & returns a SystemMember instance using the corresponding
- * InternalDistributedMember object.
+ * Constructs & returns a SystemMember instance using the corresponding InternalDistributedMember
+ * object.
*
- * @param member
- * InternalDistributedMember instance for which a SystemMember
- * instance is to be constructed.
+ * @param member InternalDistributedMember instance for which a SystemMember instance is to be
+ * constructed.
* @return constructed SystemMember instance
- * @throws org.apache.geode.admin.AdminException
- * if construction of SystemMember instance fails
+ * @throws org.apache.geode.admin.AdminException if construction of SystemMember instance fails
*
* @since GemFire 6.5
*/
@@ -255,43 +232,43 @@ public class AdminDistributedSystemJmxImpl
throws org.apache.geode.admin.AdminException {
return new SystemMemberJmxImpl(this, member);
}
-
+
@Override
- protected CacheServer createCacheServer(ApplicationVM member)
- throws AdminException {
+ protected CacheServer createCacheServer(ApplicationVM member) throws AdminException {
return new CacheServerJmxImpl(this, member);
}
@Override
- protected CacheServer createCacheServer(CacheServerConfigImpl config)
- throws AdminException {
+ protected CacheServer createCacheServer(CacheServerConfigImpl config) throws AdminException {
return new CacheServerJmxImpl(this, config);
}
/** Override createGemFireHealth by instantiating GemFireHealthJmxImpl */
@Override
- protected GemFireHealth createGemFireHealth(GfManagerAgent system)
- throws org.apache.geode.admin.AdminException {
+ protected GemFireHealth createGemFireHealth(GfManagerAgent system)
+ throws org.apache.geode.admin.AdminException {
if (system == null) {
- throw new IllegalStateException(LocalizedStrings.AdminDistributedSystemJmxImpl_GFMANAGERAGENT_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalStateException(
+ LocalizedStrings.AdminDistributedSystemJmxImpl_GFMANAGERAGENT_MUST_NOT_BE_NULL
+ .toLocalizedString());
}
return new GemFireHealthJmxImpl(system, this);
}
-
+
/** Template-method for creating a DistributionLocatorImpl instance. */
@Override
- protected DistributionLocatorImpl
- createDistributionLocatorImpl(DistributionLocatorConfig config) {
+ protected DistributionLocatorImpl createDistributionLocatorImpl(
+ DistributionLocatorConfig config) {
return new DistributionLocatorJmxImpl(config, this);
}
// -------------------------------------------------------------------------
- // Internal Admin listeners and JMX Notifications
+ // Internal Admin listeners and JMX Notifications
// -------------------------------------------------------------------------
-
+
/** Notification type for indicating system member joined */
public static final String NOTIF_MEMBER_JOINED =
DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.member.joined";
@@ -310,61 +287,71 @@ public class AdminDistributedSystemJmxImpl
/** Notification type for indicating abnormal disconnection from the distributed system */
public static final String NOTIF_ADMIN_SYSTEM_DISCONNECT =
DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.disconnect";
-
-
+
+
private static final String EML_SUBJ_PRFX_GFE_ALERT = "[GemFire Alert] ";
private static final String EML_SUBJ_PRFX_GFE_NOTFY = "[GemFire Notification] ";
private static final String EML_SUBJ_ITEM_GFE_DS = "Distributed System: ";
// --------- org.apache.geode.internal.admin.JoinLeaveListener ---------
- /**
+ /**
* Listener callback for when a member has joined this DistributedSystem.
* <p>
- * React by creating an MBean for managing the SystemMember and then fire
- * a Notification with the internal Id of the member VM.
+ * React by creating an MBean for managing the SystemMember and then fire a Notification with the
+ * internal Id of the member VM.
*
- * @param source the distributed system that fired nodeJoined
- * @param joined the VM that joined
+ * @param source the distributed system that fired nodeJoined
+ * @param joined the VM that joined
* @see org.apache.geode.internal.admin.JoinLeaveListener#nodeJoined
*/
@Override
public void nodeJoined(GfManagerAgent source, GemFireVM joined) {
try {
super.nodeJoined(source, joined);
-
- /* super.nodeJoined results in creation of a new SystemMember which
- * registers itself as an MBean, so now we try to find it...
+
+ /*
+ * super.nodeJoined results in creation of a new SystemMember which registers itself as an
+ * MBean, so now we try to find it...
*/
SystemMember member = findSystemMember(joined);
-
- if(null == member) {
+
+ if (null == member) {
if (logger.isDebugEnabled()) {
- logger.debug("AdminDistributedSystemJmxImpl.nodeJoined(), Could not find SystemMember for VM {}", joined);
+ logger.debug(
+ "AdminDistributedSystemJmxImpl.nodeJoined(), Could not find SystemMember for VM {}",
+ joined);
}
return;
}
-
+
try {
if (logger.isDebugEnabled()) {
logger.debug("Processing node joined for: {}", member);
logger.debug("RemoteGemFireVM.nodeJoined(), setting alerts manager *************");
}
setAlertsManager(joined);
-
- this.modelMBean.sendNotification(new Notification(
- NOTIF_MEMBER_JOINED,
- ((ManagedResource)member).getObjectName(), // Pass the ObjName of the Source Member
- notificationSequenceNumber.addAndGet(1),
- joined.getId().toString()));
-
-// String mess = "Gemfire AlertNotification: System Member Joined, System member Id: " + joined.getId().toString();
-// sendEmail("Gemfire AlertNotification: Member Joined, ID: " + joined.getId().toString(), mess);
+
+ this.modelMBean.sendNotification(
+ new Notification(NOTIF_MEMBER_JOINED, ((ManagedResource) member).getObjectName(), // Pass
+ // the
+ // ObjName
+ // of
+ // the
+ // Source
+ // Member
+ notificationSequenceNumber.addAndGet(1), joined.getId().toString()));
+
+ // String mess = "Gemfire AlertNotification: System Member Joined, System member Id: " +
+ // joined.getId().toString();
+ // sendEmail("Gemfire AlertNotification: Member Joined, ID: " + joined.getId().toString(),
+ // mess);
if (isEmailNotificationEnabled) {
- String mess = LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_JOINED_THE_DISTRIBUTED_SYSTEM_MEMBER_ID_0.toLocalizedString(new Object[] {joined.getId().toString()} );
- sendEmail(
- EML_SUBJ_PRFX_GFE_NOTFY + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
- + LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_JOINED.toLocalizedString() +">",
- mess);
+ String mess =
+ LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_JOINED_THE_DISTRIBUTED_SYSTEM_MEMBER_ID_0
+ .toLocalizedString(new Object[] {joined.getId().toString()});
+ sendEmail(EML_SUBJ_PRFX_GFE_NOTFY + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
+ + LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_JOINED.toLocalizedString()
+ + ">", mess);
}
} catch (javax.management.MBeanException e) {
logger.warn(e.getMessage(), e);
@@ -374,12 +361,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -388,15 +375,15 @@ public class AdminDistributedSystemJmxImpl
throw e;
}
}
-
- /**
+
+ /**
* Listener callback for when a member has left this DistributedSystem.
* <p>
- * React by removing the member's MBean.
- * Also fire a Notification with the internal Id of the member VM.
+ * React by removing the member's MBean. Also fire a Notification with the internal Id of the
+ * member VM.
*
- * @param source the distributed system that fired nodeLeft
- * @param left the VM that left
+ * @param source the distributed system that fired nodeLeft
+ * @param left the VM that left
* @see org.apache.geode.internal.admin.JoinLeaveListener#nodeLeft
*/
@Override
@@ -408,26 +395,33 @@ public class AdminDistributedSystemJmxImpl
logger.debug("Processing node left for: {}", member);
}
try {
- this.modelMBean.sendNotification(new Notification(
- NOTIF_MEMBER_LEFT,
- ((ManagedResource)member).getObjectName(), // Pass the ObjName of the Source Member
- notificationSequenceNumber.addAndGet(1),
- left.getId().toString()));
-
-// String mess = "Gemfire AlertNotification: System Member Left the system, System member Id: " + left.getId().toString();
-// sendEmail("Gemfire AlertNotification: Member Left, ID: " + left.getId().toString(), mess);
+ this.modelMBean.sendNotification(
+ new Notification(NOTIF_MEMBER_LEFT, ((ManagedResource) member).getObjectName(), // Pass
+ // the
+ // ObjName
+ // of
+ // the
+ // Source
+ // Member
+ notificationSequenceNumber.addAndGet(1), left.getId().toString()));
+
+ // String mess = "Gemfire AlertNotification: System Member Left the system, System member
+ // Id: " + left.getId().toString();
+ // sendEmail("Gemfire AlertNotification: Member Left, ID: " + left.getId().toString(),
+ // mess);
if (isEmailNotificationEnabled) {
- String mess = LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_LEFT_THE_DISTRIBUTED_SYSTEM_MEMBER_ID_0.toLocalizedString(new Object[] {left.getId().toString()} );
- sendEmail(
- EML_SUBJ_PRFX_GFE_NOTFY + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
- + LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_LEFT.toLocalizedString() +">",
- mess);
+ String mess =
+ LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_LEFT_THE_DISTRIBUTED_SYSTEM_MEMBER_ID_0
+ .toLocalizedString(new Object[] {left.getId().toString()});
+ sendEmail(EML_SUBJ_PRFX_GFE_NOTFY + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
+ + LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_LEFT.toLocalizedString()
+ + ">", mess);
}
- } catch (javax.management.MBeanException e) {
+ } catch (javax.management.MBeanException e) {
logger.warn(e.getMessage(), e);
}
-
- SystemMemberType memberType = member.getType();
+
+ SystemMemberType memberType = member.getType();
if (/* member != null && */ memberType.isApplication() || memberType.isCacheVm()) {
// automatically unregister the MBean...
MBeanUtil.unregisterMBean((ManagedResource) member);
@@ -437,12 +431,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -451,13 +445,13 @@ public class AdminDistributedSystemJmxImpl
throw e;
}
}
-
- /**
+
+ /**
* Listener callback for when a member of this DistributedSystem has crashed.
* <p>
* Also fires a Notification with the internal Id of the member VM.
*
- * @param source the distributed system that fired nodeCrashed
+ * @param source the distributed system that fired nodeCrashed
* @param crashed the VM that crashed
* @see org.apache.geode.internal.admin.JoinLeaveListener#nodeCrashed
*/
@@ -470,22 +464,29 @@ public class AdminDistributedSystemJmxImpl
if (logger.isDebugEnabled()) {
logger.debug("Processing node crash for: {}", member);
}
-
+
try {
- this.modelMBean.sendNotification(new Notification(
- NOTIF_MEMBER_CRASHED,
- ((ManagedResource)member).getObjectName(), // Pass the ObjName of the Source Member
- notificationSequenceNumber.addAndGet(1),
- crashed.getId().toString()));
-
-// String mess = "Gemfire AlertNotification: System Member Crashed, System member Id: " + crashed.getId().toString();
-// sendEmail("Gemfire AlertNotification: Member Crashed, ID: " + crashed.getId().toString(), mess);
+ this.modelMBean.sendNotification(
+ new Notification(NOTIF_MEMBER_CRASHED, ((ManagedResource) member).getObjectName(), // Pass
+ // the
+ // ObjName
+ // of
+ // the
+ // Source
+ // Member
+ notificationSequenceNumber.addAndGet(1), crashed.getId().toString()));
+
+ // String mess = "Gemfire AlertNotification: System Member Crashed, System member Id: " +
+ // crashed.getId().toString();
+ // sendEmail("Gemfire AlertNotification: Member Crashed, ID: " + crashed.getId().toString(),
+ // mess);
if (isEmailNotificationEnabled) {
- String mess = LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_CRASHED_IN_THE_DISTRIBUTED_SYSTEM_MEMBER_ID_0.toLocalizedString(new Object[] {crashed.getId().toString()} );
- sendEmail(
- EML_SUBJ_PRFX_GFE_ALERT + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
- + LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_CRASHED.toLocalizedString() +">",
- mess);
+ String mess =
+ LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_CRASHED_IN_THE_DISTRIBUTED_SYSTEM_MEMBER_ID_0
+ .toLocalizedString(new Object[] {crashed.getId().toString()});
+ sendEmail(EML_SUBJ_PRFX_GFE_ALERT + EML_SUBJ_ITEM_GFE_DS + getName() + " <"
+ + LocalizedStrings.AdminDistributedSystemJmxImpl_MEMBER_CRASHED.toLocalizedString()
+ + ">", mess);
}
} catch (javax.management.MBeanException e) {
logger.warn(e.getMessage(), e);
@@ -501,12 +502,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -517,9 +518,8 @@ public class AdminDistributedSystemJmxImpl
}
// ----------- org.apache.geode.internal.admin.AlertListener -----------
- /**
- * Listener callback for when a SystemMember of this DistributedSystem has
- * crashed.
+ /**
+ * Listener callback for when a SystemMember of this DistributedSystem has crashed.
* <p>
* Fires a Notification with the information from the alert.
*
@@ -532,17 +532,17 @@ public class AdminDistributedSystemJmxImpl
super.alert(alert);
try {
String strAlert = alert.toString();
- this.modelMBean.sendNotification(new Notification(
- NOTIF_ALERT,
- this.mbeanName,
- notificationSequenceNumber.addAndGet(1),
- strAlert));
-
-// String mess = "Gemfire AlertNotification: System Alert :" + alert.toString();
-// sendEmail("Gemfire AlertNotification: System Alert", mess);
+ this.modelMBean.sendNotification(new Notification(NOTIF_ALERT, this.mbeanName,
+ notificationSequenceNumber.addAndGet(1), strAlert));
+
+ // String mess = "Gemfire AlertNotification: System Alert :" + alert.toString();
+ // sendEmail("Gemfire AlertNotification: System Alert", mess);
if (isEmailNotificationEnabled) {
- String mess = LocalizedStrings.AdminDistributedSystemJmxImpl_SYSTEM_ALERT_FROM_DISTRIBUTED_SYSTEM_0.toLocalizedString(strAlert);
- sendEmail( EML_SUBJ_PRFX_GFE_ALERT + EML_SUBJ_ITEM_GFE_DS + getName() + " <System Alert>", mess);
+ String mess =
+ LocalizedStrings.AdminDistributedSystemJmxImpl_SYSTEM_ALERT_FROM_DISTRIBUTED_SYSTEM_0
+ .toLocalizedString(strAlert);
+ sendEmail(EML_SUBJ_PRFX_GFE_ALERT + EML_SUBJ_ITEM_GFE_DS + getName() + " <System Alert>",
+ mess);
}
} catch (javax.management.MBeanException e) {
logger.warn(e.getMessage(), e);
@@ -552,12 +552,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -566,70 +566,68 @@ public class AdminDistributedSystemJmxImpl
throw e;
}
}
-
+
@Override
public void onDisconnect(InternalDistributedSystem sys) {
if (logger.isDebugEnabled()) {
this.logger.debug("Calling AdminDistributedSystemJmxImpl#onDisconnect");
}
- try {
- super.onDisconnect(sys);
-
- try {
- this.modelMBean.sendNotification(new Notification(
- NOTIF_ADMIN_SYSTEM_DISCONNECT,
- this.mbeanName,
- notificationSequenceNumber.addAndGet(1),
- null));
- } catch (MBeanException e) {
- logger.warn(e.getMessage(), e);
- }
- } catch (RuntimeException e) {
- logger.warn(e.getMessage(), e);
- throw e;
- } catch (VirtualMachineError err) {
- SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
- // now, so don't let this thread continue.
- throw err;
- } catch (Error e) {
- // Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
- // _still_ a possibility that you are dealing with a cascading
- // error condition, so you also need to check to see if the JVM
- // is still usable:
- SystemFailure.checkFailure();
- logger.error(e.getMessage(), e);
- throw e;
- }
- if (logger.isDebugEnabled()) {
- this.logger.debug("Completed AdminDistributedSystemJmxImpl#onDisconnect");
- }
- }
-
+ try {
+ super.onDisconnect(sys);
+
+ try {
+ this.modelMBean.sendNotification(new Notification(NOTIF_ADMIN_SYSTEM_DISCONNECT,
+ this.mbeanName, notificationSequenceNumber.addAndGet(1), null));
+ } catch (MBeanException e) {
+ logger.warn(e.getMessage(), e);
+ }
+ } catch (RuntimeException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
+ } catch (VirtualMachineError err) {
+ SystemFailure.initiateFailure(err);
+ // If this ever returns, rethrow the error. We're poisoned
+ // now, so don't let this thread continue.
+ throw err;
+ } catch (Error e) {
+ // Whenever you catch Error or Throwable, you must also
+ // catch VirtualMachineError (see above). However, there is
+ // _still_ a possibility that you are dealing with a cascading
+ // error condition, so you also need to check to see if the JVM
+ // is still usable:
+ SystemFailure.checkFailure();
+ logger.error(e.getMessage(), e);
+ throw e;
+ }
+ if (logger.isDebugEnabled()) {
+ this.logger.debug("Completed AdminDistributedSystemJmxImpl#onDisconnect");
+ }
+ }
+
// -------------------------------------------------------------------------
- // ManagedResource implementation
+ // ManagedResource implementation
// -------------------------------------------------------------------------
-
+
/** The name of the MBean that will manage this resource */
private String mbeanName;
- /** The remotable ObjectName that the MBean is registered under */
+ /** The remotable ObjectName that the MBean is registered under */
final private ObjectName objectName;
-
+
/** The ModelMBean that is configured to manage this resource */
private ModelMBean modelMBean;
-
- public String getMBeanName() {
- return this.mbeanName;
- }
-
- public ModelMBean getModelMBean() {
- return this.modelMBean;
- }
- public void setModelMBean(ModelMBean modelMBean) {
- this.modelMBean = modelMBean;
- }
+
+ public String getMBeanName() {
+ return this.mbeanName;
+ }
+
+ public ModelMBean getModelMBean() {
+ return this.modelMBean;
+ }
+
+ public void setModelMBean(ModelMBean modelMBean) {
+ this.modelMBean = modelMBean;
+ }
public ObjectName getObjectName() {
return this.objectName;
@@ -638,11 +636,11 @@ public class AdminDistributedSystemJmxImpl
public ManagedResourceType getManagedResourceType() {
return ManagedResourceType.DISTRIBUTED_SYSTEM;
}
-
+
// -------------------------------------------------------------------------
- // Error traps added to overridden methods...
+ // Error traps added to overridden methods...
// -------------------------------------------------------------------------
-
+
@Override
public boolean isRunning() {
try {
@@ -652,12 +650,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (java.lang.Error e) {
+ } catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -676,12 +674,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (java.lang.Error e) {
+ } catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -690,7 +688,7 @@ public class AdminDistributedSystemJmxImpl
throw e;
}
}
-
+
@Override
public void stop() throws AdminException {
try {
@@ -700,12 +698,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (java.lang.Error e) {
+ } catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -716,10 +714,10 @@ public class AdminDistributedSystemJmxImpl
}
@Override
- public boolean waitToBeConnected(long timeout)
- throws InterruptedException {
+ public boolean waitToBeConnected(long timeout) throws InterruptedException {
- if (Thread.interrupted()) throw new InterruptedException();
+ if (Thread.interrupted())
+ throw new InterruptedException();
try {
return super.waitToBeConnected(timeout);
} catch (java.lang.RuntimeException e) {
@@ -727,12 +725,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (java.lang.Error e) {
+ } catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -751,12 +749,12 @@ public class AdminDistributedSystemJmxImpl
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (java.lang.Error e) {
+ } catch (java.lang.Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -766,24 +764,23 @@ public class AdminDistributedSystemJmxImpl
}
}
- public ObjectName manageDistributionLocator()
- throws MalformedObjectNameException {
+ public ObjectName manageDistributionLocator() throws MalformedObjectNameException {
try {
return new ObjectName(((ManagedResource) addDistributionLocator()).getMBeanName());
}
-// catch (AdminException e) { logger.warn(e.getMessage(), e); throw e; }
+ // catch (AdminException e) { logger.warn(e.getMessage(), e); throw e; }
catch (RuntimeException e) {
logger.warn(e.getMessage(), e);
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -793,8 +790,7 @@ public class AdminDistributedSystemJmxImpl
}
}
- public ObjectName[] manageDistributionLocators()
- throws MalformedObjectNameException {
+ public ObjectName[] manageDistributionLocators() throws MalformedObjectNameException {
try {
DistributionLocator[] locs = getDistributionLocators();
ObjectName[] onames = new javax.management.ObjectName[locs.length];
@@ -804,59 +800,58 @@ public class AdminDistributedSystemJmxImpl
}
return onames;
}
- //catch (AdminException e) { logger.warn(e.getMessage(), e); throw e; }
- catch (RuntimeException e) {
- logger.warn(e.getMessage(), e);
- throw e;
+ // catch (AdminException e) { logger.warn(e.getMessage(), e); throw e; }
+ catch (RuntimeException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- logger.error(e.getMessage(), e);
- throw e;
+ logger.error(e.getMessage(), e);
+ throw e;
}
}
-
+
/**
* @deprecated as of 5.7 use {@link #manageCacheVm} instead.
*/
@Deprecated
- public ObjectName manageCacheServer()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName manageCacheServer() throws AdminException, MalformedObjectNameException {
return manageCacheVm();
}
- public ObjectName manageCacheVm()
- throws AdminException, MalformedObjectNameException {
+
+ public ObjectName manageCacheVm() throws AdminException, MalformedObjectNameException {
try {
return new ObjectName(((ManagedResource) addCacheVm()).getMBeanName());
- } catch (AdminException e) {
- logger.warn(e.getMessage(), e);
- throw e;
- } catch (RuntimeException e) {
- logger.warn(e.getMessage(), e);
- throw e;
+ } catch (AdminException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
+ } catch (RuntimeException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
logger.warn(e.getMessage(), e);
- throw e;
+ throw e;
}
}
@@ -864,13 +859,11 @@ public class AdminDistributedSystemJmxImpl
* @deprecated as of 5.7 use {@link #manageCacheVms} instead.
*/
@Deprecated
- public ObjectName[] manageCacheServers()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName[] manageCacheServers() throws AdminException, MalformedObjectNameException {
return manageCacheVms();
}
- public ObjectName[] manageCacheVms()
- throws AdminException, MalformedObjectNameException {
+ public ObjectName[] manageCacheVms() throws AdminException, MalformedObjectNameException {
try {
CacheVm[] mgrs = getCacheVms();
ObjectName[] onames = new javax.management.ObjectName[mgrs.length];
@@ -879,31 +872,31 @@ public class AdminDistributedSystemJmxImpl
onames[i] = new ObjectName(mgr.getMBeanName());
}
return onames;
- } catch (AdminException e) {
- logger.warn(e.getMessage(), e);
- throw e;
- } catch (RuntimeException e) {
- logger.warn(e.getMessage(), e);
- throw e;
+ } catch (AdminException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
+ } catch (RuntimeException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
logger.error(e.getMessage(), e);
- throw e;
+ throw e;
}
}
public ObjectName[] manageSystemMemberApplications()
- throws AdminException, MalformedObjectNameException {
+ throws AdminException, MalformedObjectNameException {
try {
SystemMember[] apps = getSystemMemberApplications();
ObjectName[] onames = new javax.management.ObjectName[apps.length];
@@ -912,73 +905,74 @@ public class AdminDistributedSystemJmxImpl
onames[i] = new ObjectName(app.getMBeanName());
}
return onames;
- } catch (AdminException e) {
- logger.warn(e.getMessage(), e);
- throw e;
- } catch (RuntimeException e) {
- logger.warn(e.getMessage(), e);
- throw e;
+ } catch (AdminException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
+ } catch (RuntimeException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
logger.error(e.getMessage(), e);
- throw e;
+ throw e;
}
}
-
+
/**
- * Return the ObjectName for the SystemMemberMBean representing the
- * specified distributed member or null if the member is not found.
+ * Return the ObjectName for the SystemMemberMBean representing the specified distributed member
+ * or null if the member is not found.
*
* @param distributedMember the distributed member to manage
* @return the ObjectName for the SystemMemberMBean
*/
public ObjectName manageSystemMember(DistributedMember distributedMember)
- throws AdminException, MalformedObjectNameException {
+ throws AdminException, MalformedObjectNameException {
try {
SystemMember member = lookupSystemMember(distributedMember);
- if (member == null) return null;
+ if (member == null)
+ return null;
SystemMemberJmxImpl jmx = (SystemMemberJmxImpl) member;
ObjectName oname = new ObjectName(jmx.getMBeanName());
return oname;
- } catch (AdminException e) {
- logger.warn(e.getMessage(), e);
- throw e;
- } catch (RuntimeException e) {
- logger.warn(e.getMessage(), e);
- throw e;
+ } catch (AdminException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
+ } catch (RuntimeException e) {
+ logger.warn(e.getMessage(), e);
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
logger.error(e.getMessage(), e);
- throw e;
+ throw e;
}
}
-
+
@Override
public void connect(InternalLogWriter logWriter) {
try {
// LOG: passes the AdminDistributedSystemImpl LogWriterLogger into GfManagerAgentConfig
super.connect(logWriter);
-
+
// Load existing StatAlert Definitions
readAlertDefinitionsAsSerializedObjects();
@@ -987,31 +981,31 @@ public class AdminDistributedSystemJmxImpl
logger.debug("Adding CacheAndRegionListener .... ");
}
addCacheListener(cacheRegionListener);
- } catch (RuntimeException e) {
+ } catch (RuntimeException e) {
logger.warn(e.getMessage(), e);
- throw e;
+ throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
logger.error(e.getMessage(), e);
- throw e;
+ throw e;
}
}
-
+
@Override
public void disconnect() {
try {
super.disconnect();
-
+
// Save existing StatAlert Definitions
saveAlertDefinitionsAsSerializedObjects();
@@ -1019,18 +1013,18 @@ public class AdminDistributedSystemJmxImpl
if (logger.isDebugEnabled()) {
logger.debug("Removing CacheAndRegionListener .... ");
}
- removeCacheListener(cacheRegionListener);
- } catch (RuntimeException e) {
+ removeCacheListener(cacheRegionListener);
+ } catch (RuntimeException e) {
logger.warn(e.getMessage(), e);
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, re-throw the error. We're poisoned
+ // If this ever returns, re-throw the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -1043,7 +1037,7 @@ public class AdminDistributedSystemJmxImpl
public void cleanupResource() {
disconnect();
}
-
+
/**
* @return the isRmiClientCountZero
* @since GemFire 6.0
@@ -1058,14 +1052,15 @@ public class AdminDistributedSystemJmxImpl
*/
void setRmiClientCountZero(boolean isRmiClientCountZero) {
this.isRmiClientCountZero = isRmiClientCountZero;
-
+
if (isRmiClientCountZero) {
- logger.info(LocalizedStrings.AdminDistributedSystemJmxImpl_JMX_CLIENT_COUNT_HAS_DROPPED_TO_ZERO);
+ logger.info(
+ LocalizedStrings.AdminDistributedSystemJmxImpl_JMX_CLIENT_COUNT_HAS_DROPPED_TO_ZERO);
}
}
- /////////////////////// Configuration ///////////////////////
+ /////////////////////// Configuration ///////////////////////
public String getEntityConfigXMLFile() {
return this.getConfig().getEntityConfigXMLFile();
@@ -1091,7 +1086,7 @@ public class AdminDistributedSystemJmxImpl
public void setSystemName(final String name) {
this.getConfig().setSystemName(name);
}
-
+
@Override
public boolean getDisableTcp() {
return this.getConfig().getDisableTcp();
@@ -1100,16 +1095,19 @@ public class AdminDistributedSystemJmxImpl
public void setEnableNetworkPartitionDetection(boolean newValue) {
getConfig().setEnableNetworkPartitionDetection(newValue);
}
+
public boolean getEnableNetworkPartitionDetection() {
return getConfig().getEnableNetworkPartitionDetection();
}
+
public int getMemberTimeout() {
- return getConfig().getMemberTimeout();
+ return getConfig().getMemberTimeout();
}
+
public void setMemberTimeout(int value) {
getConfig().setMemberTimeout(value);
}
-
+
@Override
public String getMcastAddress() {
return this.getConfig().getMcastAddress();
@@ -1123,7 +1121,7 @@ public class AdminDistributedSystemJmxImpl
public int getMcastPort() {
return this.getConfig().getMcastPort();
}
-
+
public void setMcastPort(int mcastPort) {
this.getConfig().setMcastPort(mcastPort);
}
@@ -1131,7 +1129,7 @@ public class AdminDistributedSystemJmxImpl
public int getAckWaitThreshold() {
return getConfig().getAckWaitThreshold();
}
-
+
public void setAckWaitThreshold(int seconds) {
getConfig().setAckWaitThreshold(seconds);
}
@@ -1139,7 +1137,7 @@ public class AdminDistributedSystemJmxImpl
public int getAckSevereAlertThreshold() {
return getConfig().getAckSevereAlertThreshold();
}
-
+
public void setAckSevereAlertThreshold(int seconds) {
getConfig().setAckSevereAlertThreshold(seconds);
}
@@ -1153,9 +1151,11 @@ public class AdminDistributedSystemJmxImpl
public void setLocators(String locators) {
this.getConfig().setLocators(locators);
}
-
- /* Note that the getter & setter for membership port range are referred from
- * the super class AdminDistributedSystemImpl */
+
+ /*
+ * Note that the getter & setter for membership port range are referred from the super class
+ * AdminDistributedSystemImpl
+ */
public String getBindAddress() {
return this.getConfig().getBindAddress();
@@ -1164,7 +1164,7 @@ public class AdminDistributedSystemJmxImpl
public void setBindAddress(String bindAddress) {
this.getConfig().setBindAddress(bindAddress);
}
-
+
public String getServerBindAddress() {
return this.getConfig().getServerBindAddress();
}
@@ -1214,7 +1214,7 @@ public class AdminDistributedSystemJmxImpl
public void setSSLAuthenticationRequired(boolean authRequired) {
this.getConfig().setSSLAuthenticationRequired(authRequired);
}
-
+
public Properties getSSLProperties() {
return this.getConfig().getSSLProperties();
}
@@ -1230,7 +1230,7 @@ public class AdminDistributedSystemJmxImpl
public void removeSSLProperty(String key) {
this.getConfig().removeSSLProperty(key);
}
-
+
public String getLogFile() {
return this.getConfig().getLogFile();
}
@@ -1272,12 +1272,10 @@ public class AdminDistributedSystemJmxImpl
}
/*
- * The interval (in seconds) between auto-polling for updating
- * AdminDistributedSystem constituents including SystemMember,
- * SystemMemberCache and StatisticResource. This applies only to the default
- * interval set when the resource is created. Changes to this interval will
- * not get propagated to existing resources but will apply to all new
- * resources
+ * The interval (in seconds) between auto-polling for updating AdminDistributedSystem constituents
+ * including SystemMember, SystemMemberCache and StatisticResource. This applies only to the
+ * default interval set when the resource is created. Changes to this interval will not get
+ * propagated to existing resources but will apply to all new resources
*/
public void setRefreshInterval(int interval) {
this.getConfig().setRefreshInterval(interval);
@@ -1310,13 +1308,12 @@ public class AdminDistributedSystemJmxImpl
public DistributionLocatorConfig[] getDistributionLocatorConfigs() {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
-
+
public DistributionLocatorConfig createDistributionLocatorConfig() {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
- public void removeDistributionLocatorConfig(DistributionLocatorConfig config)
-{
+ public void removeDistributionLocatorConfig(DistributionLocatorConfig config) {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
@@ -1336,45 +1333,52 @@ public class AdminDistributedSystemJmxImpl
public Object clone() throws CloneNotSupportedException {
throw new UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
}
-
+
private static final String[] PERSISTENT_ID_FIELDS = new String[] {"host", "directory", "uuid"};
- private static final String[] PERSISTENT_ID_DESCRIPTIONS = new String[] {"The host that was persisting the missing files", "The directory where the files were persisted", "The unique id for the persistent files"};
+ private static final String[] PERSISTENT_ID_DESCRIPTIONS =
+ new String[] {"The host that was persisting the missing files",
+ "The directory where the files were persisted", "The unique id for the persistent files"};
private final CompositeType PERSISTENT_ID_TYPE;
private final TabularType PERSISTENT_ID_TABLE_TYPE;
-
- {
+
+ {
try {
- PERSISTENT_ID_TYPE = new CompositeType(PersistentID.class.getCanonicalName(), "A single member's a set of persistent files for a region", PERSISTENT_ID_FIELDS, PERSISTENT_ID_DESCRIPTIONS, new OpenType[] {SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
- PERSISTENT_ID_TABLE_TYPE = new TabularType("TABLE_" + PERSISTENT_ID_TYPE.getTypeName(), "A table of persistent member ids", PERSISTENT_ID_TYPE, PERSISTENT_ID_FIELDS);
+ PERSISTENT_ID_TYPE = new CompositeType(PersistentID.class.getCanonicalName(),
+ "A single member's a set of persistent files for a region", PERSISTENT_ID_FIELDS,
+ PERSISTENT_ID_DESCRIPTIONS,
+ new OpenType[] {SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
+ PERSISTENT_ID_TABLE_TYPE = new TabularType("TABLE_" + PERSISTENT_ID_TYPE.getTypeName(),
+ "A table of persistent member ids", PERSISTENT_ID_TYPE, PERSISTENT_ID_FIELDS);
} catch (OpenDataException e) {
throw new ExceptionInInitializerError(e);
}
}
-
+
public TabularData getMissingPersistentMembersJMX() throws AdminException {
-
+
try {
Set<PersistentID> members = super.getMissingPersistentMembers();
TabularData results = new TabularDataSupport(PERSISTENT_ID_TABLE_TYPE);
int index = 0;
- for(PersistentID id : members) {
- CompositeData idData = new CompositeDataSupport(PERSISTENT_ID_TYPE, PERSISTENT_ID_FIELDS, new Object[] {id.getHost().toString(), id.getDirectory(), id.getUUID().toString()});
+ for (PersistentID id : members) {
+ CompositeData idData = new CompositeDataSupport(PERSISTENT_ID_TYPE, PERSISTENT_ID_FIELDS,
+ new Object[] {id.getHost().toString(), id.getDirectory(), id.getUUID().toString()});
results.put(idData);
index++;
}
return results;
- } catch( OpenDataException e) {
+ } catch (OpenDataException e) {
logger.warn("Exception occurred while getting missing persistent members.", e);
throw new AdminException(e);
}
}
- public void revokePersistentMember(String host,
- String directory) throws AdminException, UnknownHostException {
+ public void revokePersistentMember(String host, String directory)
+ throws AdminException, UnknownHostException {
super.revokePersistentMember(InetAddress.getByName(host), directory);
}
-
+
public void revokePersistentMember(String uuid) throws AdminException, UnknownHostException {
super.revokePersistentMember(UUID.fromString(uuid));
}
@@ -1382,55 +1386,55 @@ public class AdminDistributedSystemJmxImpl
/* ********************************************************************* */
/* ************** Implementing StatAlertsAggregator interface ********** */
/* ********************************************************************* */
-
+
/* Map to store admin stat alert definitions */
private final Map ALERT_DEFINITIONS = new Hashtable();
-
+
/* Refresh interval for all stat alerts managers in seconds */
private int refreshIntervalForStatAlerts = 20;
- /*
- * This map contains list of stat alerts as a value for alert def ID as a key
+ /*
+ * This map contains list of stat alerts as a value for alert def ID as a key
*/
private final HashMap alertsStore = new HashMap();
-
- //TODO: yet to set the timer task
-// private SystemTimer systemwideAlertNotificationScheduler = new SystemTimer();
-
+
+ // TODO: yet to set the timer task
+ // private SystemTimer systemwideAlertNotificationScheduler = new SystemTimer();
+
private MailManager mailManager = null;
private final boolean isEmailNotificationEnabled;
-
+
/**
* Convenience method to retrieve admin stat alert definition.
*
- * @param alertDefinitionId id of a stat alert definition
+ * @param alertDefinitionId id of a stat alert definition
* @return StatAlertDefinition reference to an instance of StatAlertDefinition
* @since GemFire 5.7
*/
private StatAlertDefinition getAlertDefinition(int alertDefinitionId) {
- synchronized(ALERT_DEFINITIONS) {
- return (StatAlertDefinition)ALERT_DEFINITIONS.get(Integer.valueOf(alertDefinitionId));
+ synchronized (ALERT_DEFINITIONS) {
+ return (StatAlertDefinition) ALERT_DEFINITIONS.get(Integer.valueOf(alertDefinitionId));
}
}
-
-/* private void setAlertDefinition(StatAlertDefinition alertDefinition) {
- ALERT_DEFINITIONS.put(Integer.valueOf(alertDefinition.getId()), alertDefinition);
- }*/
- /**
- * This method can be used to get an alert definition.
+ /*
+ * private void setAlertDefinition(StatAlertDefinition alertDefinition) {
+ * ALERT_DEFINITIONS.put(Integer.valueOf(alertDefinition.getId()), alertDefinition); }
+ */
+
+ /**
+ * This method can be used to get an alert definition.
*
* @param alertDefinition StatAlertDefinition to retrieve
- * @return StatAlertDefinition
+ * @return StatAlertDefinition
* @since GemFire 5.7
*/
public StatAlertDefinition getAlertDefinition(StatAlertDefinition alertDefinition) {
return getAlertDefinition(alertDefinition.getId());
}
-
+
/**
- * This method is used to write existing StatAlertDefinitions
- * to a file
+ * This method is used to write existing StatAlertDefinitions to a file
*/
protected void readAlertDefinitionsAsSerializedObjects() {
StatAlertDefinition[] defns = new StatAlertDefinition[0];
@@ -1441,21 +1445,23 @@ public class AdminDistributedSystemJmxImpl
try {
serFile = new File(statAlertDefnSerFile);
-
+
if (!canWriteToFile(serFile)) {/* can not write a file */
canPersistStatAlertDefs = false;
}
if (!serFile.exists()) {/* file does not exist */
return;
}
-
+
if (logger.isDebugEnabled()) {
- logger.debug("AdminDistributedSystemJmxImpl.readAlertDefinitionsAsSerializedObjects: File: {}", serFile.getPath());
+ logger.debug(
+ "AdminDistributedSystemJmxImpl.readAlertDefinitionsAsSerializedObjects: File: {}",
+ serFile.getPath());
}
foStr = new FileInputStream(serFile);
ooStr = new DataInputStream(foStr);
- defns = (StatAlertDefinition[])DataSerializer.readObjectArray(ooStr);
+ defns = (StatAlertDefinition[]) DataSerializer.readObjectArray(ooStr);
} catch (ClassNotFoundException cnfEx) {
logger.error(LocalizedMessage.create(
LocalizedStrings.AdminDistributedSystem_ENCOUNTERED_A_0_WHILE_LOADING_STATALERTDEFINITIONS_1,
@@ -1467,14 +1473,14 @@ public class AdminDistributedSystemJmxImpl
new Object[] {ex.getClass().getName(), statAlertDefnSerFile}), ex);
canPersistStatAlertDefs = false;
} finally {
- if (foStr!=null) {
+ if (foStr != null) {
try {
foStr.close();
} catch (IOException ex) {
;
}
}
- if (ooStr!=null) {
+ if (ooStr != null) {
try {
ooStr.close();
} catch (IOException ex) {
@@ -1482,15 +1488,14 @@ public class AdminDistributedSystemJmxImpl
}
}
}
-
- for (int i=0; i<defns.length; i++) {
+
+ for (int i = 0; i < defns.length; i++) {
updateAlertDefinition(defns[i]);
}
}
/**
- * This method is used to write existing StatAlertDefinitions
- * to a file
+ * This method is used to write existing StatAlertDefinitions to a file
*/
public void saveAlertDefinitionsAsSerializedObjects() {
File serFile = null;
@@ -1498,32 +1503,34 @@ public class AdminDistributedSystemJmxImpl
DataOutputStream ooStr = null;
try {
serFile = new File(statAlertDefnSerFile);
-
-
+
+
if (logger.isDebugEnabled()) {
- logger.debug("AdminDistributedSystemJmxImpl.saveAlertDefinitionsAsSerializedObjects: File: {}", serFile.getPath());
+ logger.debug(
+ "AdminDistributedSystemJmxImpl.saveAlertDefinitionsAsSerializedObjects: File: {}",
+ serFile.getPath());
}
-
+
if (!canWriteToFile(serFile)) {
return;
}
-
+
foStr = new FileOutputStream(serFile);
ooStr = new DataOutputStream(foStr);
-
+
int numOfAlerts = 0;
StatAlertDefinition[] defs = null;
synchronized (ALERT_DEFINITIONS) {
numOfAlerts = ALERT_DEFINITIONS.size();
defs = new StatAlertDefinition[numOfAlerts];
-
+
int i = 0;
- for (Iterator iter=ALERT_DEFINITIONS.keySet().iterator(); iter.hasNext() ;) {
+ for (Iterator iter = ALERT_DEFINITIONS.keySet().iterator(); iter.hasNext();) {
Integer key = (Integer) iter.next();
StatAlertDefinition readDefn = (StatAlertDefinition) ALERT_DEFINITIONS.get(key);
defs[i] = readDefn;
- i++;
+ i++;
}
}
@@ -1533,13 +1540,13 @@ public class AdminDistributedSystemJmxImpl
LocalizedStrings.AdminDistributedSystem_ENCOUNTERED_A_0_WHILE_SAVING_STATALERTDEFINITIONS_1,
new Object[] {ex.getClass().getName(), statAlertDefnSerFile}), ex);
} finally {
- if (foStr!=null)
+ if (foStr != null)
try {
foStr.close();
} catch (IOException ex) {
;
}
- if (ooStr!=null)
+ if (ooStr != null)
try {
ooStr.close();
} catch (IOException ex) {
@@ -1551,24 +1558,23 @@ public class AdminDistributedSystemJmxImpl
/**
* Checks if the given file is writable.
*
- * @param file
- * file to check write permissions for
+ * @param file file to check write permissions for
* @return true if file is writable, false otherwise
*/
private boolean canWriteToFile(File file) {
boolean fileIsWritable = true;
// Fix for BUG40360 : When the user does not have write permissions for
- // saving the stat-alert definitions, then appropriate warning message is
- // logged and the operation is aborted. In case the file doesn't exist, then
- // it attempts to create a file. If the attempt fails then it logs
+ // saving the stat-alert definitions, then appropriate warning message is
+ // logged and the operation is aborted. In case the file doesn't exist, then
+ // it attempts to create a file. If the attempt fails then it logs
// appropriate warning and the operation is aborted. File.canWrite check for
- // a directory sometimes fails on Windows platform. Hence file creation is
+ // a directory sometimes fails on Windows platform. Hence file creation is
// necessary.
if (file.exists()) {
if (!file.canWrite()) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.AdminDistributedSystemJmxImpl_READONLY_STAT_ALERT_DEF_FILE_0,
- new Object[] { file }));
+ new Object[] {file}));
fileIsWritable = false;
}
} else {
@@ -1577,102 +1583,101 @@ public class AdminDistributedSystemJmxImpl
} catch (IOException e) {
logger.warn(LocalizedMessage.create(
LocalizedStrings.AdminDistributedSystemJmxImpl_FAILED_TO_CREATE_STAT_ALERT_DEF_FILE_0,
- new Object[] { file }), e);
+ new Object[] {file}), e);
fileIsWritable = false;
} finally {
// Since we had created this file only for testing purpose, delete the
// same.
if ((file.exists() && !file.delete()) && logger.isDebugEnabled()) {
- logger.debug("Could not delete file :'{}' which is created for checking permissions.", file.getAbsolutePath());
+ logger.debug("Could not delete file :'{}' which is created for checking permissions.",
+ file.getAbsolutePath());
}
}
}
return fileIsWritable;
}
- /**
- * This method can be used to update alert definition for the Stat mentioned.
- * This method should update the collection maintained at the aggregator and
- * should notify members for the newly added alert definitions.
- * A new alert definition will be created if matching one not found.
+ /**
+ * This method can be used to update alert definition for the Stat mentioned. This method should
+ * update the collection maintained at the aggregator and should notify members for the newly
+ * added alert definitions. A new alert definition will be created if matching one not found.
*
- * @param alertDefinition alertDefinition to be updated
+ * @param alertDefinition alertDefinition to be updated
* @since GemFire 5.7
- */
+ */
public void updateAlertDefinition(StatAlertDefinition alertDefinition) {
if (logger.isDebugEnabled()) {
- logger.debug("Entered AdminDistributedSystemJmxImpl.updateAlertDefinition(StatAlertDefinition) *****");
+ logger.debug(
+ "Entered AdminDistributedSystemJmxImpl.updateAlertDefinition(StatAlertDefinition) *****");
}
/*
- * What to update in the alert definition? There should be another argument
- * or arguments in a map.
- * 1. Need to update the list/map of alert definitions across members.
+ * What to update in the alert definition? There should be another argument or arguments in a
+ * map. 1. Need to update the list/map of alert definitions across members.
*/
synchronized (ALERT_DEFINITIONS) {
ALERT_DEFINITIONS.put(Integer.valueOf(alertDefinition.getId()), alertDefinition);
-
+
if (logger.isDebugEnabled()) {
- logger.debug("AdminDistributedSystemJmxImpl.updateAlertDefinition : alertDefinition :: id={} :: {}", alertDefinition.getId(), alertDefinition.getStringRepresentation());
+ logger.debug(
+ "AdminDistributedSystemJmxImpl.updateAlertDefinition : alertDefinition :: id={} :: {}",
+ alertDefinition.getId(), alertDefinition.getStringRepresentation());
}
-
+
/* TODO: add code to retry on failure */
notifyMembersForAlertDefinitionChange(alertDefinition);
}
if (logger.isDebugEnabled()) {
- logger.debug("Exiting AdminDistributedSystemJmxImpl.updateAlertDefinition(StatAlertDefinition) *****");
+ logger.debug(
+ "Exiting AdminDistributedSystemJmxImpl.updateAlertDefinition(StatAlertDefinition) *****");
}
}
- /**
- * This method can be used to remove alert definition for the Stat
- * mentioned.
- * This method should update the collection maintained at the aggregator and
- * should notify members for the newly added alert definitions.
+ /**
+ * This method can be used to remove alert definition for the Stat mentioned. This method should
+ * update the collection maintained at the aggregator and should notify members for the newly
+ * added alert definitions.
*
* @param defId id of the alert definition to be removed
* @since GemFire 5.7
- */
+ */
public void removeAlertDefinition(Integer defId) {
if (logger.isDebugEnabled()) {
logger.debug("Entered AdminDistributedSystemJmxImpl.removeAlertDefinition id *****");
}
/*
- * alert passed to be deleted from the list/map of alerts on JMX MBean
- * & all Member MBeans
+ * alert passed to be deleted from the list/map of alerts on JMX MBean & all Member MBeans
*/
synchronized (ALERT_DEFINITIONS) {
- StatAlertDefinition alertDefinition = (StatAlertDefinition)ALERT_DEFINITIONS.get(defId);
- if (alertDefinition != null) {
- ALERT_DEFINITIONS.remove(defId);
- synchronized (alertsStore) {
- alertsStore.remove(defId);
- }
- /* TODO: add code to retry on failure */
- notifyMembersForAlertDefinitionRemoval(alertDefinition);
- }
+ StatAlertDefinition alertDefinition = (StatAlertDefinition) ALERT_DEFINITIONS.get(defId);
+ if (alertDefinition != null) {
+ ALERT_DEFINITIONS.remove(defId);
+ synchronized (alertsStore) {
+ alertsStore.remove(defId);
+ }
+ /* TODO: add code to retry on failure */
+ notifyMembersForAlertDefinitionRemoval(alertDefinition);
+ }
}
if (logger.isDebugEnabled()) {
logger.debug("Exiting AdminDistributedSystemJmxImpl.removeAlertDefinition() *****");
}
}
- /**
+ /**
* Convenience method to check whether an alert definition is created.
*
* @param alertDefinition alert definition to check whether already created
- * @return true if the alert definition is already created, false
- * otherwise
+ * @return true if the alert definition is already created, false otherwise
* @since GemFire 5.7
*/
public boolean isAlertDefinitionCreated(StatAlertDefinition alertDefinition) {
/*
- * Need to maintain a map of stat against the StatAlertDefinitions.
- * check in that map whether the alert definition is there for the given
- * alert
+ * Need to maintain a map of stat against the StatAlertDefinitions. check in that map whether
+ * the alert definition is there for the given alert
*
* TODO: optimize to use Map.containsKey - DONE
*/
- synchronized(ALERT_DEFINITIONS) {
+ synchronized (ALERT_DEFINITIONS) {
return ALERT_DEFINITIONS.containsKey(Integer.valueOf(alertDefinition.getId()));
}
}
@@ -1685,29 +1690,27 @@ public class AdminDistributedSystemJmxImpl
*/
public synchronized int getRefreshIntervalForStatAlerts() {
/*
- * state to store the refresh interval set by the user/GFMon client
+ * state to store the refresh interval set by the user/GFMon client
*/
return refreshIntervalForStatAlerts;
}
/**
- * This method is used to set the refresh interval for the Stats in
- * seconds
+ * This method is used to set the refresh interval for the Stats in seconds
*
* @param refreshIntervalForStatAlerts refresh interval for the Stats(in seconds)
* @since GemFire 5.7
*/
public synchronized void setRefreshIntervalForStatAlerts(int refreshIntervalForStatAlerts) {
/*
- * change the state refresh interval here.
+ * change the state refresh interval here.
*/
this.refreshIntervalForStatAlerts = refreshIntervalForStatAlerts;
- notifyMembersForRefreshIntervalChange(this.refreshIntervalForStatAlerts*1000l);
+ notifyMembersForRefreshIntervalChange(this.refreshIntervalForStatAlerts * 1000l);
}
/**
- * Returns whether Statistics Alert definitions could be persisted across
- * runs/sessions
+ * Returns whether Statistics Alert definitions could be persisted across runs/sessions
*
* @return value of canPersistStatAlertDefs.
* @since GemFire 6.5
@@ -1722,154 +1725,150 @@ public class AdminDistributedSystemJmxImpl
* @param newInterval refresh interval to be set for members(in milliseconds)
*/
private void notifyMembersForRefreshIntervalChange(long newInterval) {
- GfManagerAgent agent = getGfManagerAgent();
- ApplicationVM[] VMs = agent.listApplications();
- //TODO: is there any other way to get all VMs?
-
+ GfManagerAgent agent = getGfManagerAgent();
+ ApplicationVM[] VMs = agent.listApplications();
+ // TODO: is there any other way to get all VMs?
+
for (int i = 0; i < VMs.length; i++) {
VMs[i].setRefreshInterval(newInterval);
}
}
-
+
/**
- * An intermediate method to notify all members for change in stat alert
- * definition.
+ * An intermediate method to notify all members for change in stat alert definition.
*
* @param alertDef stat alert definition that got changed
- */
+ */
private void notifyMembersForAlertDefinitionChange(StatAlertDefinition alertDef) {
if (logger.isDebugEnabled()) {
- logger.debug("Entered AdminDistributedSystemJmxImpl.notifyMembersForAlertDefinitionChange(StatAlertDefinition) *****");
+ logger.debug(
+ "Entered AdminDistributedSystemJmxImpl.notifyMembersForAlertDefinitionChange(StatAlertDefinition) *****");
}
- GfManagerAgent agent = getGfManagerAgent();
+ GfManagerAgent agent = getGfManagerAgent();
StatAlertDefinition[] alertDefs = new StatAlertDefinition[] {alertDef};
- ApplicationVM[] VMs = agent.listApplications();
-
+ ApplicationVM[] VMs = agent.listApplications();
+
for (int i = 0; i < VMs.length; i++) {
- VMs[i].updateAlertDefinitions(alertDefs,
+ VMs[i].updateAlertDefinitions(alertDefs,
UpdateAlertDefinitionMessage.UPDATE_ALERT_DEFINITION);
}
if (logger.isDebugEnabled()) {
- logger.debug("Exiting AdminDistributedSystemJmxImpl.notifyMembersForAlertDefinitionChange(StatAlertDefinition) "
- + VMs.length+" members notified.*****");
+ logger.debug(
+ "Exiting AdminDistributedSystemJmxImpl.notifyMembersForAlertDefinitionChange(StatAlertDefinition) "
+ + VMs.length + " members notified.*****");
}
}
/**
- * An intermediate method to notify all members for removal of stat alert
- * definition.
+ * An intermediate method to notify all members for removal of stat alert definition.
*
* @param alertDef stat alert definition to be removed
*/
private void notifyMembersForAlertDefinitionRemoval(StatAlertDefinition alertDef) {
- GfManagerAgent agent = getGfManagerAgent();
+ GfManagerAgent agent = getGfManagerAgent();
StatAlertDefinition[] alertDefs = new StatAlertDefinition[] {alertDef};
- ApplicationVM[] VMs = agent.listApplications();
-
+ ApplicationVM[] VMs = agent.listApplications();
+
for (int i = 0; i < VMs.length; i++) {
- VMs[i].updateAlertDefinitions(alertDefs,
+ VMs[i].updateAlertDefinitions(alertDefs,
UpdateAlertDefinitionMessage.REMOVE_ALERT_DEFINITION);
}
}
/**
- * This method can be used to set the AlertsManager for the newly joined
- * member VM.
+ * This method can be used to set the AlertsManager for the newly joined member VM.
*
* @param memberVM Member VM to set AlertsManager for
* @since GemFire 5.7
*/
public synchronized void setAlertsManager(GemFireVM memberVM) {
/*
- * 1. Who'll call this method? Who gets notified when a member joins?
- * I think that's AdminDistributedSystemJmxImpl.nodeCreated()
- * 2. Is the argument GemFireVM correct? Need to modify this interface to
- * add method to set an interface. Need to see how it can be passed to
- * the RemoteGemFireVM implementation. Also need to check whetherother
- * implementors (like DistributedSystemHealthMonitor) of GemFireVM even
- * need to have the AlertsManager
- * 3. Would the alerts manager be set by aggregator or a JMXAgent i.e. AdminDistributedSystemJmxImpl
- * 4. Setting the list of available alert definitions & refresh interval at
- * this moment only would be better/easier.
- * 5. Need to know Alerts Manager creation/construction. Need to decide how
- * the object would be set & sent across to the Agent VM.
+ * 1. Who'll call this method? Who gets notified when a member joins? I think that's
+ * AdminDistributedSystemJmxImpl.nodeCreated() 2. Is the argument GemFireVM correct? Need to
+ * modify this interface to add method to set an interface. Need to see how it can be passed to
+ * the RemoteGemFireVM implementation. Also need to check whetherother implementors (like
+ * DistributedSystemHealthMonitor) of GemFireVM even need to have the AlertsManager 3. Would the
+ * alerts manager be set by aggregator or a JMXAgent i.e. AdminDistributedSystemJmxImpl 4.
+ * Setting the list of available alert definitions & refresh interval at this moment only would
+ * be better/easier. 5. Need to know Alerts Manager creation/construction. Need to decide how
+ * the object would be set & sent across to the Agent VM.
*/
if (logger.isDebugEnabled()) {
logger.debug("Entered AdminDistributedSystemJmxImpl.setAlertsManager(GemFireVM) *****");
}
-
+
// creating an array of stat alert definition objects
StatAlertDefinition[] alertDefs = new StatAlertDefinition[0];
-
+
Collection alertDefsCollection = null;
- synchronized(ALERT_DEFINITIONS) {
+ synchronized (ALERT_DEFINITIONS) {
alertDefsCollection = ALERT_DEFINITIONS.values();
}
-
- alertDefs = (StatAlertDefinition[])alertDefsCollection.toArray(alertDefs);
-
- memberVM.setAlertsManager(alertDefs, getRefreshIntervalForStatAlerts()*1000l, true);
-
+
+ alertDefs = (StatAlertDefinition[]) alertDefsCollection.toArray(alertDefs);
+
+ memberVM.setAlertsManager(alertDefs, getRefreshIntervalForStatAlerts() * 1000l, true);
+
if (logger.isDebugEnabled()) {
logger.debug("Exiting AdminDistributedSystemJmxImpl.setAlertsManager(GemFireVM) *****");
}
}
- /**
- * This method can be used to retrieve all available stat alert definitions.
- * Returns empty array if there are no stat alert definitions defined.
+ /**
+ * This method can be used to retrieve all available stat alert definitions. Returns empty array
+ * if there are no stat alert definitions defined.
*
- * @return An array of all available StatAlertDefinition objects
+ * @return An array of all available StatAlertDefinition objects
* @since GemFire 5.7
*/
public StatAlertDefinition[] getAllStatAlertDefinitions() {
if (logger.isDebugEnabled()) {
logger.debug("Entered AdminDistributedSystemJmxImpl.getAllStatAlertDefinitions() *****");
}
-
+
Collection alertDefs = null;
- synchronized(ALERT_DEFINITIONS) {
+ synchronized (ALERT_DEFINITIONS) {
alertDefs = ALERT_DEFINITIONS.values();
}
-
+
StatAlertDefinition[] alertDefsArr = null;
-
+
if (alertDefs != null) {
alertDefsArr = new StatAlertDefinition[alertDefs.size()];
- alertDefsArr = (StatAlertDefinition[])alertDefs.toArray(alertDefsArr);
+ alertDefsArr = (StatAlertDefinition[]) alertDefs.toArray(alertDefsArr);
} else {
alertDefsArr = new StatAlertDefinition[0];
}
-
+
if (logger.isDebugEnabled()) {
logger.debug("Exiting AdminDistributedSystemJmxImpl.getAllStatAlertDefinitions() *****");
}
-
+
return alertDefsArr;
}
/**
- * This method can be used to process the notifications sent by the
- * member(s). Actual aggregation of stats can occur here. The array contains
- * alert objects with alert def. ID & value. AlertHelper class can be used to
- * retrieve the corresponding alert definition.
+ * This method can be used to process the notifications sent by the member(s). Actual aggregation
+ * of stats can occur here. The array contains alert objects with alert def. ID & value.
+ * AlertHelper class can be used to retrieve the corresponding alert definition.
*
* @param alerts array of Alert class(contains alert def. ID & value)
- * @param remoteVM Remote Member VM that sent Stat Alerts for processing the
- * notifications to the clients
- */
+ * @param remoteVM Remote Member VM that sent Stat Alerts for processing the notifications to the
+ * clients
+
<TRUNCATED>
[33/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/Delta.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/Delta.java b/geode-core/src/main/java/org/apache/geode/Delta.java
index de3ef98..a474981 100755
--- a/geode-core/src/main/java/org/apache/geode/Delta.java
+++ b/geode-core/src/main/java/org/apache/geode/Delta.java
@@ -1,18 +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
+ * 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;
@@ -22,12 +20,11 @@ import java.io.IOException;
/**
- * This interface defines a contract between the application and GemFire that
- * allows GemFire to determine whether an application object contains a delta,
- * allows GemFire to extract the delta from an application object, and generate
- * a new application object by applying a delta to an existing application
- * object. The difference in object state is contained in the {@link DataOutput}
- * and {@link DataInput} parameters.
+ * This interface defines a contract between the application and GemFire that allows GemFire to
+ * determine whether an application object contains a delta, allows GemFire to extract the delta
+ * from an application object, and generate a new application object by applying a delta to an
+ * existing application object. The difference in object state is contained in the
+ * {@link DataOutput} and {@link DataInput} parameters.
*
* @since GemFire 6.1
*
@@ -40,10 +37,9 @@ public interface Delta {
boolean hasDelta();
/**
- * This method is invoked on an application object at the delta sender, if
- * GemFire determines the presence of a delta by calling
- * {@link Delta#hasDelta()} on the object. The delta is written to the
- * {@link DataOutput} object provided by GemFire.
+ * This method is invoked on an application object at the delta sender, if GemFire determines the
+ * presence of a delta by calling {@link Delta#hasDelta()} on the object. The delta is written to
+ * the {@link DataOutput} object provided by GemFire.
*
* Any delta state should be reset in this method.
*
@@ -53,11 +49,10 @@ public interface Delta {
/**
- * This method is invoked on an existing application object when an update is
- * received as a delta. This method throws an {@link InvalidDeltaException}
- * when the delta in the {@link DataInput} cannot be applied to the object.
- * GemFire automatically handles an {@link InvalidDeltaException} by
- * reattempting the update by sending the full application object.
+ * This method is invoked on an existing application object when an update is received as a delta.
+ * This method throws an {@link InvalidDeltaException} when the delta in the {@link DataInput}
+ * cannot be applied to the object. GemFire automatically handles an {@link InvalidDeltaException}
+ * by reattempting the update by sending the full application object.
*
* @throws IOException
* @throws InvalidDeltaException
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java b/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
index dfe2faf..5e55a6c 100644
--- a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
@@ -1,18 +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
+ * 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.
*/
/**
*
@@ -21,8 +19,8 @@ package org.apache.geode;
/**
* This exception wraps any checked exception encountered during invocation of
- * {@link Delta#fromDelta(java.io.DataInput)} or
- * {@link Delta#toDelta(java.io.DataOutput)} in GemFire.
+ * {@link Delta#fromDelta(java.io.DataInput)} or {@link Delta#toDelta(java.io.DataOutput)} in
+ * GemFire.
*
* @since GemFire 6.5
*/
@@ -31,8 +29,7 @@ public class DeltaSerializationException extends RuntimeException {
/**
* Default constructor
*/
- public DeltaSerializationException() {
- }
+ public DeltaSerializationException() {}
/**
* @param message
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java b/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
index cd3b90f..0ecc750 100755
--- a/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
+++ b/geode-core/src/main/java/org/apache/geode/ForcedDisconnectException.java
@@ -1,32 +1,29 @@
/*
- * 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
+ * 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;
/**
- * An <code>ForcedDisconnectException</code> is thrown when a GemFire
- * application is removed from the distributed system due to membership
- * constraints such as network partition detection.
+ * An <code>ForcedDisconnectException</code> is thrown when a GemFire application is removed from
+ * the distributed system due to membership constraints such as network partition detection.
*
* @since GemFire 5.7
*/
public class ForcedDisconnectException extends CancelException {
-private static final long serialVersionUID = 4977003259880566257L;
+ private static final long serialVersionUID = 4977003259880566257L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>SystemConnectException</code>.
@@ -34,7 +31,7 @@ private static final long serialVersionUID = 4977003259880566257L;
public ForcedDisconnectException(String message) {
super(message);
}
-
+
public ForcedDisconnectException(String message, Throwable cause) {
super(message, cause);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java b/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java
index 7f06d05..ecfb9b0 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireCacheException.java
@@ -1,33 +1,29 @@
/*
- * 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
+ * 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;
import org.apache.geode.cache.CacheException;
/**
- * An <code>GemFireCacheException</code> is used to wrap a
- * {@link CacheException}. This is needed in contexts that can
- * not throw the cache exception directly because of it being
- * a typed exception.
+ * An <code>GemFireCacheException</code> is used to wrap a {@link CacheException}. This is needed in
+ * contexts that can not throw the cache exception directly because of it being a typed exception.
*/
public class GemFireCacheException extends GemFireException {
-private static final long serialVersionUID = -2844020916351682908L;
+ private static final long serialVersionUID = -2844020916351682908L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>GemFireCacheException</code>.
@@ -35,16 +31,18 @@ private static final long serialVersionUID = -2844020916351682908L;
public GemFireCacheException(String message, CacheException ex) {
super(message, ex);
}
+
/**
* Creates a new <code>GemFireCacheException</code>.
*/
public GemFireCacheException(CacheException ex) {
super(ex);
}
+
/**
* Gets the wrapped {@link CacheException}
*/
public CacheException getCacheException() {
- return (CacheException)getCause();
+ return (CacheException) getCause();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java b/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
index c1db7d6..8d6f702 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
@@ -1,35 +1,32 @@
/*
- * 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
+ * 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;
/**
- * This is the abstract superclass of exceptions that are thrown and
- * declared.
+ * This is the abstract superclass of exceptions that are thrown and declared.
* <p>
- * This class ought to be called <em>GemFireException</em>, but that name
- * is reserved for an older class that extends {@link java.lang.RuntimeException}.
+ * This class ought to be called <em>GemFireException</em>, but that name is reserved for an older
+ * class that extends {@link java.lang.RuntimeException}.
*
* @see org.apache.geode.GemFireException
* @since GemFire 5.1
*/
public abstract class GemFireCheckedException extends Exception {
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>GemFireException</code> with no detailed message.
@@ -39,52 +36,50 @@ public abstract class GemFireCheckedException extends Exception {
}
/**
- * Creates a new <code>GemFireCheckedException</code> with the given detail
- * message.
+ * Creates a new <code>GemFireCheckedException</code> with the given detail message.
*/
public GemFireCheckedException(String message) {
super(message);
}
/**
- * Creates a new <code>GemFireException</code> with the given detail
- * message and cause.
+ * Creates a new <code>GemFireException</code> with the given detail message and cause.
*/
public GemFireCheckedException(String message, Throwable cause) {
super(message);
this.initCause(cause);
}
-
+
/**
- * Creates a new <code>GemFireCheckedException</code> with the given cause and
- * no detail message
+ * Creates a new <code>GemFireCheckedException</code> with the given cause and no detail message
*/
public GemFireCheckedException(Throwable cause) {
super();
this.initCause(cause);
}
- //////////////////// Instance Methods ////////////////////
+ //////////////////// Instance Methods ////////////////////
/**
- * Returns the root cause of this <code>GemFireCheckedException</code> or
- * <code>null</code> if the cause is nonexistent or unknown.
+ * Returns the root cause of this <code>GemFireCheckedException</code> or <code>null</code> if the
+ * cause is nonexistent or unknown.
*/
public Throwable getRootCause() {
- if ( this.getCause() == null ) return null;
- Throwable root = this.getCause();
- while ( root != null ) {
-// if ( ! ( root instanceof GemFireCheckedException )) {
-// break;
-// }
-// GemFireCheckedException tmp = (GemFireCheckedException) root;
- if ( root.getCause() == null ) {
- break;
- } else {
- root = root.getCause();
- }
+ if (this.getCause() == null)
+ return null;
+ Throwable root = this.getCause();
+ while (root != null) {
+ // if ( ! ( root instanceof GemFireCheckedException )) {
+ // break;
+ // }
+ // GemFireCheckedException tmp = (GemFireCheckedException) root;
+ if (root.getCause() == null) {
+ break;
+ } else {
+ root = root.getCause();
}
- return root;
+ }
+ return root;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java b/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java
index 7063bce..f7a5ddb 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireConfigException.java
@@ -1,30 +1,28 @@
/*
- * 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
+ * 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;
/**
- * A <code>GemFireConfigException</code> is used for failures
- * while processing a GemFire configuration XML file.
+ * A <code>GemFireConfigException</code> is used for failures while processing a GemFire
+ * configuration XML file.
*/
public class GemFireConfigException extends GemFireException {
-private static final long serialVersionUID = 7791789785331120991L;
+ private static final long serialVersionUID = 7791789785331120991L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>GemFireConfigException</code>.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/GemFireException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireException.java b/geode-core/src/main/java/org/apache/geode/GemFireException.java
index e25dd0c..02bf025 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireException.java
@@ -1,44 +1,42 @@
/*
- * 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
+ * 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;
/**
- * This is the abstract superclass of exceptions that are thrown to
- * indicate incorrect usage of GemFire.
+ * This is the abstract superclass of exceptions that are thrown to indicate incorrect usage of
+ * GemFire.
*
- * Since these exceptions are unchecked, this class really
- * <em>ought</em> to be called <code>GemFireRuntimeException</code>;
- * however, the current name is retained for compatibility's sake.
+ * Since these exceptions are unchecked, this class really <em>ought</em> to be called
+ * <code>GemFireRuntimeException</code>; however, the current name is retained for compatibility's
+ * sake.
*
* @see org.apache.geode.GemFireCheckedException
* @see org.apache.geode.cache.CacheRuntimeException
*/
// Implementation note: This class is abstract so that we are forced
-// to have more specific exception types. We want to avoid using
+// to have more specific exception types. We want to avoid using
// GemFireException to describe an arbitrary error condition (think
// GsError).
public abstract class GemFireException extends RuntimeException {
public static final long serialVersionUID = -6972360779789402295L;
/** The cause of this <code>GemFireException</code> */
-// private Throwable cause;
+ // private Throwable cause;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>GemFireException</code> with no detailed message.
@@ -48,102 +46,99 @@ public abstract class GemFireException extends RuntimeException {
}
/**
- * Creates a new <code>GemFireException</code> with the given detail
- * message.
+ * Creates a new <code>GemFireException</code> with the given detail message.
*/
public GemFireException(String message) {
super(message);
}
/**
- * Creates a new <code>GemFireException</code> with the given detail
- * message and cause.
+ * Creates a new <code>GemFireException</code> with the given detail message and cause.
*/
public GemFireException(String message, Throwable cause) {
super(message, cause);
-// this.cause = cause;
+ // this.cause = cause;
}
-
+
/**
- * Creates a new <code>GemFireException</code> with the given cause and
- * no detail message
+ * Creates a new <code>GemFireException</code> with the given cause and no detail message
*/
public GemFireException(Throwable cause) {
super(cause);
-// this.cause = cause;
+ // this.cause = cause;
}
- //////////////////// Instance Methods ////////////////////
+ //////////////////// Instance Methods ////////////////////
/**
- * Returns the cause of this <code>GemFireException</code> or
- * <code>null</code> if the cause is nonexistent or unknown.
+ * Returns the cause of this <code>GemFireException</code> or <code>null</code> if the cause is
+ * nonexistent or unknown.
*/
-// public Throwable getCause() {
-// return this.cause;
-// }
+ // public Throwable getCause() {
+ // return this.cause;
+ // }
/**
- * Returns the root cause of this <code>GemFireException</code> or
- * <code>null</code> if the cause is nonexistent or unknown.
+ * Returns the root cause of this <code>GemFireException</code> or <code>null</code> if the cause
+ * is nonexistent or unknown.
*/
public Throwable getRootCause() {
- if ( this.getCause() == null ) {
+ if (this.getCause() == null) {
return null;
}
Throwable root = this.getCause();
- while ( root.getCause() != null ) {
+ while (root.getCause() != null) {
root = root.getCause();
}
return root;
}
-
-// public void printStackTrace() {
-// super.printStackTrace();
-// if (this.cause != null) {
-// System.err.println("Caused by:");
-// this.cause.printStackTrace();
-// }
-// }
-
-// public void printStackTrace(java.io.PrintWriter pw) {
-// super.printStackTrace(pw);
-//
-// if (this.cause != null) {
-// pw.println("Caused by:");
-// this.cause.printStackTrace(pw);
-// }
-// }
-//
-// public String getMessage() {
-// if (this.cause != null) {
-// String ourMsg = super.getMessage();
-// if (ourMsg == null || ourMsg.length() == 0) {
-// //ourMsg = super.toString(); //causes inifinite recursion
-// ourMsg = "";
-// }
-// StringBuffer sb = new StringBuffer(ourMsg);
-// sb.append(" Caused by: ");
-// String causeMsg = this.cause.getMessage();
-// if (causeMsg == null || causeMsg.length() == 0) {
-// causeMsg = this.cause.toString();
-// }
-// sb.append(causeMsg);
-// return sb.toString();
-// } else {
-// return super.getMessage();
-// }
-// }
+
+ // public void printStackTrace() {
+ // super.printStackTrace();
+ // if (this.cause != null) {
+ // System.err.println("Caused by:");
+ // this.cause.printStackTrace();
+ // }
+ // }
+
+ // public void printStackTrace(java.io.PrintWriter pw) {
+ // super.printStackTrace(pw);
+ //
+ // if (this.cause != null) {
+ // pw.println("Caused by:");
+ // this.cause.printStackTrace(pw);
+ // }
+ // }
+ //
+ // public String getMessage() {
+ // if (this.cause != null) {
+ // String ourMsg = super.getMessage();
+ // if (ourMsg == null || ourMsg.length() == 0) {
+ // //ourMsg = super.toString(); //causes inifinite recursion
+ // ourMsg = "";
+ // }
+ // StringBuffer sb = new StringBuffer(ourMsg);
+ // sb.append(" Caused by: ");
+ // String causeMsg = this.cause.getMessage();
+ // if (causeMsg == null || causeMsg.length() == 0) {
+ // causeMsg = this.cause.toString();
+ // }
+ // sb.append(causeMsg);
+ // return sb.toString();
+ // } else {
+ // return super.getMessage();
+ // }
+ // }
/**
* Represent the receiver as well as the cause
*/
-// public String toString() {
-// String result = super.toString();
-// if (cause != null) {
-// result = result + ", caused by " + cause.toString();
-// }
-// return result;
-// }
+ // public String toString() {
+ // String result = super.toString();
+ // if (cause != null) {
+ // result = result + ", caused by " + cause.toString();
+ // }
+ // return result;
+ // }
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/GemFireIOException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireIOException.java b/geode-core/src/main/java/org/apache/geode/GemFireIOException.java
index 583777c..2b5167d 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireIOException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireIOException.java
@@ -1,32 +1,30 @@
/*
- * 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
+ * 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;
/**
- * A <code>GemFireIOException</code> is thrown when a
- * GemFire operation failure is caused by an <code>IOException</code>.
+ * A <code>GemFireIOException</code> is thrown when a GemFire operation failure is caused by an
+ * <code>IOException</code>.
*
*
*/
public class GemFireIOException extends GemFireException {
-private static final long serialVersionUID = 5694009444435264497L;
+ private static final long serialVersionUID = 5694009444435264497L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>GemFireIOException</code>.
@@ -34,6 +32,7 @@ private static final long serialVersionUID = 5694009444435264497L;
public GemFireIOException(String message, Throwable cause) {
super(message, cause);
}
+
public GemFireIOException(String message) {
super(message);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java b/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
index a6ea18a..724f6da 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireRethrowable.java
@@ -1,29 +1,26 @@
/*
- * 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
+ * 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;
/**
- * This error is used by GemFire for internal purposes.
- * It does not indicate an error condition.
- * For this reason it is named "Rethrowable" instead of the standard "Error".
- * It was made an <code>Error</code> to make it easier for user code that typically would
- * catch <code>Exception</code> to not accidently catch this exception.
- * <p> Note: if user code catches this error (or its subclasses) then it <em>must</em>
- * be rethrown.
+ * This error is used by GemFire for internal purposes. It does not indicate an error condition. For
+ * this reason it is named "Rethrowable" instead of the standard "Error". It was made an
+ * <code>Error</code> to make it easier for user code that typically would catch
+ * <code>Exception</code> to not accidently catch this exception.
+ * <p>
+ * Note: if user code catches this error (or its subclasses) then it <em>must</em> be rethrown.
*
* @since GemFire 5.7
*/
@@ -33,11 +30,11 @@ public class GemFireRethrowable extends Error {
/**
* Create a GemFireRethrowable.
*/
- public GemFireRethrowable() {
- }
+ public GemFireRethrowable() {}
/**
* Create a GemFireRethrowable with the specified message.
+ *
* @param message
*/
public GemFireRethrowable(String message) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java b/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java
index 997feb3..bbb4616 100644
--- a/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java
+++ b/geode-core/src/main/java/org/apache/geode/IncompatibleSystemException.java
@@ -1,33 +1,30 @@
/*
- * 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
+ * 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;
/**
- * An <code>IncompatibleSystemException</code> is thrown when a
- * new GemFire process tries to connect to an
- * existing distributed system and its version is not the same as
- * that of the distributed system. In this case the new member is
- * not allowed to connect to the distributed system.
- * <p>As of GemFire 5.0 this exception should be named IncompatibleDistributedSystemException
+ * An <code>IncompatibleSystemException</code> is thrown when a new GemFire process tries to connect
+ * to an existing distributed system and its version is not the same as that of the distributed
+ * system. In this case the new member is not allowed to connect to the distributed system.
+ * <p>
+ * As of GemFire 5.0 this exception should be named IncompatibleDistributedSystemException
*/
public class IncompatibleSystemException extends GemFireException {
-private static final long serialVersionUID = -6852188720149734350L;
+ private static final long serialVersionUID = -6852188720149734350L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>IncompatibleSystemException</code>.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/Instantiator.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/Instantiator.java b/geode-core/src/main/java/org/apache/geode/Instantiator.java
index 00eb598..e4da556 100644
--- a/geode-core/src/main/java/org/apache/geode/Instantiator.java
+++ b/geode-core/src/main/java/org/apache/geode/Instantiator.java
@@ -1,18 +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
+ * 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;
@@ -22,19 +20,16 @@ import org.apache.geode.internal.cache.tier.sockets.ClientProxyMembershipID;
import org.apache.geode.internal.i18n.LocalizedStrings;
/**
- * <code>Instantiator</code> allows classes that implement {@link
- * DataSerializable} to be registered with the data serialization
- * framework. Knowledge of <code>DataSerializable</code> classes
- * allows the framework to optimize how instances of those classes are
- * data serialized.
+ * <code>Instantiator</code> allows classes that implement {@link DataSerializable} to be registered
+ * with the data serialization framework. Knowledge of <code>DataSerializable</code> classes allows
+ * the framework to optimize how instances of those classes are data serialized.
*
* <P>
*
- * Ordinarily, when a <code>DataSerializable</code> object is written
- * using {@link DataSerializer#writeObject(Object, java.io.DataOutput)}, a special marker class id
- * is written to the stream followed by the class name of the
- * <code>DataSerializable</code> object. After the marker class id is
- * read by {@link DataSerializer#readObject} it performs the following
+ * Ordinarily, when a <code>DataSerializable</code> object is written using
+ * {@link DataSerializer#writeObject(Object, java.io.DataOutput)}, a special marker class id is
+ * written to the stream followed by the class name of the <code>DataSerializable</code> object.
+ * After the marker class id is read by {@link DataSerializer#readObject} it performs the following
* operations,
*
* <OL>
@@ -45,34 +40,27 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
*
* <LI>An instance of the class is created using reflection</LI>
*
- * <LI>{@link DataSerializable#fromData} is invoked on the
- * newly-created object</LI>
+ * <LI>{@link DataSerializable#fromData} is invoked on the newly-created object</LI>
*
* </OL>
*
- * However, if a <code>DataSerializable</code> class is {@linkplain
- * #register(Instantiator) registered} with the data serialization framework and
- * assigned a unique class id, an important optimization can be
- * performed that avoid the expense of using reflection to instantiate
- * the <code>DataSerializable</code> class. When the object is
- * written using {@link DataSerializer#writeObject(Object, java.io.DataOutput)}, the object's
- * registered class id is written to the stream. Consequently, when
- * the data is read from the stream, the {@link #newInstance} method
- * of the appropriate <code>Instantiator</code> instance is invoked to
- * create an "empty" instance of the <code>DataSerializable</code>
- * instead of using reflection to create the new instance.
+ * However, if a <code>DataSerializable</code> class is {@linkplain #register(Instantiator)
+ * registered} with the data serialization framework and assigned a unique class id, an important
+ * optimization can be performed that avoid the expense of using reflection to instantiate the
+ * <code>DataSerializable</code> class. When the object is written using
+ * {@link DataSerializer#writeObject(Object, java.io.DataOutput)}, the object's registered class id
+ * is written to the stream. Consequently, when the data is read from the stream, the
+ * {@link #newInstance} method of the appropriate <code>Instantiator</code> instance is invoked to
+ * create an "empty" instance of the <code>DataSerializable</code> instead of using reflection to
+ * create the new instance.
*
* <P>
*
- * Commonly, a <code>DataSerializable</code> class will register
- * itself with the <code>Instantiator</code> in a static initializer
- * as shown in the below example code.
+ * Commonly, a <code>DataSerializable</code> class will register itself with the
+ * <code>Instantiator</code> in a static initializer as shown in the below example code.
*
- * <!--
- * The source code for the CompanySerializer class resides in
- * tests/com/examples/ds/User.java
- * Please keep the below code snippet in sync with that file.
- * -->
+ * <!-- The source code for the CompanySerializer class resides in tests/com/examples/ds/User.java
+ * Please keep the below code snippet in sync with that file. -->
*
* <PRE>
public class User implements DataSerializable {
@@ -113,202 +101,175 @@ public class User implements DataSerializable {
}
* </PRE>
*
- * <code>Instantiator</code>s may be distributed to other members of
- * the distributed system when they are registered. Consider the
- * following scenario in which VM1 and VM2 are members of the same
- * distributed system. Both VMs define the sameRegion and VM2's
- * region replicates the contents of VM1's using replication.
- * VM1 puts an instance of the above <code>User</code> class into the
- * region. The act of instantiating <code>User</code> will load the
- * <code>User</code> class and invoke its static initializer, thus
- * registering the <code>Instantiator</code> with the data
- * serialization framework. Because the region is a replicate, the
- * <code>User</code> will be data serialized and sent to VM2.
- * However, when VM2 attempts to data deserialize the
- * <code>User</code>, its <code>Instantiator</code> will not
- * necessarily be registered because <code>User</code>'s static
- * initializer may not have been invoked yet. As a result, an
- * exception would be logged while deserializing the <code>User</code>
- * and the replicate would not appear to have the new value. So, in
- * order to ensure that the <code>Instantiator</code> is registered in
- * VM2, the data serialization framework distributes a message to each
- * member when an <code>Instantiator</code> is {@linkplain #register(Instantiator)
- * registered}. <p>Note that the framework does not require that an
- * <code>Instantiator</code> be {@link java.io.Serializable}, but it
- * does require that it provide
- * a {@linkplain #Instantiator(Class, int)
- * two-argument constructor}.
+ * <code>Instantiator</code>s may be distributed to other members of the distributed system when
+ * they are registered. Consider the following scenario in which VM1 and VM2 are members of the same
+ * distributed system. Both VMs define the sameRegion and VM2's region replicates the contents of
+ * VM1's using replication. VM1 puts an instance of the above <code>User</code> class into the
+ * region. The act of instantiating <code>User</code> will load the <code>User</code> class and
+ * invoke its static initializer, thus registering the <code>Instantiator</code> with the data
+ * serialization framework. Because the region is a replicate, the <code>User</code> will be data
+ * serialized and sent to VM2. However, when VM2 attempts to data deserialize the <code>User</code>,
+ * its <code>Instantiator</code> will not necessarily be registered because <code>User</code>'s
+ * static initializer may not have been invoked yet. As a result, an exception would be logged while
+ * deserializing the <code>User</code> and the replicate would not appear to have the new value. So,
+ * in order to ensure that the <code>Instantiator</code> is registered in VM2, the data
+ * serialization framework distributes a message to each member when an <code>Instantiator</code> is
+ * {@linkplain #register(Instantiator) registered}.
+ * <p>
+ * Note that the framework does not require that an <code>Instantiator</code> be
+ * {@link java.io.Serializable}, but it does require that it provide a
+ * {@linkplain #Instantiator(Class, int) two-argument constructor}.
*
* @see #register(Instantiator)
* @see #newInstance
*
- * @since GemFire 3.5 */
+ * @since GemFire 3.5
+ */
public abstract class Instantiator {
- /** The class associated with this instantiator. Used mainly for
- * debugging purposes and error messages. */
+ /**
+ * The class associated with this instantiator. Used mainly for debugging purposes and error
+ * messages.
+ */
private Class<? extends DataSerializable> clazz;
/** The id of this <code>Instantiator</code> */
private int id;
-
+
/** The eventId of this <code>Instantiator</code> */
private EventID eventId;
-
+
/** The originator of this <code>Instantiator</code> */
private ClientProxyMembershipID context;
- /////////////////////// Static Methods ///////////////////////
+ /////////////////////// Static Methods ///////////////////////
/**
- * Registers a <code>DataSerializable</code> class with the data
- * serialization framework. This method is usually invoked from the
- * static initializer of a class that implements
- * <code>DataSerializable</code>.
+ * Registers a <code>DataSerializable</code> class with the data serialization framework. This
+ * method is usually invoked from the static initializer of a class that implements
+ * <code>DataSerializable</code>.
*
- * @param instantiator
- * An <code>Instantiator</code> whose {@link #newInstance}
- * method is invoked when an object is data deserialized.
+ * @param instantiator An <code>Instantiator</code> whose {@link #newInstance} method is invoked
+ * when an object is data deserialized.
*
- * @throws IllegalStateException
- * If class <code>c</code> is
- * already registered with a different class id, or another
- * class has already been registered with id
- * <code>classId</code>
- * @throws NullPointerException
- * If <code>instantiator</code> is <code>null</code>.
+ * @throws IllegalStateException If class <code>c</code> is already registered with a different
+ * class id, or another class has already been registered with id <code>classId</code>
+ * @throws NullPointerException If <code>instantiator</code> is <code>null</code>.
*/
public static synchronized void register(Instantiator instantiator) {
InternalInstantiator.register(instantiator, true);
}
/**
- * Registers a <code>DataSerializable</code> class with the data
- * serialization framework. This method is usually invoked from the
- * static initializer of a class that implements
- * <code>DataSerializable</code>.
+ * Registers a <code>DataSerializable</code> class with the data serialization framework. This
+ * method is usually invoked from the static initializer of a class that implements
+ * <code>DataSerializable</code>.
*
- * @param instantiator
- * An <code>Instantiator</code> whose {@link #newInstance}
- * method is invoked when an object is data deserialized.
+ * @param instantiator An <code>Instantiator</code> whose {@link #newInstance} method is invoked
+ * when an object is data deserialized.
*
- * @param distribute
- * True if the registered <code>Instantiator</code> has to be
- * distributed to other members of the distributed system.
- * Note that if distribute is set to false it may still be distributed
- * in some cases.
+ * @param distribute True if the registered <code>Instantiator</code> has to be distributed to
+ * other members of the distributed system. Note that if distribute is set to false it may
+ * still be distributed in some cases.
*
- * @throws IllegalArgumentException
- * If class <code>c</code> is
- * already registered with a different class id, or another
- * class has already been registered with id
- * <code>classId</code>
- * @throws NullPointerException
- * If <code>instantiator</code> is <code>null</code>.
+ * @throws IllegalArgumentException If class <code>c</code> is already registered with a different
+ * class id, or another class has already been registered with id <code>classId</code>
+ * @throws NullPointerException If <code>instantiator</code> is <code>null</code>.
* @deprecated as of 9.0 use {@link Instantiator#register(Instantiator)} instead
*/
- public static synchronized void register(Instantiator instantiator,
- boolean distribute) {
+ public static synchronized void register(Instantiator instantiator, boolean distribute) {
InternalInstantiator.register(instantiator, distribute);
}
- //////////////////////// Constructors ////////////////////////
+ //////////////////////// Constructors ////////////////////////
/**
- * Creates a new <code>Instantiator</code> that instantiates a given
- * class.
+ * Creates a new <code>Instantiator</code> that instantiates a given class.
*
- * @param c
- * The <code>DataSerializable</code> class to register. This
- * class must have a static initializer that registers this
- * <code>Instantiator</code>.
- * @param classId
- * A unique id for class <code>c</code>. The
- * <code>classId</code> must not be zero.
+ * @param c The <code>DataSerializable</code> class to register. This class must have a static
+ * initializer that registers this <code>Instantiator</code>.
+ * @param classId A unique id for class <code>c</code>. The <code>classId</code> must not be zero.
* This has been an <code>int</code> since dsPhase1.
*
- * @throws IllegalArgumentException
- * If <code>c</code> does not implement
- * <code>DataSerializable</code>, <code>classId</code> is
- * less than or equal to zero.
- * @throws NullPointerException
- * If <code>c</code> is <code>null</code>
+ * @throws IllegalArgumentException If <code>c</code> does not implement
+ * <code>DataSerializable</code>, <code>classId</code> is less than or equal to zero.
+ * @throws NullPointerException If <code>c</code> is <code>null</code>
*/
public Instantiator(Class<? extends DataSerializable> c, int classId) {
if (c == null) {
- throw new NullPointerException(LocalizedStrings.Instantiator_CANNOT_REGISTER_A_NULL_CLASS.toLocalizedString());
+ throw new NullPointerException(
+ LocalizedStrings.Instantiator_CANNOT_REGISTER_A_NULL_CLASS.toLocalizedString());
}
if (!DataSerializable.class.isAssignableFrom(c)) {
- throw new IllegalArgumentException(LocalizedStrings.Instantiator_CLASS_0_DOES_NOT_IMPLEMENT_DATASERIALIZABLE.toLocalizedString(c.getName()));
+ throw new IllegalArgumentException(
+ LocalizedStrings.Instantiator_CLASS_0_DOES_NOT_IMPLEMENT_DATASERIALIZABLE
+ .toLocalizedString(c.getName()));
}
if (classId == 0) {
- throw new IllegalArgumentException(LocalizedStrings.Instantiator_CLASS_ID_0_MUST_NOT_BE_0.toLocalizedString(Integer.valueOf(classId)));
+ throw new IllegalArgumentException(LocalizedStrings.Instantiator_CLASS_ID_0_MUST_NOT_BE_0
+ .toLocalizedString(Integer.valueOf(classId)));
}
this.clazz = c;
this.id = classId;
}
-
- ////////////////////// Instance Methods //////////////////////
+
+ ////////////////////// Instance Methods //////////////////////
/**
- * Creates a new "empty" instance of a <Code>DataSerializable</code>
- * class whose state will be filled in by invoking its {@link
- * DataSerializable#fromData fromData} method.
+ * Creates a new "empty" instance of a <Code>DataSerializable</code> class whose state will be
+ * filled in by invoking its {@link DataSerializable#fromData fromData} method.
*
* @see DataSerializer#readObject
*/
public abstract DataSerializable newInstance();
/**
- * Returns the <code>DataSerializable</code> class that is
- * instantiated by this <code>Instantiator</code>.
+ * Returns the <code>DataSerializable</code> class that is instantiated by this
+ * <code>Instantiator</code>.
*/
public final Class<? extends DataSerializable> getInstantiatedClass() {
return this.clazz;
}
/**
- * Returns the unique <code>id</code> of this
- * <code>Instantiator</code>.
+ * Returns the unique <code>id</code> of this <code>Instantiator</code>.
*/
public final int getId() {
return this.id;
}
+
/**
- * sets the unique <code>eventId</code> of this
- * <code>Instantiator</code>. For internal use only.
+ * sets the unique <code>eventId</code> of this <code>Instantiator</code>. For internal use only.
*/
- public final void setEventId(Object/*EventID*/ eventId) {
- this.eventId = (EventID)eventId;
+ public final void setEventId(Object/* EventID */ eventId) {
+ this.eventId = (EventID) eventId;
}
-
+
/**
- * Returns the unique <code>eventId</code> of this
- * <code>Instantiator</code>. For internal use only.
+ * Returns the unique <code>eventId</code> of this <code>Instantiator</code>. For internal use
+ * only.
*/
- public final Object/*EventID*/ getEventId() {
+ public final Object/* EventID */ getEventId() {
return this.eventId;
}
-
+
/**
- * sets the context of this
- * <code>Instantiator</code>. For internal use only.
+ * sets the context of this <code>Instantiator</code>. For internal use only.
*/
- public final void setContext(Object/*ClientProxyMembershipID*/ context) {
- this.context = (ClientProxyMembershipID)context;
+ public final void setContext(Object/* ClientProxyMembershipID */ context) {
+ this.context = (ClientProxyMembershipID) context;
}
-
+
/**
- * Returns the context of this
- * <code>Instantiator</code>. For internal use only.
+ * Returns the context of this <code>Instantiator</code>. For internal use only.
*/
- public final Object/*ClientProxyMembershipID*/ getContext() {
+ public final Object/* ClientProxyMembershipID */ getContext() {
return this.context;
}
-
-
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java b/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
index 39fe1ea..653cad1 100644
--- a/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
+++ b/geode-core/src/main/java/org/apache/geode/InternalGemFireError.java
@@ -1,18 +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
+ * 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.
*/
/**
*
@@ -22,8 +20,8 @@ package org.apache.geode;
/**
* Indicates that serious error has occurred within the GemFire system.
*
- * This is similar to {@link AssertionError}, but these errors are always
- * enabled in a GemFire system.
+ * This is similar to {@link AssertionError}, but these errors are always enabled in a GemFire
+ * system.
*
* @since GemFire 5.5
* @see AssertionError
@@ -61,93 +59,86 @@ public class InternalGemFireError extends Error {
}
/**
- * Constructs an AssertionError with its detail message derived
- * from the specified object, which is converted to a string as
- * defined in <i>The Java Language Specification, Second
- * Edition</i>, Section 15.18.1.1.
- *<p>
- * If the specified object is an instance of <tt>Throwable</tt>, it
- * becomes the <i>cause</i> of the newly constructed assertion error.
+ * Constructs an AssertionError with its detail message derived from the specified object, which
+ * is converted to a string as defined in <i>The Java Language Specification, Second Edition</i>,
+ * Section 15.18.1.1.
+ * <p>
+ * If the specified object is an instance of <tt>Throwable</tt>, it becomes the <i>cause</i> of
+ * the newly constructed assertion error.
*
* @param detailMessage value to be used in constructing detail message
- * @see Throwable#getCause()
+ * @see Throwable#getCause()
*/
public InternalGemFireError(Object detailMessage) {
- this("" + detailMessage);
- if (detailMessage instanceof Throwable)
- initCause((Throwable) detailMessage);
+ this("" + detailMessage);
+ if (detailMessage instanceof Throwable)
+ initCause((Throwable) detailMessage);
}
/**
- * Constructs an AssertionError with its detail message derived
- * from the specified <code>boolean</code>, which is converted to
- * a string as defined in <i>The Java Language Specification,
- * Second Edition</i>, Section 15.18.1.1.
+ * Constructs an AssertionError with its detail message derived from the specified
+ * <code>boolean</code>, which is converted to a string as defined in <i>The Java Language
+ * Specification, Second Edition</i>, Section 15.18.1.1.
*
* @param detailMessage value to be used in constructing detail message
*/
public InternalGemFireError(boolean detailMessage) {
- this("" + detailMessage);
+ this("" + detailMessage);
}
/**
- * Constructs an AssertionError with its detail message derived
- * from the specified <code>char</code>, which is converted to a
- * string as defined in <i>The Java Language Specification, Second
- * Edition</i>, Section 15.18.1.1.
+ * Constructs an AssertionError with its detail message derived from the specified
+ * <code>char</code>, which is converted to a string as defined in <i>The Java Language
+ * Specification, Second Edition</i>, Section 15.18.1.1.
*
* @param detailMessage value to be used in constructing detail message
*/
public InternalGemFireError(char detailMessage) {
- this("" + detailMessage);
+ this("" + detailMessage);
}
/**
- * Constructs an AssertionError with its detail message derived
- * from the specified <code>int</code>, which is converted to a
- * string as defined in <i>The Java Language Specification, Second
- * Edition</i>, Section 15.18.1.1.
+ * Constructs an AssertionError with its detail message derived from the specified
+ * <code>int</code>, which is converted to a string as defined in <i>The Java Language
+ * Specification, Second Edition</i>, Section 15.18.1.1.
*
* @param detailMessage value to be used in constructing detail message
*/
public InternalGemFireError(int detailMessage) {
- this("" + detailMessage);
+ this("" + detailMessage);
}
/**
- * Constructs an AssertionError with its detail message derived
- * from the specified <code>long</code>, which is converted to a
- * string as defined in <i>The Java Language Specification, Second
- * Edition</i>, Section 15.18.1.1.
+ * Constructs an AssertionError with its detail message derived from the specified
+ * <code>long</code>, which is converted to a string as defined in <i>The Java Language
+ * Specification, Second Edition</i>, Section 15.18.1.1.
*
* @param detailMessage value to be used in constructing detail message
*/
public InternalGemFireError(long detailMessage) {
- this("" + detailMessage);
+ this("" + detailMessage);
}
/**
- * Constructs an AssertionError with its detail message derived
- * from the specified <code>float</code>, which is converted to a
- * string as defined in <i>The Java Language Specification, Second
- * Edition</i>, Section 15.18.1.1.
+ * Constructs an AssertionError with its detail message derived from the specified
+ * <code>float</code>, which is converted to a string as defined in <i>The Java Language
+ * Specification, Second Edition</i>, Section 15.18.1.1.
*
* @param detailMessage value to be used in constructing detail message
*/
public InternalGemFireError(float detailMessage) {
- this("" + detailMessage);
+ this("" + detailMessage);
}
/**
- * Constructs an AssertionError with its detail message derived
- * from the specified <code>double</code>, which is converted to a
- * string as defined in <i>The Java Language Specification, Second
- * Edition</i>, Section 15.18.1.1.
+ * Constructs an AssertionError with its detail message derived from the specified
+ * <code>double</code>, which is converted to a string as defined in <i>The Java Language
+ * Specification, Second Edition</i>, Section 15.18.1.1.
*
* @param detailMessage value to be used in constructing detail message
*/
public InternalGemFireError(double detailMessage) {
- this("" + detailMessage);
+ this("" + detailMessage);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java b/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java
index a2362f8..6cd067d 100644
--- a/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java
+++ b/geode-core/src/main/java/org/apache/geode/InternalGemFireException.java
@@ -1,34 +1,30 @@
/*
- * 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
+ * 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;
/**
- * An <code>InternalGemFireException</code> is thrown when
- * a low level, internal, operation fails due to no fault of
- * the user. The message often contains an operating system
- * error code.
+ * An <code>InternalGemFireException</code> is thrown when a low level, internal, operation fails
+ * due to no fault of the user. The message often contains an operating system error code.
*
*
*/
public class InternalGemFireException extends GemFireException {
-private static final long serialVersionUID = -6912843691545178619L;
+ private static final long serialVersionUID = -6912843691545178619L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
public InternalGemFireException() {
super();
@@ -46,8 +42,7 @@ private static final long serialVersionUID = -6912843691545178619L;
}
/**
- * Creates a new <code>InternalGemFireException</code> that was
- * caused by a given exception
+ * Creates a new <code>InternalGemFireException</code> that was caused by a given exception
*/
public InternalGemFireException(String message, Throwable thr) {
super(message, thr);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java b/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
index 10d2d48..bb75455 100755
--- a/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
+++ b/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
@@ -1,42 +1,39 @@
/*
- * 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
+ * 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;
import java.io.DataInput;
/**
- * An <code>InvalidDeltaException</code> is thrown when a delta cannot be
- * successfully applied by the receiving peer/client. The class implementing
- * {@link Delta} may also choose to throw this in
- * {@link Delta#fromDelta(DataInput in)}. GemFire, on encountering this
- * exception distributes the full application object.
+ * An <code>InvalidDeltaException</code> is thrown when a delta cannot be successfully applied by
+ * the receiving peer/client. The class implementing {@link Delta} may also choose to throw this in
+ * {@link Delta#fromDelta(DataInput in)}. GemFire, on encountering this exception distributes the
+ * full application object.
*
* @since GemFire 6.1
*/
public class InvalidDeltaException extends GemFireException {
/**
- * Creates a new <code>InvalidDeltaException</code>.
+ * Creates a new <code>InvalidDeltaException</code>.
*/
- public InvalidDeltaException() {
- }
+ public InvalidDeltaException() {}
/**
- * Creates a new <code>InvalidDeltaException</code>.
+ * Creates a new <code>InvalidDeltaException</code>.
+ *
* @param msg String explaining the exception
*/
public InvalidDeltaException(String msg) {
@@ -44,7 +41,8 @@ public class InvalidDeltaException extends GemFireException {
}
/**
- * Creates a new <code>InvalidDeltaException</code>.
+ * Creates a new <code>InvalidDeltaException</code>.
+ *
* @param e Throwable
*/
public InvalidDeltaException(Throwable e) {
@@ -52,7 +50,8 @@ public class InvalidDeltaException extends GemFireException {
}
/**
- * Creates a new <code>InvalidDeltaException</code>.
+ * Creates a new <code>InvalidDeltaException</code>.
+ *
* @param msg String explaining the exception
* @param e Throwable
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/InvalidValueException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InvalidValueException.java b/geode-core/src/main/java/org/apache/geode/InvalidValueException.java
index e323431..455879f 100644
--- a/geode-core/src/main/java/org/apache/geode/InvalidValueException.java
+++ b/geode-core/src/main/java/org/apache/geode/InvalidValueException.java
@@ -1,31 +1,28 @@
/*
- * 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
+ * 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;
/**
- * An <code>InvalidValueException</code> is thrown when an attempt is
- * made to set a configuration attribute to an invalid value is made.
- * Values are considered invalid when they are
- * not compatible with the attribute's type.
+ * An <code>InvalidValueException</code> is thrown when an attempt is made to set a configuration
+ * attribute to an invalid value is made. Values are considered invalid when they are not compatible
+ * with the attribute's type.
*/
public class InvalidValueException extends GemFireException {
-private static final long serialVersionUID = 6186767885369527709L;
+ private static final long serialVersionUID = 6186767885369527709L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>InvalidValueException</code>.
@@ -33,6 +30,7 @@ private static final long serialVersionUID = 6186767885369527709L;
public InvalidValueException(String message) {
super(message);
}
+
/**
* Creates a new <code>InvalidValueException</code>.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java b/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java
index 54813b3..40e29bc 100644
--- a/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java
+++ b/geode-core/src/main/java/org/apache/geode/InvalidVersionException.java
@@ -1,18 +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
+ * 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;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/LicenseException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/LicenseException.java b/geode-core/src/main/java/org/apache/geode/LicenseException.java
index 96f07af..c98d367 100644
--- a/geode-core/src/main/java/org/apache/geode/LicenseException.java
+++ b/geode-core/src/main/java/org/apache/geode/LicenseException.java
@@ -1,33 +1,30 @@
/*
- * 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
+ * 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;
/**
- * A <code>LicenseException</code> is thrown when
- * the license check fails.
+ * A <code>LicenseException</code> is thrown when the license check fails.
*
* @deprecated Licensing is not supported as of 8.0.
*/
@Deprecated
public class LicenseException extends GemFireException {
-private static final long serialVersionUID = -1178557127300465801L;
+ private static final long serialVersionUID = -1178557127300465801L;
- ////////////////////// Constructors //////////////////////
+ ////////////////////// Constructors //////////////////////
/**
* Creates a new <code>LicenseException</code>.
@@ -37,16 +34,14 @@ private static final long serialVersionUID = -1178557127300465801L;
}
/**
- * Creates a new <code>LicenseException</code> that was
- * caused by a given exception
+ * Creates a new <code>LicenseException</code> that was caused by a given exception
*/
public LicenseException(String message, Throwable thr) {
super(message, thr);
}
/**
- * Creates a new <code>LicenseException</code> that was
- * caused by a given exception
+ * Creates a new <code>LicenseException</code> that was caused by a given exception
*/
public LicenseException(Throwable thr) {
super(thr.getMessage(), thr);
[64/98] [abbrv] incubator-geode git commit: GEODE-2014: add the
missing license header
Posted by ds...@apache.org.
GEODE-2014: add the missing license header
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/77429811
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/77429811
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/77429811
Branch: refs/heads/feature/GEM-983
Commit: 7742981161238f82fcbb7144315adad966a0d26c
Parents: 259ceb7
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Mon Oct 24 12:44:28 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Mon Oct 24 12:44:28 2016 -0700
----------------------------------------------------------------------
geode-web-api/src/main/resources/swagger.properties | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/77429811/geode-web-api/src/main/resources/swagger.properties
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/resources/swagger.properties b/geode-web-api/src/main/resources/swagger.properties
index 5042b2c..c065510 100644
--- a/geode-web-api/src/main/resources/swagger.properties
+++ b/geode-web-api/src/main/resources/swagger.properties
@@ -1,2 +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
+#
+# 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.
+#
springfox.documentation.swagger.v2.path=/v2/api-docs
springfox.documentation.swagger.v1.path=/v1/api-docs
\ No newline at end of file
[04/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
index 318fed0..ae4dcb5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
@@ -1,42 +1,41 @@
/*
- * 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
+ * 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;
-/** A user-defined object defined in the {@link RegionAttributes} that is
- * called synchronously before a region or entry in the cache is
- * modified. The typical use for a <code>CacheWriter</code> is to update a database.
- * Application writers should implement these methods to execute
+/**
+ * A user-defined object defined in the {@link RegionAttributes} that is called synchronously before
+ * a region or entry in the cache is modified. The typical use for a <code>CacheWriter</code> is to
+ * update a database. Application writers should implement these methods to execute
* application-specific behavior before the cache is modified.
*
- * <p>Before the region is updated via a put, create, or destroy operation,
- * GemFire will call a <code>CacheWriter</code> that is installed anywhere in any
- * participating cache for that region, preferring a local <code>CacheWriter</code>
- * if there is one. Usually there will be only one <code>CacheWriter</code> in
- * the distributed system. If there are multiple <code>CacheWriter</code>s
- * available in the distributed system, the GemFire
- * implementation always prefers one that is stored locally, or else picks one
- * arbitrarily; in any case only one <code>CacheWriter</code> will be invoked.
+ * <p>
+ * Before the region is updated via a put, create, or destroy operation, GemFire will call a
+ * <code>CacheWriter</code> that is installed anywhere in any participating cache for that region,
+ * preferring a local <code>CacheWriter</code> if there is one. Usually there will be only one
+ * <code>CacheWriter</code> in the distributed system. If there are multiple
+ * <code>CacheWriter</code>s available in the distributed system, the GemFire implementation always
+ * prefers one that is stored locally, or else picks one arbitrarily; in any case only one
+ * <code>CacheWriter</code> will be invoked.
*
- * <p>The <code>CacheWriter</code> is capable of aborting the update to the cache by throwing
- * a <code>CacheWriterException</code>. This exception or any runtime exception
- * thrown by the <code>CacheWriter</code> will abort the operation and the
- * exception will be propagated to the initiator of the operation, regardless
- * of whether the initiator is in the same VM as the <code>CacheWriter</code>.
+ * <p>
+ * The <code>CacheWriter</code> is capable of aborting the update to the cache by throwing a
+ * <code>CacheWriterException</code>. This exception or any runtime exception thrown by the
+ * <code>CacheWriter</code> will abort the operation and the exception will be propagated to the
+ * initiator of the operation, regardless of whether the initiator is in the same VM as the
+ * <code>CacheWriter</code>.
*
*
* @see AttributesFactory#setCacheWriter
@@ -44,107 +43,88 @@ package org.apache.geode.cache;
* @see AttributesMutator#setCacheWriter
* @since GemFire 3.0
*/
-public interface CacheWriter<K,V> extends CacheCallback {
+public interface CacheWriter<K, V> extends CacheCallback {
/**
- * Called before an entry is updated. The entry update is initiated by a <code>put</code>
- * or a <code>get</code> that causes the loader to update an existing entry.
- * The entry previously existed in the cache where the operation was
- * initiated, although the old value may have been null. The entry being
- * updated may or may not exist in the local cache where the CacheWriter is
+ * Called before an entry is updated. The entry update is initiated by a <code>put</code> or a
+ * <code>get</code> that causes the loader to update an existing entry. The entry previously
+ * existed in the cache where the operation was initiated, although the old value may have been
+ * null. The entry being updated may or may not exist in the local cache where the CacheWriter is
* installed.
*
* @param event an EntryEvent that provides information about the operation in progress
- * @throws CacheWriterException if thrown will abort the operation in progress,
- * and the exception will be propagated back to caller that initiated
- * the operation
+ * @throws CacheWriterException if thrown will abort the operation in progress, and the exception
+ * will be propagated back to caller that initiated the operation
* @see Region#put(Object, Object)
* @see Region#get(Object)
*/
- public void beforeUpdate(EntryEvent<K,V> event)
- throws CacheWriterException;
+ public void beforeUpdate(EntryEvent<K, V> event) throws CacheWriterException;
- /** Called before an entry is created. Entry creation is initiated by a
- * <code>create</code>, a <code>put</code>, or a <code>get</code>.
- * The <code>CacheWriter</code> can determine whether this value comes from a
- * <code>get</code> or not by evaluating the {@link CacheEvent#getOperation() Operation}'s {@link Operation#isLoad()} method.
- * The entry being created may already exist in the local cache where this <code>CacheWriter</code>
- * is installed, but it does not yet exist in the cache where the operation was initiated.
+ /**
+ * Called before an entry is created. Entry creation is initiated by a <code>create</code>, a
+ * <code>put</code>, or a <code>get</code>. The <code>CacheWriter</code> can determine whether
+ * this value comes from a <code>get</code> or not by evaluating the
+ * {@link CacheEvent#getOperation() Operation}'s {@link Operation#isLoad()} method. The entry
+ * being created may already exist in the local cache where this <code>CacheWriter</code> is
+ * installed, but it does not yet exist in the cache where the operation was initiated.
+ *
* @param event an EntryEvent that provides information about the operation in progress
- * @throws CacheWriterException if thrown will abort the operation in progress,
- * and the exception will be propagated back to caller that initiated
- * the operation
+ * @throws CacheWriterException if thrown will abort the operation in progress, and the exception
+ * will be propagated back to caller that initiated the operation
* @see Region#create(Object, Object)
* @see Region#put(Object, Object)
* @see Region#get(Object)
*/
- public void beforeCreate(EntryEvent<K,V> event)
- throws CacheWriterException;
+ public void beforeCreate(EntryEvent<K, V> event) throws CacheWriterException;
/**
- * Called before an entry is destroyed. The entry being destroyed may or may
- * not exist in the local cache where the CacheWriter is installed. This method
- * is <em>not</em> called as a result of expiration or
- * {@link Region#localDestroy(Object)}.
+ * Called before an entry is destroyed. The entry being destroyed may or may not exist in the
+ * local cache where the CacheWriter is installed. This method is <em>not</em> called as a result
+ * of expiration or {@link Region#localDestroy(Object)}.
*
* @param event an EntryEvent that provides information about the operation in progress
- * @throws CacheWriterException if thrown will abort the operation in progress,
- * and the exception will be propagated back to caller that initiated
- * the operation
+ * @throws CacheWriterException if thrown will abort the operation in progress, and the exception
+ * will be propagated back to caller that initiated the operation
*
* @see Region#destroy(Object)
*/
- public void beforeDestroy(EntryEvent<K,V> event)
- throws CacheWriterException;
+ public void beforeDestroy(EntryEvent<K, V> event) throws CacheWriterException;
/**
- * Called before a region is destroyed. The <code>CacheWriter</code>
- * will not additionally be called for each entry that is destroyed
- * in the region as a result of a region destroy. If the region's
- * subregions have <code>CacheWriter</code>s installed, then they
- * will be called for the cascading subregion destroys.
- * This method is <em>not</em> called as a result of
- * {@link Region#close}, {@link Cache#close}, or {@link Region#localDestroyRegion()}. However, the
- * {@link Region#close} method is invoked regardless of whether a
- * region is destroyed locally. A non-local region destroy results
- * in an invocation of {@link #beforeRegionDestroy} followed by an
- * invocation of {@link Region#close}.
- *<p>
- * WARNING: This method should not destroy or create any regions itself or a
- * deadlock will occur.
+ * Called before a region is destroyed. The <code>CacheWriter</code> will not additionally be
+ * called for each entry that is destroyed in the region as a result of a region destroy. If the
+ * region's subregions have <code>CacheWriter</code>s installed, then they will be called for the
+ * cascading subregion destroys. This method is <em>not</em> called as a result of
+ * {@link Region#close}, {@link Cache#close}, or {@link Region#localDestroyRegion()}. However, the
+ * {@link Region#close} method is invoked regardless of whether a region is destroyed locally. A
+ * non-local region destroy results in an invocation of {@link #beforeRegionDestroy} followed by
+ * an invocation of {@link Region#close}.
+ * <p>
+ * WARNING: This method should not destroy or create any regions itself or a deadlock will occur.
*
- * @param event
- * a RegionEvent that provides information about the operation
+ * @param event a RegionEvent that provides information about the operation
*
- * @throws CacheWriterException
- * if thrown, will abort the operation in progress, and the
- * exception will be propagated back to the caller that
- * initiated the operation
+ * @throws CacheWriterException if thrown, will abort the operation in progress, and the exception
+ * will be propagated back to the caller that initiated the operation
*
* @see Region#destroyRegion()
*/
- public void beforeRegionDestroy(RegionEvent<K,V> event)
- throws CacheWriterException;
+ public void beforeRegionDestroy(RegionEvent<K, V> event) throws CacheWriterException;
/**
- * Called before a region is cleared. The <code>CacheWriter</code>
- * will not additionally be called for each entry that is cleared
- * in the region as a result of a region clear.
+ * Called before a region is cleared. The <code>CacheWriter</code> will not additionally be called
+ * for each entry that is cleared in the region as a result of a region clear.
*
- *<p>
- * WARNING: This method should not clear/destroy any regions
+ * <p>
+ * WARNING: This method should not clear/destroy any regions
*
*
- * @param event
- * a RegionEvent that provides information about the operation
+ * @param event a RegionEvent that provides information about the operation
*
- * @throws CacheWriterException
- * if thrown, will abort the operation in progress, and the
- * exception will be propagated back to the caller that
- * initiated the operation
+ * @throws CacheWriterException if thrown, will abort the operation in progress, and the exception
+ * will be propagated back to the caller that initiated the operation
*
* @see Region#clear
*/
- public void beforeRegionClear(RegionEvent<K,V> event)
- throws CacheWriterException;
+ public void beforeRegionClear(RegionEvent<K, V> event) throws CacheWriterException;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheWriterException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheWriterException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheWriterException.java
index 081cbc3..59bdab1 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheWriterException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheWriterException.java
@@ -1,26 +1,24 @@
/*
- * 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
+ * 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;
/**
- * An exception thrown by a <code>CacheWriter</code> method. This exception
- * is propagated back to the caller that initiated modification of the
- * cache, even if the caller is not in the same cache VM.
+ * An exception thrown by a <code>CacheWriter</code> method. This exception is propagated back to
+ * the caller that initiated modification of the cache, even if the caller is not in the same cache
+ * VM.
*
*
* @see CacheWriter
@@ -32,35 +30,37 @@ package org.apache.geode.cache;
* @since GemFire 3.0
*/
public class CacheWriterException extends OperationAbortedException {
-private static final long serialVersionUID = -2872212342970454458L;
-
+ private static final long serialVersionUID = -2872212342970454458L;
+
/**
* Creates a new instance of <code>CacheWriterException</code>.
*/
- public CacheWriterException() {
- }
-
-
+ public CacheWriterException() {}
+
+
/**
* Constructs an instance of <code>CacheWriterException</code> with the specified detail message.
+ *
* @param msg the detail message
*/
public CacheWriterException(String msg) {
super(msg);
}
-
+
/**
* Constructs an instance of <code>CacheWriterException</code> with the specified detail message
* and cause.
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
public CacheWriterException(String msg, Throwable cause) {
super(msg, cause);
}
-
+
/**
* Constructs an instance of <code>CacheWriterException</code> with the specified cause.
+ *
* @param cause the causal Throwable
*/
public CacheWriterException(Throwable cause) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheXmlException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheXmlException.java b/geode-core/src/main/java/org/apache/geode/cache/CacheXmlException.java
index c6db5c7..7883d05 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheXmlException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheXmlException.java
@@ -1,26 +1,23 @@
/*
- * 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
+ * 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;
/**
- * Thrown when a problem is encountered while parsing a <A
- * href="package-summary.html#declarative">declarative caching XML
- * file</A>. Examples of such problems are a malformed XML file or
- * the inability to load a {@link Declarable} class.
+ * Thrown when a problem is encountered while parsing a
+ * <A href="package-summary.html#declarative">declarative caching XML file</A>. Examples of such
+ * problems are a malformed XML file or the inability to load a {@link Declarable} class.
*
* @see CacheFactory#create
*
@@ -28,19 +25,17 @@ package org.apache.geode.cache;
* @since GemFire 3.0
*/
public class CacheXmlException extends CacheRuntimeException {
-private static final long serialVersionUID = -4343870964883131754L;
+ private static final long serialVersionUID = -4343870964883131754L;
/**
- * Creates a new <code>CacheXmlException</code> with the given
- * description and cause.
+ * Creates a new <code>CacheXmlException</code> with the given description and cause.
*/
public CacheXmlException(String message, Throwable cause) {
super(message, cause);
}
/**
- * Creates a new <code>CacheXmlException</code> with the given
- * description.
+ * Creates a new <code>CacheXmlException</code> with the given description.
*/
public CacheXmlException(String message) {
super(message);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java b/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
index 321791e..648882e 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ClientSession.java
@@ -1,31 +1,29 @@
/*
- * 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
+ * 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;
/**
- * Class <code>ClientSession</code> represents a client connection on the
- * server. <code>ClientSessions</code> can be used from the cache server to
- * perform interest registrations and unregistrations on behalf of clients.
- * <code>ClientSessions</code> are only available on the cache server.
+ * Class <code>ClientSession</code> represents a client connection on the server.
+ * <code>ClientSessions</code> can be used from the cache server to perform interest registrations
+ * and unregistrations on behalf of clients. <code>ClientSessions</code> are only available on the
+ * cache server.
*
* <p>
- * The ClientSession is often used in conjunction with a callback
- * <code>EntryEvent</code> as shown below.
+ * The ClientSession is often used in conjunction with a callback <code>EntryEvent</code> as shown
+ * below.
*
* <pre>
* String durableClientId = ...; // Some part of the event's key or value would contain this id
@@ -36,8 +34,7 @@ package org.apache.geode.cache;
* </pre>
*
* @since GemFire 6.0
- * @see org.apache.geode.cache.server.CacheServer#getClientSession(String)
- * getClientSession
+ * @see org.apache.geode.cache.server.CacheServer#getClientSession(String) getClientSession
* @see org.apache.geode.cache.server.CacheServer#getClientSession(org.apache.geode.distributed.DistributedMember)
* getClientSession
*
@@ -47,146 +44,103 @@ public interface ClientSession {
/**
* Registers interest in a particular region and key
*
- * @param regionName
- * The name of the region in which to register interest
- * @param keyOfInterest
- * The key on which to register interest
- * @param policy
- * The {@link org.apache.geode.cache.InterestResultPolicy}. Note:
- * For the special token 'ALL_KEYS' and lists of keys, values are not
- * pushed to the client.
- * @param isDurable
- * Whether the interest is durable
- * @throws IllegalStateException
- * if this is not the primary server for the given client
+ * @param regionName The name of the region in which to register interest
+ * @param keyOfInterest The key on which to register interest
+ * @param policy The {@link org.apache.geode.cache.InterestResultPolicy}. Note: For the special
+ * token 'ALL_KEYS' and lists of keys, values are not pushed to the client.
+ * @param isDurable Whether the interest is durable
+ * @throws IllegalStateException if this is not the primary server for the given client
*/
- public void registerInterest(String regionName, Object keyOfInterest,
- InterestResultPolicy policy, boolean isDurable);
+ public void registerInterest(String regionName, Object keyOfInterest, InterestResultPolicy policy,
+ boolean isDurable);
/**
* Registers interest in a particular region and key
*
- * @param regionName
- * The name of the region in which to register interest
- * @param keyOfInterest
- * The key to on which to register interest
- * @param policy
- * The {@link org.apache.geode.cache.InterestResultPolicy}. Note:
- * For the special token 'ALL_KEYS' and lists of keys, values are not
- * pushed to the client.
- * @param isDurable
- * Whether the interest is durable
- * @param receiveValues
- * Whether to receive create or update events as invalidates similar
- * to notify-by-subscription false. The default is true.
- * @throws IllegalStateException
- * if this is not the primary server for the given client
+ * @param regionName The name of the region in which to register interest
+ * @param keyOfInterest The key to on which to register interest
+ * @param policy The {@link org.apache.geode.cache.InterestResultPolicy}. Note: For the special
+ * token 'ALL_KEYS' and lists of keys, values are not pushed to the client.
+ * @param isDurable Whether the interest is durable
+ * @param receiveValues Whether to receive create or update events as invalidates similar to
+ * notify-by-subscription false. The default is true.
+ * @throws IllegalStateException if this is not the primary server for the given client
* @since GemFire 6.5
*/
- public void registerInterest(String regionName, Object keyOfInterest,
- InterestResultPolicy policy, boolean isDurable, boolean receiveValues);
-
+ public void registerInterest(String regionName, Object keyOfInterest, InterestResultPolicy policy,
+ boolean isDurable, boolean receiveValues);
+
/**
* Registers interest in a particular region and regular expression
*
- * @param regionName
- * The name of the region in which to register interest
- * @param regex
- * The regular expression on which to register interest
- * @param isDurable
- * Whether the interest is durable
- * @throws IllegalStateException
- * if this is not the primary server for the given client
+ * @param regionName The name of the region in which to register interest
+ * @param regex The regular expression on which to register interest
+ * @param isDurable Whether the interest is durable
+ * @throws IllegalStateException if this is not the primary server for the given client
*/
- public void registerInterestRegex(String regionName, String regex,
- boolean isDurable);
-
+ public void registerInterestRegex(String regionName, String regex, boolean isDurable);
+
/**
* Registers interest in a particular region and regular expression
*
- * @param regionName
- * The name of the region in which to register interest
- * @param regex
- * The regular expression to on which to register interest
- * @param isDurable
- * Whether the interest is durable
- * @param receiveValues
- * Whether to receive create or update events as invalidates similar
- * to notify-by-subscription false. The default is true.
- * @throws IllegalStateException
- * if this is not the primary server for the given client
+ * @param regionName The name of the region in which to register interest
+ * @param regex The regular expression to on which to register interest
+ * @param isDurable Whether the interest is durable
+ * @param receiveValues Whether to receive create or update events as invalidates similar to
+ * notify-by-subscription false. The default is true.
+ * @throws IllegalStateException if this is not the primary server for the given client
* @since GemFire 6.5
*/
- public void registerInterestRegex(String regionName, String regex,
- boolean isDurable, boolean receiveValues);
+ public void registerInterestRegex(String regionName, String regex, boolean isDurable,
+ boolean receiveValues);
/**
* Unregisters interest in a particular region and key
*
- * @param regionName
- * The name of the region in which to unregister interest
- * @param keyOfInterest
- * The key on which to unregister interest
- * @param isDurable
- * Whether the interest is durable
- * @throws IllegalStateException
- * if this is not the primary server for the given client
+ * @param regionName The name of the region in which to unregister interest
+ * @param keyOfInterest The key on which to unregister interest
+ * @param isDurable Whether the interest is durable
+ * @throws IllegalStateException if this is not the primary server for the given client
*/
- public void unregisterInterest(String regionName, Object keyOfInterest,
- boolean isDurable);
-
+ public void unregisterInterest(String regionName, Object keyOfInterest, boolean isDurable);
+
/**
* Unregisters interest in a particular region and key
*
- * @param regionName
- * The name of the region in which to unregister interest
- * @param keyOfInterest
- * The key on which to unregister interest
- * @param isDurable
- * Whether the interest is durable
- * @param receiveValues
- * Whether to receive create or update events as invalidates similar
- * to notify-by-subscription false. The default is true.
- * @throws IllegalStateException
- * if this is not the primary server for the given client
+ * @param regionName The name of the region in which to unregister interest
+ * @param keyOfInterest The key on which to unregister interest
+ * @param isDurable Whether the interest is durable
+ * @param receiveValues Whether to receive create or update events as invalidates similar to
+ * notify-by-subscription false. The default is true.
+ * @throws IllegalStateException if this is not the primary server for the given client
* @since GemFire 6.5
*/
- public void unregisterInterest(String regionName, Object keyOfInterest,
- boolean isDurable, boolean receiveValues);
+ public void unregisterInterest(String regionName, Object keyOfInterest, boolean isDurable,
+ boolean receiveValues);
/**
* Unregisters interest in a particular region and regular expression
*
- * @param regionName
- * The name of the region in which to unregister interest
- * @param regex
- * The regular expression on which to unregister interest
- * @param isDurable
- * Whether the interest is durable
- * @throws IllegalStateException
- * if this is not the primary server for the given client
+ * @param regionName The name of the region in which to unregister interest
+ * @param regex The regular expression on which to unregister interest
+ * @param isDurable Whether the interest is durable
+ * @throws IllegalStateException if this is not the primary server for the given client
*/
- public void unregisterInterestRegex(String regionName, String regex,
- boolean isDurable);
+ public void unregisterInterestRegex(String regionName, String regex, boolean isDurable);
/**
* Unregisters interest in a particular region and regular expression
*
- * @param regionName
- * The name of the region in which to unregister interest
- * @param regex
- * The regular expression on which to unregister interest
- * @param isDurable
- * Whether the interest is durable
- * @param receiveValues
- * Whether to receive create or update events as invalidates similar
- * to notify-by-subscription false. The default is true.
- * @throws IllegalStateException
- * if this is not the primary server for the given client
+ * @param regionName The name of the region in which to unregister interest
+ * @param regex The regular expression on which to unregister interest
+ * @param isDurable Whether the interest is durable
+ * @param receiveValues Whether to receive create or update events as invalidates similar to
+ * notify-by-subscription false. The default is true.
+ * @throws IllegalStateException if this is not the primary server for the given client
* @since GemFire 6.5
*/
- public void unregisterInterestRegex(String regionName, String regex,
- boolean isDurable, boolean receiveValues);
+ public void unregisterInterestRegex(String regionName, String regex, boolean isDurable,
+ boolean receiveValues);
/**
* Returns whether this server is the primary for this client
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CommitConflictException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CommitConflictException.java b/geode-core/src/main/java/org/apache/geode/cache/CommitConflictException.java
index be3575f..282c9c5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CommitConflictException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CommitConflictException.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
+ * 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;
-/** Thrown when a commit fails due to a write conflict.
+/**
+ * Thrown when a commit fails due to a write conflict.
*
*
* @see CacheTransactionManager#commit
@@ -27,30 +26,34 @@ public class CommitConflictException extends TransactionException {
private static final long serialVersionUID = -1491184174802596675L;
/**
- * Constructs an instance of <code>CommitConflictException</code> with the specified detail message.
+ * Constructs an instance of <code>CommitConflictException</code> with the specified detail
+ * message.
+ *
* @param msg the detail message
*/
public CommitConflictException(String msg) {
super(msg);
}
-
+
/**
- * Constructs an instance of <code>CommitConflictException</code> with the specified detail message
- * and cause.
+ * Constructs an instance of <code>CommitConflictException</code> with the specified detail
+ * message and cause.
+ *
* @param msg the detail message
* @param cause the causal Throwable
*/
public CommitConflictException(String msg, Throwable cause) {
super(msg, cause);
}
-
+
/**
* Constructs an instance of <code>CommitConflictException</code> with the specified cause.
+ *
* @param cause the causal Throwable
* @since GemFire 6.5
*/
public CommitConflictException(Throwable cause) {
super(cause);
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java b/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
index eea0b56..84e4953 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CommitDistributionException.java
@@ -1,46 +1,42 @@
/*
- * 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
+ * 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;
import java.util.*;
/**
- * Indicates that an attempt to notify required participants of a transaction
- * involving one or more regions that are configured with {@link
- * MembershipAttributes} may have failed. The commit itself was completed but
- * one or more regions affected by the transaction have one or more required
- * roles that were not successfully notified. Failure may be caused by
- * departure of one or more required roles while sending the operation to
- * them. This exception will contain one {@link RegionDistributionException}
- * for every region that had a reliability failure. Details of the failed
- * {@link MembershipAttributes#getRequiredRoles required roles} are provided
- * in each RegionDistributionException.
+ * Indicates that an attempt to notify required participants of a transaction involving one or more
+ * regions that are configured with {@link MembershipAttributes} may have failed. The commit itself
+ * was completed but one or more regions affected by the transaction have one or more required roles
+ * that were not successfully notified. Failure may be caused by departure of one or more required
+ * roles while sending the operation to them. This exception will contain one
+ * {@link RegionDistributionException} for every region that had a reliability failure. Details of
+ * the failed {@link MembershipAttributes#getRequiredRoles required roles} are provided in each
+ * RegionDistributionException.
*
* @since GemFire 5.0
*/
public class CommitDistributionException extends TransactionException {
private static final long serialVersionUID = -3517820638706581823L;
- /**
- * The RegionDistributionExceptions for every region that had a reliability
- * failure during distribution of the operation.
+ /**
+ * The RegionDistributionExceptions for every region that had a reliability failure during
+ * distribution of the operation.
*/
private Set regionDistributionExceptions = Collections.EMPTY_SET;
-
- /**
+
+ /**
* Constructs a <code>CommitDistributionException</code> with a message.
*
* @param s the String message
@@ -48,14 +44,13 @@ public class CommitDistributionException extends TransactionException {
public CommitDistributionException(String s) {
super(s);
}
-
- /**
- * Constructs a <code>CommitDistributionException</code> with a message and
- * a cause.
+
+ /**
+ * Constructs a <code>CommitDistributionException</code> with a message and a cause.
*
* @param s the String message
- * @param regionDistributionExceptions set of RegionDistributionExceptions
- * for each region that had a reliability failure
+ * @param regionDistributionExceptions set of RegionDistributionExceptions for each region that
+ * had a reliability failure
*/
public CommitDistributionException(String s, Set regionDistributionExceptions) {
super(s);
@@ -64,17 +59,17 @@ public class CommitDistributionException extends TransactionException {
this.regionDistributionExceptions = Collections.EMPTY_SET;
}
}
-
- /**
- * Returns set of RegionDistributionExceptions for each region that had a
- * reliability failure during distribution of the operation.
+
+ /**
+ * Returns set of RegionDistributionExceptions for each region that had a reliability failure
+ * during distribution of the operation.
*
- * @return set of RegionDistributionExceptions for each region that had a
- * reliability failure during distribution of the operation
+ * @return set of RegionDistributionExceptions for each region that had a reliability failure
+ * during distribution of the operation
*/
public Set getRegionDistributionExceptions() {
return this.regionDistributionExceptions;
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CommitIncompleteException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CommitIncompleteException.java b/geode-core/src/main/java/org/apache/geode/cache/CommitIncompleteException.java
index 26544e8..d1e3bea 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CommitIncompleteException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CommitIncompleteException.java
@@ -1,27 +1,26 @@
/*
- * 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
+ * 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;
/**
* Thrown when a commit fails to complete due to errors
+ *
* @since GemFire 5.7
*/
public class CommitIncompleteException extends TransactionException {
-private static final long serialVersionUID = 1017741483744420800L;
+ private static final long serialVersionUID = 1017741483744420800L;
public CommitIncompleteException(String message) {
super(message);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java b/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
index 25f89eb..a387044 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CustomExpiry.java
@@ -1,41 +1,39 @@
/*
- * 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
+ * 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;
/**
- * This is the contract that a <code>custom-expiry</code> element must honor.
- * It determines the expiration characteristics for a specific entry in a region.
- * <p>Note that if you wish to refer to an implementation of this interface in XML,
- * the implementation must also implement the Declarable interface.
+ * This is the contract that a <code>custom-expiry</code> element must honor. It determines the
+ * expiration characteristics for a specific entry in a region.
+ * <p>
+ * Note that if you wish to refer to an implementation of this interface in XML, the implementation
+ * must also implement the Declarable interface.
*
*
*/
-public interface CustomExpiry<K,V> extends CacheCallback {
+public interface CustomExpiry<K, V> extends CacheCallback {
/**
- * Calculate the expiration for a given entry.
- * Returning null indicates that the
- * default for the region should be used.
+ * Calculate the expiration for a given entry. Returning null indicates that the default for the
+ * region should be used.
* <p>
* The entry parameter should not be used after this method invocation completes.
+ *
* @param entry the entry to calculate the expiration for
- * @return the expiration to be used, null if the region's defaults should be
- * used.
+ * @return the expiration to be used, null if the region's defaults should be used.
*/
- public ExpirationAttributes getExpiry(Region.Entry<K,V> entry);
+ public ExpirationAttributes getExpiry(Region.Entry<K, V> entry);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java b/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
index 8d1c2e0..e761eb2 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DataPolicy.java
@@ -1,36 +1,46 @@
/*
- * 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
+ * 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;
+
import org.apache.geode.internal.i18n.LocalizedStrings;
import java.io.*;
/**
- * Enumerated type for region data policy.
- * The data policy specifies how this local cache will handle the data for a region.
+ * Enumerated type for region data policy. The data policy specifies how this local cache will
+ * handle the data for a region.
* <ol>
- * <li><code>EMPTY</code> causes data to never be stored in local memory. The region will always appear empty. It can be used to for zero footprint producers that only want to distribute their data to others and for zero footprint consumers that only want to see events.
- * <li><code>NORMAL</code> causes data that this region is interested in to be stored in local memory. It allows the contents in this cache to differ from other caches.
- * <li><code>PARTITION</code> causes data that this region holds to be spread across processes. The amount of data held in this cache is configured in {@link PartitionAttributes} with a {@link PartitionAttributesFactory}.
- * <li><code>PERSISTENT_PARTITION</code> in addition to <code>PARTITION</code> also causes data to be stored to disk. The region initialization uses the data stored on disk.
- * <li><code>REPLICATE</code> causes data that this region is interested in to be stored in local memory. A distributed region will be initialized with the data from other caches. On distributed region operations that would cause the contents to differ with other caches are not allowed. This policy is allowed on local scope region but it behaves the same as <code>NORMAL</code>.
- * <li><code>PERSISTENT_REPLICATE</code> in addition to <code>REPLICATE</code> also causes data to be stored to disk. The region initialization uses the data stored on disk. Note that the persistence applies to both local scope and distributed scope.
+ * <li><code>EMPTY</code> causes data to never be stored in local memory. The region will always
+ * appear empty. It can be used to for zero footprint producers that only want to distribute their
+ * data to others and for zero footprint consumers that only want to see events.
+ * <li><code>NORMAL</code> causes data that this region is interested in to be stored in local
+ * memory. It allows the contents in this cache to differ from other caches.
+ * <li><code>PARTITION</code> causes data that this region holds to be spread across processes. The
+ * amount of data held in this cache is configured in {@link PartitionAttributes} with a
+ * {@link PartitionAttributesFactory}.
+ * <li><code>PERSISTENT_PARTITION</code> in addition to <code>PARTITION</code> also causes data to
+ * be stored to disk. The region initialization uses the data stored on disk.
+ * <li><code>REPLICATE</code> causes data that this region is interested in to be stored in local
+ * memory. A distributed region will be initialized with the data from other caches. On distributed
+ * region operations that would cause the contents to differ with other caches are not allowed. This
+ * policy is allowed on local scope region but it behaves the same as <code>NORMAL</code>.
+ * <li><code>PERSISTENT_REPLICATE</code> in addition to <code>REPLICATE</code> also causes data to
+ * be stored to disk. The region initialization uses the data stored on disk. Note that the
+ * persistence applies to both local scope and distributed scope.
* </ol>
*
*
@@ -46,96 +56,103 @@ public class DataPolicy implements java.io.Serializable {
private static final DataPolicy[] VALUES = new DataPolicy[11];
/**
- * Data is never stored in local memory.
- * The region will always be empty locally.
- * It can be used to for zero footprint producers that only want to distribute
- * their data to others
- * and for zero footprint consumers that only want to see events.
+ * Data is never stored in local memory. The region will always be empty locally. It can be used
+ * to for zero footprint producers that only want to distribute their data to others and for zero
+ * footprint consumers that only want to see events.
*/
public static final DataPolicy EMPTY = new DataPolicy(0, "EMPTY");
/**
- * Allows the contents in this cache to differ from other caches.<p>
+ * Allows the contents in this cache to differ from other caches.
+ * <p>
* Data that this region is interested in is stored in local memory.
*/
public static final DataPolicy NORMAL = new DataPolicy(1, "NORMAL");
/**
- * The region will be initialized with the data from other caches and accepts
- * any new entries created in other caches.<p>
- * Operations that would cause the contents to differ with other caches
- * are not allowed.<p>
+ * The region will be initialized with the data from other caches and accepts any new entries
+ * created in other caches.
+ * <p>
+ * Operations that would cause the contents to differ with other caches are not allowed.
+ * <p>
* Data that this region is interested in is stored in local memory.
*/
public static final DataPolicy REPLICATE = new DataPolicy(2, "REPLICATE");
/**
- * In addition to <code>REPLICATE</code> also causes data to be stored to
- * disk. The region initialization may use the data stored on disk.
+ * In addition to <code>REPLICATE</code> also causes data to be stored to disk. The region
+ * initialization may use the data stored on disk.
*/
public static final DataPolicy PERSISTENT_REPLICATE = new DataPolicy(3, "PERSISTENT_REPLICATE");
-
-
+
+
/**
- * Data in this region may be spread across a number of processes. This is
- * further configured with {@link PartitionAttributes partitioning attributes}
+ * Data in this region may be spread across a number of processes. This is further configured with
+ * {@link PartitionAttributes partitioning attributes}
*/
public static final DataPolicy PARTITION = new DataPolicy(4, "PARTITION");
/**
- * In addition to <code>NORMAL</code>, contents inside of this cache are
- * (partially) initialized with data from other caches, if available.
- */
+ * In addition to <code>NORMAL</code>, contents inside of this cache are (partially) initialized
+ * with data from other caches, if available.
+ */
public static final DataPolicy PRELOADED = new DataPolicy(5, "PRELOADED");
/**
- * In addition to <code>PARTITION</code> also causes data to be stored to
- * disk. The region initialization may use the data stored on disk.
+ * In addition to <code>PARTITION</code> also causes data to be stored to disk. The region
+ * initialization may use the data stored on disk.
+ *
* @since GemFire 6.5
*/
public static final DataPolicy PERSISTENT_PARTITION = new DataPolicy(6, "PERSISTENT_PARTITION");
-
- /**
+
+ /**
* The data policy used by default; it is {@link #NORMAL}.
*/
public static final DataPolicy DEFAULT = NORMAL;
-
+
/** The name of this mirror type. */
private final transient String name;
-
+
/** used as ordinal to represent this DataPolicy */
public final byte ordinal;
private Object readResolve() throws ObjectStreamException {
- return VALUES[ordinal]; // Canonicalize
+ return VALUES[ordinal]; // Canonicalize
}
-
-
+
+
/** Creates a new instance of DataPolicy. */
private DataPolicy(int ordinal, String name) {
if (ordinal >= VALUES.length) {
- throw new IllegalArgumentException(LocalizedStrings.DataPolicy_ONLY_0_DATAPOLICIES_MAY_BE_DEFINED.toLocalizedString(Integer.valueOf(VALUES.length+1)));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DataPolicy_ONLY_0_DATAPOLICIES_MAY_BE_DEFINED
+ .toLocalizedString(Integer.valueOf(VALUES.length + 1)));
}
if (VALUES[ordinal] != null) {
- throw new IllegalArgumentException(LocalizedStrings.DataPolicy_ORDINAL_0_IS_ALREADY_DEFINED_BY_1.toLocalizedString(new Object[] {Integer.valueOf(ordinal), VALUES[ordinal]}));
+ throw new IllegalArgumentException(
+ LocalizedStrings.DataPolicy_ORDINAL_0_IS_ALREADY_DEFINED_BY_1
+ .toLocalizedString(new Object[] {Integer.valueOf(ordinal), VALUES[ordinal]}));
}
this.name = name;
- this.ordinal = (byte)(ordinal & 0xff);
+ this.ordinal = (byte) (ordinal & 0xff);
VALUES[this.ordinal] = this;
}
-
+
/** Return the DataPolicy represented by specified ordinal */
public static DataPolicy fromOrdinal(byte ordinal) {
return VALUES[ordinal];
}
-
-
- /** Return true if regions with this policy store data locally.<p>
- * Although DataPolicy {@link #PARTITION} will return true to this query,
- * it is possible to turn off local storage with
- * {@link PartitionAttributesFactory#setLocalMaxMemory(int)} by setting
- * localMaxMemory to zero.
+
+
+ /**
+ * Return true if regions with this policy store data locally.
+ * <p>
+ * Although DataPolicy {@link #PARTITION} will return true to this query, it is possible to turn
+ * off local storage with {@link PartitionAttributesFactory#setLocalMaxMemory(int)} by setting
+ * localMaxMemory to zero.
+ *
* @return true if regions with this policy store data locally.
* @see #NORMAL
* @see #PRELOADED
@@ -148,7 +165,9 @@ public class DataPolicy implements java.io.Serializable {
return this != EMPTY;
}
- /** Return whether this policy does replication.
+ /**
+ * Return whether this policy does replication.
+ *
* @return true if this policy does replication.
* @see #REPLICATE
* @see #PERSISTENT_REPLICATE
@@ -156,8 +175,10 @@ public class DataPolicy implements java.io.Serializable {
public boolean withReplication() {
return this == REPLICATE || this == PERSISTENT_REPLICATE;
}
-
- /** Return whether this policy does persistence.
+
+ /**
+ * Return whether this policy does persistence.
+ *
* @return true if this policy does persistence.
* @see #PERSISTENT_PARTITION
* @see #PERSISTENT_REPLICATE
@@ -167,7 +188,9 @@ public class DataPolicy implements java.io.Serializable {
return this == PERSISTENT_PARTITION || this == PERSISTENT_REPLICATE;
}
- /** Return whether this policy does partitioning.
+ /**
+ * Return whether this policy does partitioning.
+ *
* @return true if this policy does partitioning
* @see #PARTITION
* @see #PERSISTENT_PARTITION
@@ -177,7 +200,9 @@ public class DataPolicy implements java.io.Serializable {
return this == PARTITION || this == PERSISTENT_PARTITION;
}
- /** Return whether this policy does preloaded.
+ /**
+ * Return whether this policy does preloaded.
+ *
* @return true if this policy does preloaded.
* @see #PRELOADED
* @since GemFire 6.5
@@ -188,65 +213,79 @@ public class DataPolicy implements java.io.Serializable {
/**
* Return true if this policy is {@link #EMPTY}.
+ *
* @return true if this policy is {@link #EMPTY}.
* @deprecated from version 6.5 forward please use withStorage()
*/
public boolean isEmpty() {
return this == EMPTY;
}
+
/**
* Return true if this policy is {@link #NORMAL}.
+ *
* @return true if this policy is {@link #NORMAL}.
* @deprecated from version 6.5 forward please use an identity comparison instead of this method
*/
public boolean isNormal() {
return this == NORMAL;
}
+
/**
* Return true if this policy is {@link #PRELOADED}.
+ *
* @return true if this policy is {@link #PRELOADED}
* @deprecated from version 6.5 forward please use withPreloaded()
*/
public boolean isPreloaded() {
return this == PRELOADED;
}
+
/**
* Return true if this policy is the default.
+ *
* @return true if this policy is the default.
* @deprecated from version 6.5 forward please use an identity comparison instead of this method
*/
public boolean isDefault() {
return this == DEFAULT;
}
+
/**
* Return true if this policy is {@link #REPLICATE}.
+ *
* @return true if this policy is {@link #REPLICATE}.
* @deprecated from version 6.5 forward please use withReplication()
*/
public boolean isReplicate() {
return this == REPLICATE;
}
+
/**
* Return true if this policy is {@link #PERSISTENT_REPLICATE}.
+ *
* @return true if this policy is {@link #PERSISTENT_REPLICATE}.
* @deprecated from version 6.5 forward please use withPersistence() and withReplication()
*/
public boolean isPersistentReplicate() {
return this == PERSISTENT_REPLICATE;
}
-
+
/**
* Return true if this policy is {@link #PARTITION}.
+ *
* @return true if this policy is {@link #PARTITION}
* @deprecated from version 6.5 forward please use withPartitioning()
*/
public boolean isPartition() {
return this == PARTITION;
}
-
- /** Returns a string representation for this data policy.
- * @return the name of this data policy.
- */
+
+ /**
+ * Returns a string representation for this data policy.
+ *
+ * @return the name of this data policy.
+ */
@Override
public String toString() {
return this.name;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/Declarable.java b/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
index 113d098..57e1e63 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/Declarable.java
@@ -1,35 +1,33 @@
/*
- * 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
+ * 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;
import java.util.Properties;
-/**
+/**
* An object that can be described in a declarative caching XML file.
*
* <p>
*
- * Any user-defined object in the declarative caching xml file
- * should implement this interface in order to be constructed.
+ * Any user-defined object in the declarative caching xml file should implement this interface in
+ * order to be constructed.
*
* <p>
*
- * For example, the user can declare a <code>CacheLoader</code> in a declarative
- * XML file as follows:
+ * For example, the user can declare a <code>CacheLoader</code> in a declarative XML file as
+ * follows:
*
* <pre>
* <cache-loader>
@@ -42,12 +40,10 @@ import java.util.Properties;
*
* <p>
*
- * In this case, <code>com.company.app.DBLoader</code> must
- * implement both the {@link CacheLoader} and <code>Declarable</code>
- * interfaces. The cache service will construct a
- * <code>com.company.app.DBLoader</code> object by invoking the loader's
- * zero-argument constructor and then calling the {@link #init} method
- * to pass in the parameters.
+ * In this case, <code>com.company.app.DBLoader</code> must implement both the {@link CacheLoader}
+ * and <code>Declarable</code> interfaces. The cache service will construct a
+ * <code>com.company.app.DBLoader</code> object by invoking the loader's zero-argument constructor
+ * and then calling the {@link #init} method to pass in the parameters.
*
* <P>
*
@@ -60,17 +56,13 @@ import java.util.Properties;
public interface Declarable {
/**
- * Initializes a user-defined object using the given properties.
- * Note that any uncaught exception thrown by this method will cause
- * the <code>Cache</code> initialization to fail.
+ * Initializes a user-defined object using the given properties. Note that any uncaught exception
+ * thrown by this method will cause the <code>Cache</code> initialization to fail.
*
- * @param props
- * Contains the parameters declared in the declarative xml
- * file.
+ * @param props Contains the parameters declared in the declarative xml file.
*
- * @throws IllegalArgumentException
- * If one of the configuration options in <code>props</code>
- * is illegal or malformed.
+ * @throws IllegalArgumentException If one of the configuration options in <code>props</code> is
+ * illegal or malformed.
*/
public void init(Properties props);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java b/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
index 9571f93..e77e485 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskAccessException.java
@@ -1,18 +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
+ * 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;
@@ -29,14 +27,14 @@ public class DiskAccessException extends CacheRuntimeException {
private static final long serialVersionUID = 5799100281147167888L;
private transient boolean isRemote;
-
+
/**
* Constructs a new <code>DiskAccessException</code>.
*/
public DiskAccessException() {
super();
}
-
+
/**
* Constructs a new <code>DiskAccessException</code> with a message string.
*
@@ -46,7 +44,7 @@ public class DiskAccessException extends CacheRuntimeException {
public DiskAccessException(String msg, Region r) {
this(msg, null, r == null ? null : r.getFullPath());
}
-
+
/**
* Constructs a new <code>DiskAccessException</code> with a message string.
*
@@ -68,10 +66,9 @@ public class DiskAccessException extends CacheRuntimeException {
public DiskAccessException(String msg, DiskStore ds) {
this(msg, null, ds);
}
-
+
/**
- * Constructs a new <code>DiskAccessException</code> with a message string
- * and a cause.
+ * Constructs a new <code>DiskAccessException</code> with a message string and a cause.
*
* @param msg the message string
* @param cause a causal Throwable
@@ -79,12 +76,11 @@ public class DiskAccessException extends CacheRuntimeException {
* @since GemFire 6.5
*/
public DiskAccessException(String msg, Throwable cause, String regionName) {
- super((regionName!=null ? "For Region: " + regionName + ": " : "") + msg, cause);
+ super((regionName != null ? "For Region: " + regionName + ": " : "") + msg, cause);
}
/**
- * Constructs a new <code>DiskAccessException</code> with a message string
- * and a cause.
+ * Constructs a new <code>DiskAccessException</code> with a message string and a cause.
*
* @param msg the message string
* @param cause a causal Throwable
@@ -92,9 +88,9 @@ public class DiskAccessException extends CacheRuntimeException {
* @since GemFire 6.5
*/
public DiskAccessException(String msg, Throwable cause, DiskStore ds) {
- super((ds!=null ? "For DiskStore: " + ds.getName() + ": " : "") + msg, cause);
+ super((ds != null ? "For DiskStore: " + ds.getName() + ": " : "") + msg, cause);
}
-
+
/**
* Constructs a new <code>DiskAccessException</code> with a cause.
*
@@ -103,10 +99,9 @@ public class DiskAccessException extends CacheRuntimeException {
public DiskAccessException(Throwable cause) {
super(cause);
}
-
+
/**
- * Constructs a new <code>DiskAccessException</code> with a message string
- * and a cause.
+ * Constructs a new <code>DiskAccessException</code> with a message string and a cause.
*
* @param msg the message string
* @param cause a causal Throwable
@@ -115,7 +110,7 @@ public class DiskAccessException extends CacheRuntimeException {
public DiskAccessException(String msg, Throwable cause) {
super(msg, cause);
}
-
+
/**
* Returns true if this exception originated from a remote node.
*/
@@ -125,8 +120,7 @@ public class DiskAccessException extends CacheRuntimeException {
// Overrides to set "isRemote" flag after deserialization
- private synchronized void writeObject(final java.io.ObjectOutputStream out)
- throws IOException {
+ private synchronized void writeObject(final java.io.ObjectOutputStream out) throws IOException {
getStackTrace(); // Ensure that stackTrace field is initialized.
out.defaultWriteObject();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java b/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
index f425b90..96f186e 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskStore.java
@@ -1,18 +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
+ * 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;
@@ -20,15 +18,18 @@ import java.io.File;
import java.util.UUID;
/**
- * Provides disk storage for one or more regions. The regions in the same disk store will
- * share the same disk persistence attributes. A region without a disk store name
- * belongs to the default disk store.
- * <p>Instances of this interface are created using
- * {@link DiskStoreFactory#create}. So to create a <code>DiskStore</code> named <code>myDiskStore</code> do this:
+ * Provides disk storage for one or more regions. The regions in the same disk store will share the
+ * same disk persistence attributes. A region without a disk store name belongs to the default disk
+ * store.
+ * <p>
+ * Instances of this interface are created using {@link DiskStoreFactory#create}. So to create a
+ * <code>DiskStore</code> named <code>myDiskStore</code> do this:
+ *
* <PRE>
- * new DiskStoreFactory().create("myDiskStore");
+ * new DiskStoreFactory().create("myDiskStore");
* </PRE>
- * <p>Existing DiskStore instances can be found using {@link Cache#findDiskStore(String)}
+ * <p>
+ * Existing DiskStore instances can be found using {@link Cache#findDiskStore(String)}
*
* @since GemFire 6.5
*
@@ -46,23 +47,25 @@ public interface DiskStore {
/**
* Returns true if the disk files are to be automatically compacted.
*
- * @return Returns true if the disk files are to be automatically compacted;
- * false if automatic compaction is turned off
+ * @return Returns true if the disk files are to be automatically compacted; false if automatic
+ * compaction is turned off
*/
public boolean getAutoCompact();
/**
- * Returns the threshold at which an oplog will become compactable. Until it reaches
- * this threshold the oplog will not be compacted.
- * The threshold is a percentage in the range 0..100.
+ * Returns the threshold at which an oplog will become compactable. Until it reaches this
+ * threshold the oplog will not be compacted. The threshold is a percentage in the range 0..100.
+ *
* @return the threshold, as a percentage, at which an oplog is considered compactable.
*/
public int getCompactionThreshold();
/**
- * Returns true if manual compaction of disk files is allowed on this region.
- * Manual compaction is done be calling {@link #forceCompaction}.
- * <p>Note that calls to {@link #forceCompaction} will also be allowed if {@link #getAutoCompact automatic compaction} is enabled.
+ * Returns true if manual compaction of disk files is allowed on this region. Manual compaction is
+ * done be calling {@link #forceCompaction}.
+ * <p>
+ * Note that calls to {@link #forceCompaction} will also be allowed if {@link #getAutoCompact
+ * automatic compaction} is enabled.
*
* @return Returns true if manual compaction of disk files is allowed on this region.
*/
@@ -76,27 +79,24 @@ public interface DiskStore {
public long getMaxOplogSize();
/**
- * Returns the number of milliseconds that can elapse before
- * unwritten data is written to disk.
+ * Returns the number of milliseconds that can elapse before unwritten data is written to disk.
*
* @return Returns the time interval in milliseconds that can elapse between two writes to disk
*/
public long getTimeInterval();
/**
- * Returns the size of the write buffer that this disk store will use when
- * writing data to disk. Larger values may increase performance but will use
- * more memory.
- * The disk store will allocate one direct memory buffer of this size.
+ * Returns the size of the write buffer that this disk store will use when writing data to disk.
+ * Larger values may increase performance but will use more memory. The disk store will allocate
+ * one direct memory buffer of this size.
*
* @return Returns the size of the write buffer.
*/
public int getWriteBufferSize();
/**
- * Returns the directories to which the region's data are written. If
- * multiple directories are used, GemFire will attempt to distribute the
- * data evenly amongst them.
+ * Returns the directories to which the region's data are written. If multiple directories are
+ * used, GemFire will attempt to distribute the data evenly amongst them.
*
*/
public File[] getDiskDirs();
@@ -107,83 +107,79 @@ public interface DiskStore {
public int[] getDiskDirSizes();
/**
- * Returns the universally unique identifier for the Disk Store across the GemFire distributed system.
+ * Returns the universally unique identifier for the Disk Store across the GemFire distributed
+ * system.
* </p>
+ *
* @return a UUID uniquely identifying this Disk Store in the GemFire distributed system.
* @see java.util.UUID
*/
public UUID getDiskStoreUUID();
/**
- * Returns the maximum number of operations that can be asynchronously
- * queued to be written to disk. When this limit is reached, it will cause
- * operations to block until they can be put in the queue.
- * If this <code>DiskStore</code> configures synchronous writing, then
+ * Returns the maximum number of operations that can be asynchronously queued to be written to
+ * disk. When this limit is reached, it will cause operations to block until they can be put in
+ * the queue. If this <code>DiskStore</code> configures synchronous writing, then
* <code>queueSize</code> is ignored.
*
- * @return the maxinum number of entries that can be queued concurrently
- * for asynchronous writting to disk.
+ * @return the maxinum number of entries that can be queued concurrently for asynchronous writting
+ * to disk.
*
*/
public int getQueueSize();
/**
- * Causes any data that is currently in the asynchronous queue to be written
- * to disk. Does not return until the flush is complete.
+ * Causes any data that is currently in the asynchronous queue to be written to disk. Does not
+ * return until the flush is complete.
*
- * @throws DiskAccessException
- * If problems are encounter while writing to disk
+ * @throws DiskAccessException If problems are encounter while writing to disk
*/
public void flush();
/**
- * Asks the disk store to start writing to a new oplog.
- * The old oplog will be asynchronously compressed if compaction is set to true.
- * The new oplog will be created in the next available directory with free space.
- * If there is no directory with free space available and compaction is set to false,
- * then a <code>DiskAccessException</code> saying that the disk is full will be
- * thrown.
- * If compaction is true then the application will wait for the other oplogs
- * to be compacted and more space to be created.
+ * Asks the disk store to start writing to a new oplog. The old oplog will be asynchronously
+ * compressed if compaction is set to true. The new oplog will be created in the next available
+ * directory with free space. If there is no directory with free space available and compaction is
+ * set to false, then a <code>DiskAccessException</code> saying that the disk is full will be
+ * thrown. If compaction is true then the application will wait for the other oplogs to be
+ * compacted and more space to be created.
*
* @throws DiskAccessException
*/
public void forceRoll();
- /**
- * Allows a disk compaction to be forced on this disk store. The compaction
- * is done even if automatic compaction is not configured.
- * If the current active oplog has had data written to it and it is
- * compactable then an implicit call to {@link #forceRoll} will be made
- * so that the active oplog can be compacted.
- * <P>This method will block until the compaction completes.
- * @return <code>true</code> if one or more oplogs were compacted;
- * <code>false</code> indicates that no oplogs were ready
- * to be compacted or that a compaction was already in progress.
- * @see #getAllowForceCompaction
- */
+ /**
+ * Allows a disk compaction to be forced on this disk store. The compaction is done even if
+ * automatic compaction is not configured. If the current active oplog has had data written to it
+ * and it is compactable then an implicit call to {@link #forceRoll} will be made so that the
+ * active oplog can be compacted.
+ * <P>
+ * This method will block until the compaction completes.
+ *
+ * @return <code>true</code> if one or more oplogs were compacted; <code>false</code> indicates
+ * that no oplogs were ready to be compacted or that a compaction was already in progress.
+ * @see #getAllowForceCompaction
+ */
public boolean forceCompaction();
-
+
/**
- * Destroys this disk store. Removes the disk store from the cache,
- * and removes all files related to the disk store from disk.
+ * Destroys this disk store. Removes the disk store from the cache, and removes all files related
+ * to the disk store from disk.
*
- * If there are any currently open regions in the disk store
- * this method will throw an exception. If there are any closed regions that
- * are persisted in this disk store, the data for those regions
- * will be destroyed.
+ * If there are any currently open regions in the disk store this method will throw an exception.
+ * If there are any closed regions that are persisted in this disk store, the data for those
+ * regions will be destroyed.
*
- * @throws IllegalStateException if the disk store is currently
- * in use by any regions, gateway senders, or a PDX type registry.
+ * @throws IllegalStateException if the disk store is currently in use by any regions, gateway
+ * senders, or a PDX type registry.
*
* @since GemFire 8.0
*/
public void destroy();
-
+
/**
- * Returns the warning threshold for disk usage as a percentage of the total
- * disk volume.
+ * Returns the warning threshold for disk usage as a percentage of the total disk volume.
*
* @return the warning percent
* @since GemFire 8.0
@@ -191,21 +187,20 @@ public interface DiskStore {
public float getDiskUsageWarningPercentage();
/**
- * Returns the critical threshold for disk usage as a percentage of the total
- * disk volume.
+ * Returns the critical threshold for disk usage as a percentage of the total disk volume.
*
* @return the critical percent
* @since GemFire 8.0
*/
public float getDiskUsageCriticalPercentage();
-
+
/**
* Sets the value of the disk usage warning percentage.
*
* @param warningPercent the warning percent
*/
public void setDiskUsageWarningPercentage(float warningPercent);
-
+
/**
* Sets the value of the disk usage critical percentage.
*
[76/98] [abbrv] incubator-geode git commit: GEODE-17: mark deprecated
security configurations
Posted by ds...@apache.org.
GEODE-17: mark deprecated security configurations
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a847c550
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a847c550
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a847c550
Branch: refs/heads/feature/GEM-983
Commit: a847c550bfe3b3387f3c023ce56eee63d353c062
Parents: ddc3268
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Tue Oct 25 10:00:50 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Tue Oct 25 13:58:54 2016 -0700
----------------------------------------------------------------------
.../apache/geode/distributed/ConfigurationProperties.java | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a847c550/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
index 38bec6f..c58a398 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
@@ -1439,10 +1439,14 @@ public interface ConfigurationProperties {
String SECURITY_PREFIX = "security-";
/**
* The static String definition of the <i>"security-client-accessor"</i> property
+ *
+ * @deprecated since Geode 1.0, use security-manager
*/
String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor";
/**
* The static String definition of the <i>"security-client-accessor-pp"</i> property
+ *
+ * @deprecated since Geode 1.0, use security-post-processor
*/
String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp";
/**
@@ -1474,6 +1478,8 @@ public interface ConfigurationProperties {
/**
* The static String definition of the <i>"security-client-authenticator"</i> property
+ *
+ * @deprecated since Geode 1.0, use security-manager
*/
String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + "client-authenticator";
/**
@@ -1497,10 +1503,14 @@ public interface ConfigurationProperties {
String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level";
/**
* The static String definition of the <i>"security-peer-auth-init"</i> property
+ *
+ * @deprecated since Geode 1.0. use security-username and security-password
*/
String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init";
/**
* The static String definition of the <i>"security-peer-authenticator"</i> property
+ *
+ * @deprecated since Geode 1.0, use security-manager
*/
String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator";
/**
[15/98] [abbrv] [partial] incubator-geode git commit: Added Spotless
plugin to enforce formatting standards. Added Google Java Style guide
formatter templates, removed existing formatter templates.
Posted by ds...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
index 37e7eea..e55c3f1 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
@@ -1,18 +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
+ * 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.admin.jmx.internal;
@@ -75,30 +73,26 @@ import org.apache.geode.internal.logging.log4j.LogWriterAppender;
import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
/**
- * The GemFire JMX Agent provides the ability to administrate one GemFire
- * distributed system via JMX.
+ * The GemFire JMX Agent provides the ability to administrate one GemFire distributed system via
+ * JMX.
*
- * @since GemFire 3.5
+ * @since GemFire 3.5
*/
-public class AgentImpl
-implements org.apache.geode.admin.jmx.Agent,
- org.apache.geode.admin.jmx.internal.ManagedResource {
+public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
+ org.apache.geode.admin.jmx.internal.ManagedResource {
private static final Logger logger = LogService.getLogger();
-
+
/**
- * MX4J HttpAdaptor only supports "basic" as an authentication method.
- * Enabling HttpAdaptor authentication ({@link
- * AgentConfig#HTTP_AUTHENTICATION_ENABLED_NAME}) causes the browser to
- * require a login with username ({@link
- * AgentConfig#HTTP_AUTHENTICATION_USER_NAME}) and password ({@link
- * AgentConfig#HTTP_AUTHENTICATION_PASSWORD_NAME}).
+ * MX4J HttpAdaptor only supports "basic" as an authentication method. Enabling HttpAdaptor
+ * authentication ({@link AgentConfig#HTTP_AUTHENTICATION_ENABLED_NAME}) causes the browser to
+ * require a login with username ({@link AgentConfig#HTTP_AUTHENTICATION_USER_NAME}) and password
+ * ({@link AgentConfig#HTTP_AUTHENTICATION_PASSWORD_NAME}).
*/
private static final String MX4J_HTTPADAPTOR_BASIC_AUTHENTICATION = "basic";
/** JMX Service URL template for JMX/RMI Connector Server */
- private static final String JMX_SERVICE_URL =
- "service:jmx:rmi://{0}:{1}/jndi/rmi://{2}:{3}{4}";
+ private static final String JMX_SERVICE_URL = "service:jmx:rmi://{0}:{1}/jndi/rmi://{2}:{3}{4}";
/**
* Set third-party logging configration: MX4J, Jakarta Commons-Logging.
@@ -108,7 +102,7 @@ implements org.apache.geode.admin.jmx.Agent,
String commonsLog = System.getProperty("org.apache.commons.logging.log");
if (commonsLog == null || commonsLog.length() == 0) {
System.setProperty("org.apache.commons.logging.log",
- "org.apache.commons.logging.impl.SimpleLog");
+ "org.apache.commons.logging.impl.SimpleLog");
}
}
@@ -118,26 +112,24 @@ implements org.apache.geode.admin.jmx.Agent,
if (Boolean.getBoolean("gfAgentDebug")) {
mx4j.log.Log.setDefaultPriority(mx4j.log.Logger.TRACE); // .DEBUG
}
- }
- catch (VirtualMachineError err) {
+ } catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- /*ignore*/
- }
+ /* ignore */
+ }
}
// -------------------------------------------------------------------------
- // Member variables
+ // Member variables
// -------------------------------------------------------------------------
/** This Agent's log writer */
@@ -162,15 +154,19 @@ implements org.apache.geode.admin.jmx.Agent,
/** The configuration for this Agent */
private final AgentConfigImpl agentConfig;
- /** The <code>AdminDistributedSystem</code> this Agent is currently
- * connected to or <code>null</code> */
+ /**
+ * The <code>AdminDistributedSystem</code> this Agent is currently connected to or
+ * <code>null</code>
+ */
private AdminDistributedSystem system;
/** The agent's configuration file */
private String propertyFile;
- /** A lock object to guard the Connect and Disconnect calls being
- * made on the agent for connections to the DS **/
+ /**
+ * A lock object to guard the Connect and Disconnect calls being made on the agent for connections
+ * to the DS
+ **/
private Object CONN_SYNC = new Object();
protected MemberInfoWithStatsMBean memberInfoWithStatsMBean;
@@ -178,7 +174,7 @@ implements org.apache.geode.admin.jmx.Agent,
private MBeanServer mBeanServer;
// -------------------------------------------------------------------------
- // Constructor(s)
+ // Constructor(s)
// -------------------------------------------------------------------------
/**
@@ -188,19 +184,20 @@ implements org.apache.geode.admin.jmx.Agent,
* @throws org.apache.geode.admin.AdminException TODO-javadocs
* @throws IllegalArgumentException if agentConfig is null
*/
- public AgentImpl(AgentConfigImpl agentConfig)
- throws AdminException, IllegalArgumentException {
+ public AgentImpl(AgentConfigImpl agentConfig) throws AdminException, IllegalArgumentException {
addShutdownHook();
if (agentConfig == null) {
- throw new IllegalArgumentException(LocalizedStrings.AgentImpl_AGENTCONFIG_MUST_NOT_BE_NULL.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentImpl_AGENTCONFIG_MUST_NOT_BE_NULL.toLocalizedString());
}
- this.agentConfig = (AgentConfigImpl)agentConfig;
- this.mbeanName = MBEAN_NAME_PREFIX + MBeanUtil.makeCompliantMBeanNameProperty("Agent");
+ this.agentConfig = (AgentConfigImpl) agentConfig;
+ this.mbeanName = MBEAN_NAME_PREFIX + MBeanUtil.makeCompliantMBeanNameProperty("Agent");
try {
this.objectName = new ObjectName(this.mbeanName);
} catch (MalformedObjectNameException ex) {
- String s = LocalizedStrings.AgentImpl_WHILE_CREATING_OBJECTNAME_0.toLocalizedString(new Object[] { this.mbeanName });
+ String s = LocalizedStrings.AgentImpl_WHILE_CREATING_OBJECTNAME_0
+ .toLocalizedString(new Object[] {this.mbeanName});
throw new AdminException(s, ex);
}
@@ -227,22 +224,24 @@ implements org.apache.geode.admin.jmx.Agent,
MBeanServer mbs = getMBeanServer();
mbs.registerMBean(memberInfoWithStatsMBean, memberInfoWithStatsMBean.getObjectName());
/*
- * We are not re-throwing these exceptions as failure create/register the
- * GemFireTypesWrapper will not stop the Agent from working. But we are
- * logging it as it could be an indication of some problem.
- * Also not creating Localized String for the exception.
+ * We are not re-throwing these exceptions as failure create/register the GemFireTypesWrapper
+ * will not stop the Agent from working. But we are logging it as it could be an indication of
+ * some problem. Also not creating Localized String for the exception.
*/
} catch (OperationsException e) {
- logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_FAILED_TO_INITIALIZE_MEMBERINFOWITHSTATSMBEAN), e);
+ logger.info(LocalizedMessage
+ .create(LocalizedStrings.AgentImpl_FAILED_TO_INITIALIZE_MEMBERINFOWITHSTATSMBEAN), e);
} catch (MBeanRegistrationException e) {
- logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_FAILED_TO_INITIALIZE_MEMBERINFOWITHSTATSMBEAN), e);
+ logger.info(LocalizedMessage
+ .create(LocalizedStrings.AgentImpl_FAILED_TO_INITIALIZE_MEMBERINFOWITHSTATSMBEAN), e);
} catch (AdminException e) {
- logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_FAILED_TO_INITIALIZE_MEMBERINFOWITHSTATSMBEAN), e);
+ logger.info(LocalizedMessage
+ .create(LocalizedStrings.AgentImpl_FAILED_TO_INITIALIZE_MEMBERINFOWITHSTATSMBEAN), e);
}
}
// -------------------------------------------------------------------------
- // Public operations
+ // Public operations
// -------------------------------------------------------------------------
public AgentConfig getConfig() {
@@ -309,19 +308,20 @@ implements org.apache.geode.admin.jmx.Agent,
try {
connectToSystem();
/*
- * Call Agent.stop() if connectToSystem() fails. This should clean up
- * agent-DS connection & stop all the HTTP/RMI/SNMP adapters started
- * earlier.
+ * Call Agent.stop() if connectToSystem() fails. This should clean up agent-DS connection &
+ * stop all the HTTP/RMI/SNMP adapters started earlier.
*/
} catch (AdminException ex) {
- logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_AUTO_CONNECT_FAILED__0, ex.getMessage()));
+ logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_AUTO_CONNECT_FAILED__0,
+ ex.getMessage()));
this.stop();
throw new StartupException(ex);
} catch (MalformedObjectNameException ex) {
StringId autoConnectFailed = LocalizedStrings.AgentImpl_AUTO_CONNECT_FAILED__0;
logger.error(LocalizedMessage.create(autoConnectFailed, ex.getMessage()));
this.stop();
- throw new StartupException(new AdminException(autoConnectFailed.toLocalizedString(new Object[] { ex.getMessage() }), ex));
+ throw new StartupException(new AdminException(
+ autoConnectFailed.toLocalizedString(new Object[] {ex.getMessage()}), ex));
}
} // getAutoConnect
@@ -355,14 +355,15 @@ implements org.apache.geode.admin.jmx.Agent,
MBeanUtil.stop();
mBeanServer = null;
- // remove the register shutdown hook which disconnects the Agent from the Distributed System upon JVM shutdown
+ // remove the register shutdown hook which disconnects the Agent from the Distributed System
+ // upon JVM shutdown
removeShutdownHook();
logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_AGENT_HAS_STOPPED));
- }
- finally {
+ } finally {
LogWriterAppenders.destroy(LogWriterAppenders.Identifier.MAIN);
- LoggingThreadGroup.cleanUpThreadGroups(); // bug35388 - logwriters accumulate, causing mem leak
+ LoggingThreadGroup.cleanUpThreadGroups(); // bug35388 - logwriters accumulate, causing mem
+ // leak
}
}
@@ -371,24 +372,21 @@ implements org.apache.geode.admin.jmx.Agent,
// disconnect from the distributed system...
try {
disconnectFromSystem();
- }
- catch (Exception e) {
+ } catch (Exception e) {
// disconnectFromSystem already prints any Exceptions
- }
- catch (VirtualMachineError err) {
+ } catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
throw err;
- }
- catch (Error e) {
+ } catch (Error e) {
// Whenever you catch Error or Throwable, you must also catch VirtualMachineError (see above).
- // However, there is _still_ a possibility that you are dealing with a cascading error condition,
+ // However, there is _still_ a possibility that you are dealing with a cascading error
+ // condition,
// so you also need to check to see if the JVM is still usable:
SystemFailure.checkFailure();
}
}
- public ObjectName manageDistributedSystem()
- throws MalformedObjectNameException {
+ public ObjectName manageDistributedSystem() throws MalformedObjectNameException {
synchronized (CONN_SYNC) {
if (isConnected()) {
return ((AdminDistributedSystemJmxImpl) this.system).getObjectName();
@@ -398,15 +396,16 @@ implements org.apache.geode.admin.jmx.Agent,
}
/**
- * Connects to the DistributedSystem currently described by this Agent's
- * attributes for administration and monitoring.
+ * Connects to the DistributedSystem currently described by this Agent's attributes for
+ * administration and monitoring.
*
* @return the object name of the system that the Agent is now connected to
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="This is only a style warning.")
- public ObjectName connectToSystem()
- throws AdminException, MalformedObjectNameException {
- synchronized(CONN_SYNC) {
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(
+ value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD",
+ justification = "This is only a style warning.")
+ public ObjectName connectToSystem() throws AdminException, MalformedObjectNameException {
+ synchronized (CONN_SYNC) {
try {
if (isConnected()) {
return ((AdminDistributedSystemJmxImpl) this.system).getObjectName();
@@ -414,11 +413,9 @@ implements org.apache.geode.admin.jmx.Agent,
DistributionManager.isDedicatedAdminVM = true;
- AdminDistributedSystemJmxImpl systemJmx =
- (AdminDistributedSystemJmxImpl) this.system;
+ AdminDistributedSystemJmxImpl systemJmx = (AdminDistributedSystemJmxImpl) this.system;
if (systemJmx == null) {
- systemJmx = (AdminDistributedSystemJmxImpl)
- createDistributedSystem(this.agentConfig);
+ systemJmx = (AdminDistributedSystemJmxImpl) createDistributedSystem(this.agentConfig);
this.system = systemJmx;
}
systemJmx.connect(this.logWriter);
@@ -432,12 +429,12 @@ implements org.apache.geode.admin.jmx.Agent,
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -451,26 +448,28 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Disconnects from the current DistributedSystem (if connected to one).
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", justification="This is only a style warning.")
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(
+ value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD",
+ justification = "This is only a style warning.")
public void disconnectFromSystem() {
- synchronized(CONN_SYNC) {
+ synchronized (CONN_SYNC) {
try {
if (this.system == null || !this.system.isConnected()) {
return;
}
- ((AdminDistributedSystemJmxImpl)this.system).disconnect();
-// this.system = null;
+ ((AdminDistributedSystemJmxImpl) this.system).disconnect();
+ // this.system = null;
} catch (RuntimeException e) {
logger.warn(e.getMessage(), e);
throw e;
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (Error e) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -492,14 +491,16 @@ implements org.apache.geode.admin.jmx.Agent,
String childTail = tailFile(this.logWriterAppender.getChildLogFile());
String mainTail = tailFile(new File(this.agentConfig.getLogFile()));
if (childTail == null && mainTail == null) {
- return LocalizedStrings.AgentImpl_NO_LOG_FILE_CONFIGURED_LOG_MESSAGES_WILL_BE_DIRECTED_TO_STDOUT.toLocalizedString();
+ return LocalizedStrings.AgentImpl_NO_LOG_FILE_CONFIGURED_LOG_MESSAGES_WILL_BE_DIRECTED_TO_STDOUT
+ .toLocalizedString();
} else {
StringBuffer result = new StringBuffer();
if (mainTail != null) {
result.append(mainTail);
}
if (childTail != null) {
- result.append("\n" + LocalizedStrings.AgentImpl_TAIL_OF_CHILD_LOG.toLocalizedString() + "\n");
+ result
+ .append("\n" + LocalizedStrings.AgentImpl_TAIL_OF_CHILD_LOG.toLocalizedString() + "\n");
result.append(childTail);
}
return result.toString();
@@ -514,22 +515,22 @@ implements org.apache.geode.admin.jmx.Agent,
}
// -------------------------------------------------------------------------
- // Public attribute accessors/mutators
+ // Public attribute accessors/mutators
// -------------------------------------------------------------------------
/** Returns true if this Agent is currently connected to a system. */
public boolean isConnected() {
boolean result = false;
synchronized (CONN_SYNC) {
- result = ((this.system != null) && this.system.isConnected());
+ result = ((this.system != null) && this.system.isConnected());
}
return result;
}
/**
- * Gets the agent's property file. This is the file it will use
- * when saving its configuration. It was also used when the agent
- * started to initialize its configuration.
+ * Gets the agent's property file. This is the file it will use when saving its configuration. It
+ * was also used when the agent started to initialize its configuration.
+ *
* @return the agent's property file
*/
public String getPropertyFile() {
@@ -546,32 +547,32 @@ implements org.apache.geode.admin.jmx.Agent,
public void setPropertyFile(String value) {
File f = (new File(value)).getAbsoluteFile();
if (f.isDirectory()) {
- throw new IllegalArgumentException(LocalizedStrings.AgentImpl_THE_FILE_0_IS_A_DIRECTORY.toLocalizedString(f));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentImpl_THE_FILE_0_IS_A_DIRECTORY.toLocalizedString(f));
}
File parent = f.getParentFile();
if (parent != null) {
if (!parent.isDirectory()) {
- throw new IllegalArgumentException(LocalizedStrings.AgentImpl_THE_DIRECTORY_0_DOES_NOT_EXIST.toLocalizedString(parent));
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentImpl_THE_DIRECTORY_0_DOES_NOT_EXIST.toLocalizedString(parent));
}
}
this.propertyFile = f.getPath();
}
/**
- * Gets the mcastAddress of the distributed system that this Agent is
- * managing.
+ * Gets the mcastAddress of the distributed system that this Agent is managing.
*
- * @return The mcastAddress value
+ * @return The mcastAddress value
*/
public String getMcastAddress() {
return this.agentConfig.getMcastAddress();
}
/**
- * Sets the mcastAddress of the distributed system that this Agent is
- * managing.
+ * Sets the mcastAddress of the distributed system that this Agent is managing.
*
- * @param mcastAddress The new mcastAddress value
+ * @param mcastAddress The new mcastAddress value
*/
public void setMcastAddress(String mcastAddress) {
this.agentConfig.setMcastAddress(mcastAddress);
@@ -580,7 +581,7 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Gets the mcastPort of the distributed system that this Agent is managing.
*
- * @return The mcastPort value
+ * @return The mcastPort value
*/
public int getMcastPort() {
return this.agentConfig.getMcastPort();
@@ -589,7 +590,7 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Sets the mcastPort of the distributed system that this Agent is managing.
*
- * @param mcastPort The new mcastPort value
+ * @param mcastPort The new mcastPort value
*/
public void setMcastPort(int mcastPort) {
this.agentConfig.setMcastPort(mcastPort);
@@ -600,7 +601,7 @@ implements org.apache.geode.admin.jmx.Agent,
* <p>
* Format is a comma-delimited list of "host[port]" entries.
*
- * @return The locators value
+ * @return The locators value
*/
public String getLocators() {
return this.agentConfig.getLocators();
@@ -611,15 +612,14 @@ implements org.apache.geode.admin.jmx.Agent,
* <p>
* Format is a comma-delimited list of "host[port]" entries.
*
- * @param locators The new locators value
+ * @param locators The new locators value
*/
public void setLocators(String locators) {
this.agentConfig.setLocators(locators);
}
/**
- * Gets the membership UDP port range in the distributed system that this
- * Agent is monitoring.
+ * Gets the membership UDP port range in the distributed system that this Agent is monitoring.
* <p>
* This range is given as two numbers separated by a minus sign like "min-max"
*
@@ -630,8 +630,7 @@ implements org.apache.geode.admin.jmx.Agent,
}
/**
- * Sets the membership UDP port range in the distributed system that this
- * Agent is monitoring.
+ * Sets the membership UDP port range in the distributed system that this Agent is monitoring.
* <p>
* This range is given as two numbers separated by a minus sign like "min-max"
*
@@ -644,40 +643,40 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Gets the bindAddress of the distributed system that this Agent is managing.
*
- * @return The bindAddress value
+ * @return The bindAddress value
*/
public String getBindAddress() {
- return this.agentConfig.getBindAddress();
+ return this.agentConfig.getBindAddress();
}
/**
* Sets the bindAddress of the distributed system that this Agent is managing.
*
- * @param bindAddress The new bindAddress value
+ * @param bindAddress The new bindAddress value
*/
public void setBindAddress(String bindAddress) {
this.agentConfig.setBindAddress(bindAddress);
}
/**
- * Retrieves the command that the DistributedSystem will use to perform remote
- * manipulation of config files and log files.
+ * Retrieves the command that the DistributedSystem will use to perform remote manipulation of
+ * config files and log files.
*
- * @return the remote command for DistributedSystem
+ * @return the remote command for DistributedSystem
*/
- public String getRemoteCommand() {
- return this.agentConfig.getRemoteCommand();
- }
+ public String getRemoteCommand() {
+ return this.agentConfig.getRemoteCommand();
+ }
/**
- * Sets the command that the DistributedSystem will use to perform remote
- * manipulation of config files and log files.
+ * Sets the command that the DistributedSystem will use to perform remote manipulation of config
+ * files and log files.
*
* @param remoteCommand the remote command for DistributedSystem
*/
- public void setRemoteCommand(String remoteCommand) {
- this.agentConfig.setRemoteCommand(remoteCommand);
- }
+ public void setRemoteCommand(String remoteCommand) {
+ this.agentConfig.setRemoteCommand(remoteCommand);
+ }
/** Returns the system identity for the DistributedSystem */
public String getSystemId() {
@@ -690,20 +689,18 @@ implements org.apache.geode.admin.jmx.Agent,
}
/**
- * Gets the logFileSizeLimit in megabytes of this Agent. Zero indicates no
- * limit.
+ * Gets the logFileSizeLimit in megabytes of this Agent. Zero indicates no limit.
*
- * @return The logFileSizeLimit value
+ * @return The logFileSizeLimit value
*/
public int getLogFileSizeLimit() {
return this.agentConfig.getLogFileSizeLimit();
}
/**
- * Sets the logFileSizeLimit in megabytes of this Agent. Zero indicates no
- * limit.
+ * Sets the logFileSizeLimit in megabytes of this Agent. Zero indicates no limit.
*
- * @param logFileSizeLimit The new logFileSizeLimit value
+ * @param logFileSizeLimit The new logFileSizeLimit value
*/
public void setLogFileSizeLimit(int logFileSizeLimit) {
this.agentConfig.setLogFileSizeLimit(logFileSizeLimit);
@@ -711,20 +708,18 @@ implements org.apache.geode.admin.jmx.Agent,
}
/**
- * Gets the logDiskSpaceLimit in megabytes of this Agent. Zero indicates no
- * limit.
+ * Gets the logDiskSpaceLimit in megabytes of this Agent. Zero indicates no limit.
*
- * @return The logDiskSpaceLimit value
+ * @return The logDiskSpaceLimit value
*/
public int getLogDiskSpaceLimit() {
return this.agentConfig.getLogDiskSpaceLimit();
}
/**
- * Sets the logDiskSpaceLimit in megabytes of this Agent. Zero indicates no
- * limit.
+ * Sets the logDiskSpaceLimit in megabytes of this Agent. Zero indicates no limit.
*
- * @param logDiskSpaceLimit The new logDiskSpaceLimit value
+ * @param logDiskSpaceLimit The new logDiskSpaceLimit value
*/
public void setLogDiskSpaceLimit(int logDiskSpaceLimit) {
this.agentConfig.setLogDiskSpaceLimit(logDiskSpaceLimit);
@@ -734,7 +729,7 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Gets the logFile name for this Agent to log to.
*
- * @return The logFile value
+ * @return The logFile value
*/
public String getLogFile() {
return this.agentConfig.getLogFile();
@@ -743,7 +738,7 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Sets the logFile name for this Agent to log to.
*
- * @param logFile The new logFile value
+ * @param logFile The new logFile value
*/
public void setLogFile(String logFile) {
this.agentConfig.setLogFile(logFile);
@@ -753,7 +748,7 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Gets the logLevel of this Agent.
*
- * @return The logLevel value
+ * @return The logLevel value
*/
public String getLogLevel() {
return this.agentConfig.getLogLevel();
@@ -762,7 +757,7 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Sets the logLevel of this Agent.
*
- * @param logLevel The new logLevel value
+ * @param logLevel The new logLevel value
*/
public void setLogLevel(String logLevel) {
this.agentConfig.setLogLevel(logLevel);
@@ -773,19 +768,20 @@ implements org.apache.geode.admin.jmx.Agent,
public boolean getAutoConnect() {
return this.agentConfig.getAutoConnect();
}
+
/** Returns true if the Agent is set to auto connect to a system. */
public boolean isAutoConnect() {
return this.agentConfig.getAutoConnect();
}
+
/** Sets or unsets the option to auto connect to a system. */
public void setAutoConnect(boolean v) {
this.agentConfig.setAutoConnect(v);
}
/**
- * Returns the address (URL) on which the RMI connector server runs
- * or <code>null</code> if the RMI connector server has not been
- * started. This method is used primarily for testing purposes.
+ * Returns the address (URL) on which the RMI connector server runs or <code>null</code> if the
+ * RMI connector server has not been started. This method is used primarily for testing purposes.
*
* @see JMXConnectorServer#getAddress()
*/
@@ -808,37 +804,37 @@ implements org.apache.geode.admin.jmx.Agent,
}
// -------------------------------------------------------------------------
- // Internal implementation methods
+ // Internal implementation methods
// -------------------------------------------------------------------------
/** Returns the tail of the system log specified by <code>File</code>. */
private String tailFile(File f) {
try {
return TailLogResponse.tailSystemLog(f);
- }
- catch (IOException ex) {
- return LocalizedStrings.AgentImpl_COULD_NOT_TAIL_0_BECAUSE_1.toLocalizedString(new Object[] {f, ex});
+ } catch (IOException ex) {
+ return LocalizedStrings.AgentImpl_COULD_NOT_TAIL_0_BECAUSE_1
+ .toLocalizedString(new Object[] {f, ex});
}
}
/**
* Returns the active MBeanServer which has any GemFire MBeans registered.
*
- * @return the GemFire mbeanServer
+ * @return the GemFire mbeanServer
*/
public MBeanServer getMBeanServer() {
return mBeanServer;
}
-// /**
-// * Returns the active modeler Registry which has been initialized with all
-// * the ModelMBean descriptors needed for GemFire MBeans.
-// *
-// * @return the modeler registry
-// */
-// private Registry getRegistry() {
-// return MBeanUtil.getRegistry();
-// }
+ // /**
+ // * Returns the active modeler Registry which has been initialized with all
+ // * the ModelMBean descriptors needed for GemFire MBeans.
+ // *
+ // * @return the modeler registry
+ // */
+ // private Registry getRegistry() {
+ // return MBeanUtil.getRegistry();
+ // }
/**
* Gets the current instance of LogWriter for logging
@@ -850,24 +846,26 @@ implements org.apache.geode.admin.jmx.Agent,
}
private final Thread shutdownHook =
- new Thread(LoggingThreadGroup.createThreadGroup("Shutdown"), "Shutdown") {
- @Override
- public void run() {
+ new Thread(LoggingThreadGroup.createThreadGroup("Shutdown"), "Shutdown") {
+ @Override
+ public void run() {
disconnectFromSystem();
- }
- };
-
+ }
+ };
+
/**
* Adds a ShutdownHook to the Agent for cleaning up any resources
*/
private void addShutdownHook() {
- if( ! Boolean.getBoolean( org.apache.geode.distributed.internal.InternalDistributedSystem.DISABLE_SHUTDOWN_HOOK_PROPERTY)) {
+ if (!Boolean.getBoolean(
+ org.apache.geode.distributed.internal.InternalDistributedSystem.DISABLE_SHUTDOWN_HOOK_PROPERTY)) {
Runtime.getRuntime().addShutdownHook(shutdownHook);
}
}
private void removeShutdownHook() {
- if( ! Boolean.getBoolean( org.apache.geode.distributed.internal.InternalDistributedSystem.DISABLE_SHUTDOWN_HOOK_PROPERTY)) {
+ if (!Boolean.getBoolean(
+ org.apache.geode.distributed.internal.InternalDistributedSystem.DISABLE_SHUTDOWN_HOOK_PROPERTY)) {
Runtime.getRuntime().removeShutdownHook(shutdownHook);
}
}
@@ -875,18 +873,20 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Creates a LogWriterI18n for this Agent to use in logging.
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE", justification="Return value for file delete is not important here.")
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "RV_RETURN_VALUE_IGNORED_BAD_PRACTICE",
+ justification = "Return value for file delete is not important here.")
private void initLogWriter() throws org.apache.geode.admin.AdminException {
final LogConfig logConfig = this.agentConfig.createLogConfig();
-
+
// LOG: create logWriterAppender here
- this.logWriterAppender = LogWriterAppenders.getOrCreateAppender(LogWriterAppenders.Identifier.MAIN, false, logConfig, false);
+ this.logWriterAppender = LogWriterAppenders
+ .getOrCreateAppender(LogWriterAppenders.Identifier.MAIN, false, logConfig, false);
// LOG: look in AgentConfigImpl for existing LogWriter to use
InternalLogWriter existingLogWriter = this.agentConfig.getInternalLogWriter();
if (existingLogWriter != null) {
this.logWriter = existingLogWriter;
- } else {
+ } else {
// LOG: create LogWriterLogger
this.logWriter = LogWriterFactory.createLogWriterLogger(false, false, logConfig, false);
// LOG: changed statement from config to info
@@ -894,7 +894,7 @@ implements org.apache.geode.admin.jmx.Agent,
// Set this log writer in AgentConfigImpl
this.agentConfig.setInternalLogWriter(this.logWriter);
}
-
+
// LOG: create logWriter here
this.logWriter = LogWriterFactory.createLogWriterLogger(false, false, logConfig, false);
@@ -905,17 +905,18 @@ implements org.apache.geode.admin.jmx.Agent,
logger.info(Banner.getString(this.agentConfig.getOriginalArgs()));
// LOG:CONFIG: changed next three statements from config to info
- logger.info(LogMarker.CONFIG, LocalizedStrings.AgentImpl_AGENT_CONFIG_PROPERTY_FILE_NAME_0.toLocalizedString(AgentConfigImpl.retrievePropertyFile()));
+ logger.info(LogMarker.CONFIG, LocalizedStrings.AgentImpl_AGENT_CONFIG_PROPERTY_FILE_NAME_0
+ .toLocalizedString(AgentConfigImpl.retrievePropertyFile()));
logger.info(LogMarker.CONFIG, this.agentConfig.getPropertyFileDescription());
logger.info(LogMarker.CONFIG, this.agentConfig.toPropertiesAsString());
}
/**
- * Stops the HttpAdaptor and its XsltProcessor. Unregisters the associated
- * MBeans.
+ * Stops the HttpAdaptor and its XsltProcessor. Unregisters the associated MBeans.
*/
private void stopHttpAdaptor() {
- if (!this.agentConfig.isHttpEnabled()) return;
+ if (!this.agentConfig.isHttpEnabled())
+ return;
// stop the adaptor...
try {
@@ -934,7 +935,8 @@ implements org.apache.geode.admin.jmx.Agent,
/** Stops the RMIConnectorServer and unregisters its MBean. */
private void stopRMIConnectorServer() {
- if (!this.agentConfig.isRmiEnabled()) return;
+ if (!this.agentConfig.isRmiEnabled())
+ return;
// stop the RMI Connector server...
try {
@@ -945,8 +947,8 @@ implements org.apache.geode.admin.jmx.Agent,
try {
ObjectName rmiRegistryNamingName = getRMIRegistryNamingName();
- if (this.agentConfig.isRmiRegistryEnabled() &&
- mBeanServer.isRegistered(rmiRegistryNamingName)) {
+ if (this.agentConfig.isRmiRegistryEnabled()
+ && mBeanServer.isRegistered(rmiRegistryNamingName)) {
String[] empty = new String[0];
mBeanServer.invoke(rmiRegistryNamingName, "stop", empty, empty);
MBeanUtil.unregisterMBean(rmiRegistryNamingName);
@@ -973,13 +975,12 @@ implements org.apache.geode.admin.jmx.Agent,
/** Stops the SnmpAdaptor and unregisters its MBean. */
private void stopSnmpAdaptor() {
- if (!this.agentConfig.isSnmpEnabled()) return;
+ if (!this.agentConfig.isSnmpEnabled())
+ return;
// stop the SnmpAdaptor...
try {
- getMBeanServer().invoke(getSnmpAdaptorName(), "unbind",
- new Object[0],
- new String[0]);
+ getMBeanServer().invoke(getSnmpAdaptorName(), "unbind", new Object[0], new String[0]);
} catch (Exception e) {
logger.warn(e.getMessage(), e);
}
@@ -993,36 +994,33 @@ implements org.apache.geode.admin.jmx.Agent,
/** Returns the JMX ObjectName for the RMI registry Naming MBean. */
private ObjectName getRMIRegistryNamingName()
- throws javax.management.MalformedObjectNameException {
+ throws javax.management.MalformedObjectNameException {
return ObjectName.getInstance("naming:type=rmiregistry");
}
/** Returns the JMX ObjectName for the HttpAdaptor. */
- private ObjectName getHttpAdaptorName()
- throws javax.management.MalformedObjectNameException {
+ private ObjectName getHttpAdaptorName() throws javax.management.MalformedObjectNameException {
return new ObjectName("Server:name=HttpAdaptor");
}
/** Returns the JMX ObjectName for the RMIConnectorServer. */
private ObjectName getRMIConnectorServerName()
- throws javax.management.MalformedObjectNameException {
+ throws javax.management.MalformedObjectNameException {
return new ObjectName("connectors:protocol=rmi");
}
/** Returns the JMX ObjectName for the SnmpAdaptor. */
- private ObjectName getSnmpAdaptorName()
- throws javax.management.MalformedObjectNameException {
+ private ObjectName getSnmpAdaptorName() throws javax.management.MalformedObjectNameException {
return new ObjectName("Adaptors:protocol=SNMP");
}
/** Returns the JMX ObjectName for the HttpAdaptor's XsltProcessor. */
- private ObjectName getXsltProcessorName()
- throws javax.management.MalformedObjectNameException {
+ private ObjectName getXsltProcessorName() throws javax.management.MalformedObjectNameException {
return new ObjectName("Server:name=XSLTProcessor");
}
// -------------------------------------------------------------------------
- // Factory method for creating DistributedSystem
+ // Factory method for creating DistributedSystem
// -------------------------------------------------------------------------
/**
@@ -1031,19 +1029,19 @@ implements org.apache.geode.admin.jmx.Agent,
* @param config
*/
private AdminDistributedSystem createDistributedSystem(AgentConfigImpl config)
- throws org.apache.geode.admin.AdminException {
+ throws org.apache.geode.admin.AdminException {
return new AdminDistributedSystemJmxImpl(config);
}
// -------------------------------------------------------------------------
- // Agent main
+ // Agent main
// -------------------------------------------------------------------------
/**
* Command-line main for running the GemFire Management Agent.
* <p>
- * Accepts command-line arguments matching the options in {@link AgentConfig}
- * and {@link org.apache.geode.admin.DistributedSystemConfig}.
+ * Accepts command-line arguments matching the options in {@link AgentConfig} and
+ * {@link org.apache.geode.admin.DistributedSystemConfig}.
* <p>
* <code>AgentConfig</code> will convert -Jarguments to System properties.
*/
@@ -1053,9 +1051,9 @@ implements org.apache.geode.admin.jmx.Agent,
AgentConfigImpl ac;
try {
ac = new AgentConfigImpl(args);
- }
- catch (RuntimeException ex) {
- System.err.println(LocalizedStrings.AgentImpl_FAILED_READING_CONFIGURATION_0.toLocalizedString(ex));
+ } catch (RuntimeException ex) {
+ System.err
+ .println(LocalizedStrings.AgentImpl_FAILED_READING_CONFIGURATION_0.toLocalizedString(ex));
System.exit(1);
return;
}
@@ -1064,16 +1062,14 @@ implements org.apache.geode.admin.jmx.Agent,
Agent agent = AgentFactory.getAgent(ac);
agent.start();
- }
- catch (VirtualMachineError err) {
+ } catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- }
- catch (Throwable t) {
+ } catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
@@ -1084,7 +1080,7 @@ implements org.apache.geode.admin.jmx.Agent,
}
// -------------------------------------------------------------------------
- // MX4J Connectors/Adaptors
+ // MX4J Connectors/Adaptors
// -------------------------------------------------------------------------
private void createRMIRegistry() throws Exception {
@@ -1093,10 +1089,12 @@ implements org.apache.geode.admin.jmx.Agent,
}
MBeanServer mbs = getMBeanServer();
String host = this.agentConfig.getRmiBindAddress();
- int port = this.agentConfig.getRmiPort();
+ int port = this.agentConfig.getRmiPort();
- /* Register and start the rmi-registry naming MBean, which is
- * needed by JSR 160 RMIConnectorServer */
+ /*
+ * Register and start the rmi-registry naming MBean, which is needed by JSR 160
+ * RMIConnectorServer
+ */
ObjectName registryName = getRMIRegistryNamingName();
try {
RMIRegistryService registryNamingService = null;
@@ -1108,7 +1106,7 @@ implements org.apache.geode.admin.jmx.Agent,
mbs.registerMBean(registryNamingService, registryName);
} catch (javax.management.InstanceAlreadyExistsException e) {
logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_0__IS_ALREADY_REGISTERED,
- registryName));
+ registryName));
}
mbs.invoke(registryName, "start", null, null);
}
@@ -1116,23 +1114,22 @@ implements org.apache.geode.admin.jmx.Agent,
/**
* Defines and starts the JMX RMIConnector and service.
* <p>
- * If {@link AgentConfig#isRmiEnabled} returns false, then this adaptor will
- * not be started.
+ * If {@link AgentConfig#isRmiEnabled} returns false, then this adaptor will not be started.
*/
private void startRMIConnectorServer() {
- if (!this.agentConfig.isRmiEnabled()) return;
+ if (!this.agentConfig.isRmiEnabled())
+ return;
- String rmiBindAddress = this.agentConfig.getRmiBindAddress();
+ String rmiBindAddress = this.agentConfig.getRmiBindAddress();
// Set RMI Stubs to use the given RMI Bind Address
// Default bindAddress is "", if none is set - ignore if not set
// If java.rmi.server.hostname property is specified then
// that override is not changed
String rmiStubServerNameKey = "java.rmi.server.hostname";
- String overrideHostName = System.getProperty(rmiStubServerNameKey);
- if ((overrideHostName == null || overrideHostName.trim().length()==0) &&
- (rmiBindAddress != null && rmiBindAddress.trim().length()!=0)
- ) {
+ String overrideHostName = System.getProperty(rmiStubServerNameKey);
+ if ((overrideHostName == null || overrideHostName.trim().length() == 0)
+ && (rmiBindAddress != null && rmiBindAddress.trim().length() != 0)) {
System.setProperty(rmiStubServerNameKey, rmiBindAddress);
logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_SETTING_0,
new StringBuilder(rmiStubServerNameKey).append(" = ").append(rmiBindAddress)));
@@ -1145,42 +1142,35 @@ implements org.apache.geode.admin.jmx.Agent,
// make sure this adaptor is not already registered...
if (getMBeanServer().isRegistered(objName)) {
// dunno how we got here...
- logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_RMICONNECTORSERVER_ALREADY_REGISTERED_AS__0, objName));
+ logger.info(LocalizedMessage.create(
+ LocalizedStrings.AgentImpl_RMICONNECTORSERVER_ALREADY_REGISTERED_AS__0, objName));
return;
}
/*
- * url defined as: service:jmx:protocol:sap
- * where
- * 1. protocol: rmi
- * 2. sap is: [host[:port]][url-path]
- * where
- * host: rmi-binding-address
- * port: rmi-server-port
- * url-path: /jndi/rmi://<rmi-binding-address>:<rmi-port><JNDI_NAME>
+ * url defined as: service:jmx:protocol:sap where 1. protocol: rmi 2. sap is:
+ * [host[:port]][url-path] where host: rmi-binding-address port: rmi-server-port url-path:
+ * /jndi/rmi://<rmi-binding-address>:<rmi-port><JNDI_NAME>
*/
- String urlString = null;
+ String urlString = null;
String connectorServerHost = "";
- int connectorServerPort = this.agentConfig.getRmiServerPort();
- String rmiRegistryHost = "";
- int rmiRegistryPort = this.agentConfig.getRmiPort();
+ int connectorServerPort = this.agentConfig.getRmiServerPort();
+ String rmiRegistryHost = "";
+ int rmiRegistryPort = this.agentConfig.getRmiPort();
// Set registryHost to localhost if not specified
// RMI stubs would use a default IP if namingHost is left empty
- if (rmiBindAddress == null || rmiBindAddress.trim().length()==0) {
+ if (rmiBindAddress == null || rmiBindAddress.trim().length() == 0) {
connectorServerHost = "localhost";
- rmiRegistryHost = "";
+ rmiRegistryHost = "";
} else {
connectorServerHost = applyRFC2732(rmiBindAddress);
- rmiRegistryHost = connectorServerHost;
+ rmiRegistryHost = connectorServerHost;
}
- urlString = MessageFormat.format(AgentImpl.JMX_SERVICE_URL,
- connectorServerHost,
- String.valueOf(connectorServerPort),
- rmiRegistryHost,
- String.valueOf(rmiRegistryPort),
- JNDI_NAME);
+ urlString = MessageFormat.format(AgentImpl.JMX_SERVICE_URL, connectorServerHost,
+ String.valueOf(connectorServerPort), rmiRegistryHost, String.valueOf(rmiRegistryPort),
+ JNDI_NAME);
logger.debug("JMX Service URL string is : \"{}\"", urlString);
@@ -1188,17 +1178,16 @@ implements org.apache.geode.admin.jmx.Agent,
JMXServiceURL url = new JMXServiceURL(urlString);
Map<String, Object> env = new HashMap<String, Object>();
-// env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.rmi.registry.RegistryContextFactory");
-// env.put(Context.PROVIDER_URL, "rmi://localhost:1099");
-
- RMIServerSocketFactory ssf = new MX4JServerSocketFactory(
- this.agentConfig.isAgentSSLEnabled(), // true,
- this.agentConfig.isAgentSSLRequireAuth(), // true,
- this.agentConfig.getAgentSSLProtocols(), // "any",
- this.agentConfig.getAgentSSLCiphers(), // "any",
- this.agentConfig.getRmiBindAddress(),
- 10, // backlog
- this.agentConfig.getGfSecurityProperties());
+ // env.put(Context.INITIAL_CONTEXT_FACTORY,
+ // "com.sun.jndi.rmi.registry.RegistryContextFactory");
+ // env.put(Context.PROVIDER_URL, "rmi://localhost:1099");
+
+ RMIServerSocketFactory ssf = new MX4JServerSocketFactory(this.agentConfig.isAgentSSLEnabled(), // true,
+ this.agentConfig.isAgentSSLRequireAuth(), // true,
+ this.agentConfig.getAgentSSLProtocols(), // "any",
+ this.agentConfig.getAgentSSLCiphers(), // "any",
+ this.agentConfig.getRmiBindAddress(), 10, // backlog
+ this.agentConfig.getGfSecurityProperties());
env.put(RMIConnectorServer.RMI_SERVER_SOCKET_FACTORY_ATTRIBUTE, ssf);
if (this.agentConfig.isAgentSSLEnabled()) {
@@ -1207,14 +1196,11 @@ implements org.apache.geode.admin.jmx.Agent,
}
MBeanServer mbs = null; // will be set by registering w/ mbeanServer
- this.rmiConnector =
- JMXConnectorServerFactory.newJMXConnectorServer(url, env, mbs);
+ this.rmiConnector = JMXConnectorServerFactory.newJMXConnectorServer(url, env, mbs);
// for cleanup
- this.rmiConnector.addNotificationListener(
- new ConnectionNotificationAdapter(),
- new ConnectionNotificationFilterImpl(),
- this);
+ this.rmiConnector.addNotificationListener(new ConnectionNotificationAdapter(),
+ new ConnectionNotificationFilterImpl(), this);
// Register the JMXConnectorServer in the MBeanServer
getMBeanServer().registerMBean(this.rmiConnector, objName);
@@ -1223,36 +1209,38 @@ implements org.apache.geode.admin.jmx.Agent,
this.rmiConnector.start();
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
logger.error(LocalizedStrings.AgentImpl_FAILED_TO_START_RMICONNECTORSERVER, t);
- throw new StartupException(LocalizedStrings.AgentImpl_FAILED_TO_START_RMI_SERVICE.toLocalizedString(), t);
+ throw new StartupException(
+ LocalizedStrings.AgentImpl_FAILED_TO_START_RMI_SERVICE.toLocalizedString(), t);
}
}
/**
* Starts the optional third-party AdventNet SNMP Adaptor.
* <p>
- * If {@link AgentConfig#isSnmpEnabled} returns false, then this adaptor will
- * not be started.
+ * If {@link AgentConfig#isSnmpEnabled} returns false, then this adaptor will not be started.
*/
private void startSnmpAdaptor() {
- if (!this.agentConfig.isSnmpEnabled()) return;
+ if (!this.agentConfig.isSnmpEnabled())
+ return;
try {
ObjectName objName = getSnmpAdaptorName();
// make sure this adaptor is not already registered...
if (getMBeanServer().isRegistered(objName)) {
// dunno how we got here...
- logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_SNMPADAPTOR_ALREADY_REGISTERED_AS__0, objName));
+ logger.info(LocalizedMessage
+ .create(LocalizedStrings.AgentImpl_SNMPADAPTOR_ALREADY_REGISTERED_AS__0, objName));
return;
}
@@ -1262,57 +1250,63 @@ implements org.apache.geode.admin.jmx.Agent,
// validate the directory...
if (snmpDir == null || snmpDir.length() == 0) {
- throw new IllegalArgumentException(LocalizedStrings.AgentImpl_SNMPDIRECTORY_MUST_BE_SPECIFIED_BECAUSE_SNMP_IS_ENABLED.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentImpl_SNMPDIRECTORY_MUST_BE_SPECIFIED_BECAUSE_SNMP_IS_ENABLED
+ .toLocalizedString());
}
File root = new File(snmpDir);
if (!root.exists()) {
- throw new IllegalArgumentException(LocalizedStrings.AgentImpl_SNMPDIRECTORY_DOES_NOT_EXIST.toLocalizedString());
+ throw new IllegalArgumentException(
+ LocalizedStrings.AgentImpl_SNMPDIRECTORY_DOES_NOT_EXIST.toLocalizedString());
}
// create the adaptor...
- String[] sigs = new String[] { "java.lang.String" };
- Object[] args = new Object[] { snmpDir };
+ String[] sigs = new String[] {"java.lang.String"};
+ Object[] args = new Object[] {snmpDir};
String bindAddress = this.agentConfig.getSnmpBindAddress();
if (bindAddress != null && bindAddress.length() > 0) {
- sigs = new String[] { "java.lang.String", sigs[0] };
- args = new Object[] { bindAddress, args[0] };
+ sigs = new String[] {"java.lang.String", sigs[0]};
+ args = new Object[] {bindAddress, args[0]};
}
// go...
getMBeanServer().createMBean(className, objName, args, sigs);
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
- } catch(Throwable t) {
+ } catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_FAILED_TO_START_SNMPADAPTOR__0, t.getMessage()));
- throw new StartupException(LocalizedStrings.AgentImpl_FAILED_TO_START_SNMPADAPTOR__0.toLocalizedString(t.getMessage()), t);
+ logger.error(LocalizedMessage
+ .create(LocalizedStrings.AgentImpl_FAILED_TO_START_SNMPADAPTOR__0, t.getMessage()));
+ throw new StartupException(LocalizedStrings.AgentImpl_FAILED_TO_START_SNMPADAPTOR__0
+ .toLocalizedString(t.getMessage()), t);
}
}
/**
* Defines and starts the JMX Http Adaptor service from MX4J.
* <p>
- * If {@link AgentConfig#isHttpEnabled} returns false, then this adaptor will
- * not be started.
+ * If {@link AgentConfig#isHttpEnabled} returns false, then this adaptor will not be started.
*/
private void startHttpAdaptor() {
- if (!this.agentConfig.isHttpEnabled()) return;
+ if (!this.agentConfig.isHttpEnabled())
+ return;
try {
ObjectName objName = getHttpAdaptorName();
// make sure this adaptor is not already registered...
if (getMBeanServer().isRegistered(objName)) {
// dunno how we got here...
- logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_HTTPADAPTOR_ALREADY_REGISTERED_AS__0, objName));
+ logger.info(LocalizedMessage
+ .create(LocalizedStrings.AgentImpl_HTTPADAPTOR_ALREADY_REGISTERED_AS__0, objName));
return;
}
@@ -1321,39 +1315,38 @@ implements org.apache.geode.admin.jmx.Agent,
// validate and set host and port values...
if (this.agentConfig.getHttpPort() > 0) {
this.httpAdaptor.setPort(this.agentConfig.getHttpPort());
- logger.info(LogMarker.CONFIG, LocalizedMessage.create(LocalizedStrings.AgentImpl_HTTP_ADAPTOR_LISTENING_ON_PORT__0, this.agentConfig.getHttpPort()));
- }
- else {
- logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_INCORRECT_PORT_VALUE__0, this.agentConfig.getHttpPort()));
+ logger.info(LogMarker.CONFIG,
+ LocalizedMessage.create(LocalizedStrings.AgentImpl_HTTP_ADAPTOR_LISTENING_ON_PORT__0,
+ this.agentConfig.getHttpPort()));
+ } else {
+ logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_INCORRECT_PORT_VALUE__0,
+ this.agentConfig.getHttpPort()));
}
if (this.agentConfig.getHttpBindAddress() != null) {
String host = this.agentConfig.getHttpBindAddress();
- logger.info(LogMarker.CONFIG, LocalizedMessage.create(LocalizedStrings.AgentImpl_HTTP_ADAPTOR_LISTENING_ON_ADDRESS__0, host));
+ logger.info(LogMarker.CONFIG, LocalizedMessage
+ .create(LocalizedStrings.AgentImpl_HTTP_ADAPTOR_LISTENING_ON_ADDRESS__0, host));
this.httpAdaptor.setHost(host);
- }
- else {
+ } else {
logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_INCORRECT_NULL_HOSTNAME));
}
// SSL support...
MX4JServerSocketFactory socketFactory =
- new MX4JServerSocketFactory(
- this.agentConfig.isAgentSSLEnabled(),
- this.agentConfig.isHttpSSLRequireAuth(),
- this.agentConfig.getAgentSSLProtocols(),
- this.agentConfig.getAgentSSLCiphers(),
- this.agentConfig.getGfSecurityProperties());
+ new MX4JServerSocketFactory(this.agentConfig.isAgentSSLEnabled(),
+ this.agentConfig.isHttpSSLRequireAuth(), this.agentConfig.getAgentSSLProtocols(),
+ this.agentConfig.getAgentSSLCiphers(), this.agentConfig.getGfSecurityProperties());
this.httpAdaptor.setSocketFactory(socketFactory);
// authentication (user login) support...
if (this.agentConfig.isHttpAuthEnabled()) {
// this pops up a login dialog from the browser...
- this.httpAdaptor.setAuthenticationMethod(
- MX4J_HTTPADAPTOR_BASIC_AUTHENTICATION); // only basic works
+ this.httpAdaptor.setAuthenticationMethod(MX4J_HTTPADAPTOR_BASIC_AUTHENTICATION); // only
+ // basic
+ // works
- this.httpAdaptor.addAuthorization(
- this.agentConfig.getHttpAuthUser(),
+ this.httpAdaptor.addAuthorization(this.agentConfig.getHttpAuthUser(),
this.agentConfig.getHttpAuthPassword());
}
@@ -1365,108 +1358,121 @@ implements org.apache.geode.admin.jmx.Agent,
this.httpAdaptor.start();
} catch (VirtualMachineError err) {
SystemFailure.initiateFailure(err);
- // If this ever returns, rethrow the error. We're poisoned
+ // If this ever returns, rethrow the error. We're poisoned
// now, so don't let this thread continue.
throw err;
} catch (Throwable t) {
// Whenever you catch Error or Throwable, you must also
- // catch VirtualMachineError (see above). However, there is
+ // catch VirtualMachineError (see above). However, there is
// _still_ a possibility that you are dealing with a cascading
// error condition, so you also need to check to see if the JVM
// is still usable:
SystemFailure.checkFailure();
- logger.error(LocalizedMessage.create(LocalizedStrings.AgentImpl_FAILED_TO_START_HTTPADAPTOR__0, t.getMessage()));
- throw new StartupException(LocalizedStrings.AgentImpl_FAILED_TO_START_HTTPADAPTOR__0.toLocalizedString(t.getMessage()), t);
+ logger.error(LocalizedMessage
+ .create(LocalizedStrings.AgentImpl_FAILED_TO_START_HTTPADAPTOR__0, t.getMessage()));
+ throw new StartupException(LocalizedStrings.AgentImpl_FAILED_TO_START_HTTPADAPTOR__0
+ .toLocalizedString(t.getMessage()), t);
}
}
/**
* Defines and starts the Xslt Processor helper service for the Http Adaptor.
*/
- private ObjectName createXsltProcessor()
- throws javax.management.JMException {
+ private ObjectName createXsltProcessor() throws javax.management.JMException {
ObjectName objName = getXsltProcessorName();
// make sure this mbean is not already registered...
if (getMBeanServer().isRegistered(objName)) {
// dunno how we got here...
- logger.info(LocalizedMessage.create(LocalizedStrings.AgentImpl_XSLTPROCESSOR_ALREADY_REGISTERED_AS__0, objName));
+ logger.info(LocalizedMessage
+ .create(LocalizedStrings.AgentImpl_XSLTPROCESSOR_ALREADY_REGISTERED_AS__0, objName));
return objName;
}
- getMBeanServer().registerMBean(
- new mx4j.tools.adaptor.http.XSLTProcessor(), objName);
+ getMBeanServer().registerMBean(new mx4j.tools.adaptor.http.XSLTProcessor(), objName);
return objName;
}
// -------------------------------------------------------------------------
- // Private support methods...
+ // Private support methods...
// -------------------------------------------------------------------------
-// /** Not used anymore but seems moderately useful... */
-// private String[] parseSSLCiphers(String ciphers) {
-// List list = new ArrayList();
-// StringTokenizer st = new StringTokenizer(ciphers);
-// while (st.hasMoreTokens()) {
-// list.add(st.nextToken());
-// }
-// return (String[]) list.toArray(new String[list.size()]);
-// }
+ // /** Not used anymore but seems moderately useful... */
+ // private String[] parseSSLCiphers(String ciphers) {
+ // List list = new ArrayList();
+ // StringTokenizer st = new StringTokenizer(ciphers);
+ // while (st.hasMoreTokens()) {
+ // list.add(st.nextToken());
+ // }
+ // return (String[]) list.toArray(new String[list.size()]);
+ // }
// -------------------------------------------------------------------------
- // SSL configuration for GemFire
+ // SSL configuration for GemFire
// -------------------------------------------------------------------------
public boolean isSSLEnabled() {
return this.agentConfig.isSSLEnabled();
}
+
public void setSSLEnabled(boolean enabled) {
this.agentConfig.setSSLEnabled(enabled);
}
+
public String getSSLProtocols() {
return this.agentConfig.getSSLProtocols();
}
+
public void setSSLProtocols(String protocols) {
this.agentConfig.setSSLProtocols(protocols);
}
+
public String getSSLCiphers() {
return this.agentConfig.getSSLCiphers();
}
+
public void setSSLCiphers(String ciphers) {
this.agentConfig.setSSLCiphers(ciphers);
}
+
public boolean isSSLAuthenticationRequired() {
return this.agentConfig.isSSLAuthenticationRequired();
}
+
public void setSSLAuthenticationRequired(boolean authRequired) {
this.agentConfig.setSSLAuthenticationRequired(authRequired);
}
+
public Properties getSSLProperties() {
return this.agentConfig.getSSLProperties();
}
+
public void setSSLProperties(Properties sslProperties) {
this.agentConfig.setSSLProperties(sslProperties);
}
+
public void addSSLProperty(String key, String value) {
this.agentConfig.addSSLProperty(key, value);
}
+
public void removeSSLProperty(String key) {
this.agentConfig.removeSSLProperty(key);
}
// -------------------------------------------------------------------------
- // ManagedResource implementation
+ // ManagedResource implementation
// -------------------------------------------------------------------------
- public String getMBeanName() {
- return this.mbeanName;
- }
+ public String getMBeanName() {
+ return this.mbeanName;
+ }
+
+ public ModelMBean getModelMBean() {
+ return this.modelMBean;
+ }
- public ModelMBean getModelMBean() {
- return this.modelMBean;
- }
- public void setModelMBean(ModelMBean modelMBean) {
- this.modelMBean = modelMBean;
- }
+ public void setModelMBean(ModelMBean modelMBean) {
+ this.modelMBean = modelMBean;
+ }
public ObjectName getObjectName() {
return this.objectName;
@@ -1480,20 +1486,21 @@ implements org.apache.geode.admin.jmx.Agent,
static class StartupException extends GemFireException {
private static final long serialVersionUID = 6614145962199330348L;
+
StartupException(Throwable cause) {
super(cause);
}
+
StartupException(String reason, Throwable cause) {
super(reason, cause);
}
}
// -------------------------------------------------------------------------
- // Other Support methods
+ // Other Support methods
// -------------------------------------------------------------------------
/**
- * Checks the no. of active RMI clients and updates a flag in the Admin
- * Distributed System.
+ * Checks the no. of active RMI clients and updates a flag in the Admin Distributed System.
*
* @see AdminDistributedSystemJmxImpl#setRmiClientCountZero(boolean)
* @since GemFire 6.0
@@ -1509,8 +1516,7 @@ implements org.apache.geode.admin.jmx.Agent,
logger.info("No. of RMI clients connected :: {}", noOfClientsConnected);
- AdminDistributedSystemJmxImpl adminDSJmx =
- (AdminDistributedSystemJmxImpl) this.system;
+ AdminDistributedSystemJmxImpl adminDSJmx = (AdminDistributedSystemJmxImpl) this.system;
adminDSJmx.setRmiClientCountZero(noOfClientsConnected == 0);
}
@@ -1520,31 +1526,34 @@ implements org.apache.geode.admin.jmx.Agent,
StringBuffer sb = new StringBuffer();
sb.append("AgentImpl[");
sb.append("config=" + agentConfig.toProperties().toString());
-// sb.append("; adaptor=" + httpAdaptor.toString());
+ // sb.append("; adaptor=" + httpAdaptor.toString());
sb.append("; mbeanName=" + mbeanName);
sb.append("; modelMBean=" + modelMBean);
sb.append("; objectName=" + objectName);
sb.append("; propertyFile=" + propertyFile);
sb.append(": rmiConnector=" + rmiConnector);
-// sb.append("; system=" + system);)
+ // sb.append("; system=" + system);)
sb.append("]");
return sb.toString();
}
- /** Process the String form of a hostname to make it comply with Jmx URL
- * restrictions. Namely wrap IPv6 literal address with "[", "]"
+ /**
+ * Process the String form of a hostname to make it comply with Jmx URL restrictions. Namely wrap
+ * IPv6 literal address with "[", "]"
+ *
* @param hostname the name to safeguard.
* @return a string representation suitable for use in a Jmx connection URL
*/
private static String applyRFC2732(String hostname) {
- if(hostname.indexOf(":") != -1) {
- //Assuming an IPv6 literal because of the ':'
+ if (hostname.indexOf(":") != -1) {
+ // Assuming an IPv6 literal because of the ':'
return "[" + hostname + "]";
}
return hostname;
}
}
+
/**
* Adapter class for NotificationListener that listens to notifications of type
* javax.management.remote.JMXConnectionNotification
@@ -1557,25 +1566,23 @@ class ConnectionNotificationAdapter implements NotificationListener {
/**
* If the handback object passed is an AgentImpl, updates the JMX client count
*
- * @param notification
- * JMXConnectionNotification for change in client connection status
- * @param handback
- * An opaque object which helps the listener to associate information
- * regarding the MBean emitter. This object is passed to the MBean
- * during the addListener call and resent, without modification, to
- * the listener. The MBean object should not use or modify the
- * object. (NOTE: copied from javax.management.NotificationListener)
+ * @param notification JMXConnectionNotification for change in client connection status
+ * @param handback An opaque object which helps the listener to associate information regarding
+ * the MBean emitter. This object is passed to the MBean during the addListener call and
+ * resent, without modification, to the listener. The MBean object should not use or modify
+ * the object. (NOTE: copied from javax.management.NotificationListener)
*/
- @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="BC_UNCONFIRMED_CAST", justification="Only JMXConnectionNotification instances are used.")
+ @edu.umd.cs.findbugs.annotations.SuppressWarnings(value = "BC_UNCONFIRMED_CAST",
+ justification = "Only JMXConnectionNotification instances are used.")
public void handleNotification(Notification notification, Object handback) {
if (handback instanceof AgentImpl) {
AgentImpl agent = (AgentImpl) handback;
- JMXConnectionNotification jmxNotifn =
- (JMXConnectionNotification) notification;
+ JMXConnectionNotification jmxNotifn = (JMXConnectionNotification) notification;
if (logger.isDebugEnabled()) {
- logger.debug("Connection notification for connection id : '{}'", jmxNotifn.getConnectionId());
+ logger.debug("Connection notification for connection id : '{}'",
+ jmxNotifn.getConnectionId());
}
agent.updateRmiClientsCount();
@@ -1583,6 +1590,7 @@ class ConnectionNotificationAdapter implements NotificationListener {
}
}
+
/**
* Filters out the notifications of the type JMXConnectionNotification.OPENED,
* JMXConnectionNotification.CLOSED and JMXConnectionNotification.FAILED.
@@ -1597,19 +1605,17 @@ class ConnectionNotificationFilterImpl implements NotificationFilter {
private static final long serialVersionUID = 1L;
/**
- * Invoked before sending the specified notification to the listener.
- * Returns whether the given notification is to be sent to the listener.
+ * Invoked before sending the specified notification to the listener. Returns whether the given
+ * notification is to be sent to the listener.
*
- * @param notification
- * The notification to be sent.
- * @return true if the notification has to be sent to the listener, false
- * otherwise.
+ * @param notification The notification to be sent.
+ * @return true if the notification has to be sent to the listener, false otherwise.
*/
public boolean isNotificationEnabled(Notification notification) {
boolean isThisNotificationEnabled = false;
- if (notification.getType().equals(JMXConnectionNotification.OPENED) ||
- notification.getType().equals(JMXConnectionNotification.CLOSED) ||
- notification.getType().equals(JMXConnectionNotification.FAILED) ) {
+ if (notification.getType().equals(JMXConnectionNotification.OPENED)
+ || notification.getType().equals(JMXConnectionNotification.CLOSED)
+ || notification.getType().equals(JMXConnectionNotification.FAILED)) {
isThisNotificationEnabled = true;
}
return isThisNotificationEnabled;
[86/98] [abbrv] incubator-geode git commit: GEODE-17: Fix a logical
bug that prevents customers to set both Peer and Client authenticator
Posted by ds...@apache.org.
GEODE-17: Fix a logical bug that prevents customers to set both Peer and Client authenticator
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/477806af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/477806af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/477806af
Branch: refs/heads/feature/GEM-983
Commit: 477806af481fd3228a691edfd8e6edac5f90f851
Parents: f02ea36
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Oct 26 10:40:10 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Oct 26 15:29:21 2016 -0700
----------------------------------------------------------------------
.../security/IntegratedSecurityService.java | 51 ++++++++++----------
.../security/IntegratedSecurityServiceTest.java | 30 +++++++++---
2 files changed, 48 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/477806af/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
index 9f4697f..8fc0f11 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
@@ -14,29 +14,14 @@
*/
package org.apache.geode.internal.security;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.security.AccessController;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.Callable;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST_PROCESSOR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
import org.apache.commons.lang.SerializationException;
import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.Logger;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.ShiroException;
-import org.apache.shiro.config.Ini.Section;
-import org.apache.shiro.config.IniSecurityManagerFactory;
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.realm.Realm;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.support.SubjectThreadState;
-import org.apache.shiro.util.ThreadContext;
-import org.apache.shiro.util.ThreadState;
-
import org.apache.geode.GemFireIOException;
import org.apache.geode.internal.cache.EntryEventImpl;
import org.apache.geode.internal.logging.LogService;
@@ -54,6 +39,24 @@ import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.ResourcePermission.Operation;
import org.apache.geode.security.ResourcePermission.Resource;
import org.apache.geode.security.SecurityManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.ShiroException;
+import org.apache.shiro.config.Ini.Section;
+import org.apache.shiro.config.IniSecurityManagerFactory;
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.realm.Realm;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.support.SubjectThreadState;
+import org.apache.shiro.util.ThreadContext;
+import org.apache.shiro.util.ThreadState;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.security.AccessController;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.Callable;
public class IntegratedSecurityService implements SecurityService {
@@ -325,14 +328,10 @@ public class IntegratedSecurityService implements SecurityService {
org.apache.shiro.mgt.SecurityManager shiroManager = new DefaultSecurityManager(realm);
SecurityUtils.setSecurityManager(shiroManager);
isIntegratedSecurity = true;
- } else if (!StringUtils.isBlank(clientAuthenticatorConfig)) {
- isClientAuthenticator = true;
- } else if (!StringUtils.isBlank(peerAuthenticatorConfig)) {
- isPeerAuthenticator = true;
} else {
isIntegratedSecurity = false;
- isClientAuthenticator = false;
- isPeerAuthenticator = false;
+ isClientAuthenticator = !StringUtils.isBlank(clientAuthenticatorConfig);
+ isPeerAuthenticator = !StringUtils.isBlank(peerAuthenticatorConfig);
}
// this initializes the post processor
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/477806af/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
index ee76dfc..8c81026 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.java
@@ -14,19 +14,23 @@
*/
package org.apache.geode.internal.security;
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.assertj.core.api.Java6Assertions.*;
-import static org.junit.Assert.*;
-
-import java.util.Properties;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
+import static org.assertj.core.api.Java6Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.apache.geode.security.GemFireSecurityException;
import org.apache.geode.security.templates.SampleSecurityManager;
+import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.security.GemFireSecurityException;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Properties;
@Category(UnitTest.class)
public class IntegratedSecurityServiceTest {
@@ -129,6 +133,18 @@ public class IntegratedSecurityServiceTest {
}
@Test
+ public void testInitWithBothAuthenticator() {
+ properties.setProperty(SECURITY_CLIENT_AUTHENTICATOR, "org.abc.test");
+ properties.setProperty(SECURITY_PEER_AUTHENTICATOR, "org.abc.test");
+
+ securityService.initSecurity(properties);
+
+ assertFalse(securityService.isIntegratedSecurity());
+ assertTrue(securityService.isClientSecurityRequired());
+ assertTrue(securityService.isPeerSecurityRequired());
+ }
+
+ @Test
public void testInitWithShiroAuthenticator() {
properties.setProperty(SECURITY_SHIRO_INIT, "shiro.ini");