Merge pull request #2 from scaleoutsoftware/dev-br-hotfix

Dev br hotfix
scaleoutsoftware · Nov 9, 2020 · 004c073 · 004c073
2 parents 4c7a675 + dd23128
commit 004c073
Show file tree

Hide file tree

Showing 25 changed files with 115 additions and 93 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ repositories {
 ...and then you can add the ScaleOut Spring Session API as a dependency:
 
 ```
-compile group: 'com.scaleoutsoftware.spring', name: "session", version: '2.0'
+compile group: 'com.scaleoutsoftware.spring', name: "session", version: '2.1'
 ```
 
 ### Maven
@@ -45,7 +45,7 @@ For Maven, you can add the ScaleOut API Repository to your pom.xml by adding the
 	<dependency>
 	  <groupId>com.scaleoutsoftware.spring</groupId>
 	  <artifactId>session</artifactId>
-	  <version>2.0</version>
+	  <version>2.1</version>
 	</dependency>
 </dependencies>
 ```

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 group 'com.scaleoutsoftware'
-version '2.0-RELEASE'
+version '2.1-RELEASE'
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
@@ -33,9 +33,9 @@ dependencies {
     testCompile group: 'org.springframework', name: 'spring-context', version: '5.0.7.RELEASE'
     testCompile group: 'org.springframework', name: 'spring-web', version: '5.0.7.RELEASE'
     testCompile group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
-	testCompile group: 'com.scaleoutsoftware.client', name: 'jnc', version: '5.8.18.349'
+	testCompile group: 'com.scaleoutsoftware.client', name: 'jnc', version: '5.10.0.354'
 
-    compile group: 'com.scaleoutsoftware.client', name: 'jnc', version: '5.8.18.349'
+    compile group: 'com.scaleoutsoftware.client', name: 'jnc', version: '5.10.0.354'
     compile group: 'org.springframework.session', name: 'spring-session-core', version: '2.0.5.RELEASE'
     compile group: 'org.springframework', name: 'spring-context', version: '5.0.7.RELEASE'
     compile group: 'org.springframework', name: 'spring-web', version: '5.0.7.RELEASE'

diff --git a/docs/allclasses-frame.html b/docs/allclasses-frame.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (ScaleoutSpringHttpSessions 1.0-RELEASE API)</title>
+<title>All Classes (ScaleoutSpringHttpSessions 2.1-RELEASE API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/docs/allclasses-noframe.html b/docs/allclasses-noframe.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>All Classes (ScaleoutSpringHttpSessions 1.0-RELEASE API)</title>
+<title>All Classes (ScaleoutSpringHttpSessions 2.1-RELEASE API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>

diff --git a/docs/constant-values.html b/docs/constant-values.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Constant Field Values (ScaleoutSpringHttpSessions 1.0-RELEASE API)</title>
+<title>Constant Field Values (ScaleoutSpringHttpSessions 2.1-RELEASE API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Constant Field Values (ScaleoutSpringHttpSessions 1.0-RELEASE API)";
+            parent.document.title="Constant Field Values (ScaleoutSpringHttpSessions 2.1-RELEASE API)";
         }
     }
     catch(err) {
@@ -129,6 +129,13 @@ <h2 title="org.springframework">org.springframework.*</h2>
 <td class="colLast"><code>10</code></td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a name="org.springframework.session.soss.ScaleoutSessionRepository.DEF_UNASSIGNED">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;java.lang.String</code></td>
+<td><code><a href="org/springframework/session/soss/ScaleoutSessionRepository.html#DEF_UNASSIGNED">DEF_UNASSIGNED</a></code></td>
+<td class="colLast"><code>"UNASSIGNED"</code></td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a name="org.springframework.session.soss.ScaleoutSessionRepository.DEF_USE_LOCKING">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;boolean</code></td>

diff --git a/docs/deprecated-list.html b/docs/deprecated-list.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Deprecated List (ScaleoutSpringHttpSessions 1.0-RELEASE API)</title>
+<title>Deprecated List (ScaleoutSpringHttpSessions 2.1-RELEASE API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Deprecated List (ScaleoutSpringHttpSessions 1.0-RELEASE API)";
+            parent.document.title="Deprecated List (ScaleoutSpringHttpSessions 2.1-RELEASE API)";
         }
     }
     catch(err) {

diff --git a/docs/help-doc.html b/docs/help-doc.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>API Help (ScaleoutSpringHttpSessions 1.0-RELEASE API)</title>
+<title>API Help (ScaleoutSpringHttpSessions 2.1-RELEASE API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="API Help (ScaleoutSpringHttpSessions 1.0-RELEASE API)";
+            parent.document.title="API Help (ScaleoutSpringHttpSessions 2.1-RELEASE API)";
         }
     }
     catch(err) {

diff --git a/docs/index-all.html b/docs/index-all.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>Index (ScaleoutSpringHttpSessions 1.0-RELEASE API)</title>
+<title>Index (ScaleoutSpringHttpSessions 2.1-RELEASE API)</title>
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="Index (ScaleoutSpringHttpSessions 1.0-RELEASE API)";
+            parent.document.title="Index (ScaleoutSpringHttpSessions 2.1-RELEASE API)";
         }
     }
     catch(err) {
@@ -102,6 +102,8 @@ <h2 class="title">D</h2>
 <dd>
 <div class="block">default remote read-pending retry interval.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/springframework/session/soss/ScaleoutSessionRepository.html#DEF_UNASSIGNED">DEF_UNASSIGNED</a></span> - Static variable in class org.springframework.session.soss.<a href="org/springframework/session/soss/ScaleoutSessionRepository.html" title="class in org.springframework.session.soss">ScaleoutSessionRepository</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/springframework/session/soss/ScaleoutSessionRepository.html#DEF_USE_LOCKING">DEF_USE_LOCKING</a></span> - Static variable in class org.springframework.session.soss.<a href="org/springframework/session/soss/ScaleoutSessionRepository.html" title="class in org.springframework.session.soss">ScaleoutSessionRepository</a></dt>
 <dd>
 <div class="block">Default locking value.</div>

diff --git a/docs/index.html b/docs/index.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ScaleoutSpringHttpSessions 1.0-RELEASE API</title>
+<title>ScaleoutSpringHttpSessions 2.1-RELEASE API</title>
 <script type="text/javascript">
     tmpTargetPage = "" + window.location.search;
     if (tmpTargetPage != "" && tmpTargetPage != "undefined")

diff --git a/docs/org/springframework/session/soss/ScaleoutSession.html b/docs/org/springframework/session/soss/ScaleoutSession.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ScaleoutSession (ScaleoutSpringHttpSessions 1.0-RELEASE API)</title>
+<title>ScaleoutSession (ScaleoutSpringHttpSessions 2.1-RELEASE API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ScaleoutSession (ScaleoutSpringHttpSessions 1.0-RELEASE API)";
+            parent.document.title="ScaleoutSession (ScaleoutSpringHttpSessions 2.1-RELEASE API)";
         }
     }
     catch(err) {

diff --git a/docs/org/springframework/session/soss/ScaleoutSessionRepository.html b/docs/org/springframework/session/soss/ScaleoutSessionRepository.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>ScaleoutSessionRepository (ScaleoutSpringHttpSessions 1.0-RELEASE API)</title>
+<title>ScaleoutSessionRepository (ScaleoutSpringHttpSessions 2.1-RELEASE API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="ScaleoutSessionRepository (ScaleoutSpringHttpSessions 1.0-RELEASE API)";
+            parent.document.title="ScaleoutSessionRepository (ScaleoutSpringHttpSessions 2.1-RELEASE API)";
         }
     }
     catch(err) {
@@ -164,6 +164,10 @@ <h3>Field Summary</h3>
 </td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><code>static java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/springframework/session/soss/ScaleoutSessionRepository.html#DEF_UNASSIGNED">DEF_UNASSIGNED</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../org/springframework/session/soss/ScaleoutSessionRepository.html#DEF_USE_LOCKING">DEF_USE_LOCKING</a></span></code>
 <div class="block">Default locking value.</div>
@@ -314,7 +318,7 @@ <h4>DEF_REMOTE_READPENDING_RETRY_INTERVAL</h4>
 <a name="DEF_REMOTE_READPENDING_RETRIES">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>DEF_REMOTE_READPENDING_RETRIES</h4>
 <pre>public static final&nbsp;int DEF_REMOTE_READPENDING_RETRIES</pre>
@@ -325,6 +329,19 @@ <h4>DEF_REMOTE_READPENDING_RETRIES</h4>
 </dl>
 </li>
 </ul>
+<a name="DEF_UNASSIGNED">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>DEF_UNASSIGNED</h4>
+<pre>public static final&nbsp;java.lang.String DEF_UNASSIGNED</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../constant-values.html#org.springframework.session.soss.ScaleoutSessionRepository.DEF_UNASSIGNED">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
@@ -351,6 +368,9 @@ <h4>ScaleoutSessionRepository</h4>
 <dd><code>cacheName</code> - the cache name to store <a href="../../../../org/springframework/session/soss/ScaleoutSession.html" title="class in org.springframework.session.soss"><code>ScaleoutSession</code></a>s</dd>
 <dd><code>maxInactiveTime</code> - the max inactive time of a session</dd>
 <dd><code>useLocking</code> - if the scaleout repository is using locking</dd>
+<dd><code>remoteStoreName</code> - the name of the remote store (used for GeoServer Pro pull replication).</dd>
+<dd><code>remoteReadPendingInterval</code> - in case of a WAN failure, the interval in ms to wait when a remote read is pending</dd>
+<dd><code>remoteReadRetries</code> - in case of a WAN failure, the number of times to retry a remote read</dd>
 </dl>
 </li>
 </ul>

diff --git a/...rg/springframework/session/soss/config/annotation/web/http/EnableScaleoutHttpSession.html b/...rg/springframework/session/soss/config/annotation/web/http/EnableScaleoutHttpSession.html
@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc -->
-<title>EnableScaleoutHttpSession (ScaleoutSpringHttpSessions 1.0-RELEASE API)</title>
+<title>EnableScaleoutHttpSession (ScaleoutSpringHttpSessions 2.1-RELEASE API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../../../../script.js"></script>
 </head>
 <body>
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="EnableScaleoutHttpSession (ScaleoutSpringHttpSessions 1.0-RELEASE API)";
+            parent.document.title="EnableScaleoutHttpSession (ScaleoutSpringHttpSessions 2.1-RELEASE API)";
         }
     }
     catch(err) {
@@ -67,7 +67,7 @@
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
 <li><a href="#annotation.type.optional.element.summary">Optional</a></li>
 </ul>
 <ul class="subNavList">
@@ -104,28 +104,6 @@ <h2 title="Annotation Type EnableScaleoutHttpSession" class="title">Annotation T
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- =========== ANNOTATION TYPE REQUIRED MEMBER SUMMARY =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="annotation.type.required.element.summary">
-<!--   -->
-</a>
-<h3>Required Element Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Required Element Summary table, listing required elements, and an explanation">
-<caption><span>Required Elements</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Required Element and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colFirst"><code>java.lang.String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../../org/springframework/session/soss/config/annotation/web/http/EnableScaleoutHttpSession.html#remoteStoreName--">remoteStoreName</a></span></code>
-<div class="block">If GeoServer pull is licensed and configured, setting the value for remoteStoreName indicates that replica objects
- in a remote store should be notified every time the local, master object is updated.</div>
-</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- =========== ANNOTATION TYPE OPTIONAL MEMBER SUMMARY =========== -->
 <ul class="blockList">
 <li class="blockList"><a name="annotation.type.optional.element.summary">
@@ -163,6 +141,13 @@ <h3>Optional Element Summary</h3>
 </td>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>java.lang.String</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../../org/springframework/session/soss/config/annotation/web/http/EnableScaleoutHttpSession.html#remoteStoreName--">remoteStoreName</a></span></code>
+<div class="block">If ScaleOut GeoServer Pro is licensed and configured, setting the value for remoteStoreName indicates that replica objects
+ in a remote store should be notified every time the local, master object is updated.</div>
+</td>
+</tr>
+<tr class="rowColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../../../org/springframework/session/soss/config/annotation/web/http/EnableScaleoutHttpSession.html#useLocking--">useLocking</a></span></code>
 <div class="block">Sets whether or not to lock sessions on retrieval.</div>
@@ -183,26 +168,7 @@ <h3>Optional Element Summary</h3>
 <!--   -->
 </a>
 <h3>Element Detail</h3>
-<a name="remoteStoreName--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>remoteStoreName</h4>
-<pre>public abstract&nbsp;java.lang.String&nbsp;remoteStoreName</pre>
-<div class="block">If GeoServer pull is licensed and configured, setting the value for remoteStoreName indicates that replica objects
- in a remote store should be notified every time the local, master object is updated.</div>
-<dl>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>the remote store name (Must have GeoServer Pro licensed.)</dd>
-</dl>
-</li>
-</ul>
-</li>
-</ul>
-<!-- ============ ANNOTATION TYPE MEMBER DETAIL =========== -->
-<ul class="blockList">
-<li class="blockList"><a name="maxInactiveTimeMinutes--">
+<a name="maxInactiveTimeMinutes--">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -265,6 +231,28 @@ <h4>useLocking</h4>
 </li>
 </ul>
 <ul class="blockList">
+<li class="blockList"><a name="remoteStoreName--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>remoteStoreName</h4>
+<pre>public abstract&nbsp;java.lang.String&nbsp;remoteStoreName</pre>
+<div class="block">If ScaleOut GeoServer Pro is licensed and configured, setting the value for remoteStoreName indicates that replica objects
+ in a remote store should be notified every time the local, master object is updated.</div>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>the remote store name (Must have GeoServer Pro licensed.)</dd>
+</dl>
+<dl>
+<dt>Default:</dt>
+<dd>"UNASSIGNED"</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="remoteReadPendingRetryInterval--">
 <!--   -->
 </a>
@@ -277,7 +265,7 @@ <h4>remoteReadPendingRetryInterval</h4>
  The <a href="../../../../../../../../org/springframework/session/soss/config/annotation/web/http/EnableScaleoutHttpSession.html#remoteReadPendingRetryInterval--"><code>remoteReadPendingRetryInterval()</code></a> can be used to set the interval to wait
  when performing a read from a remote store in case a WAN error occurs.
 
- If GeoServer pull is licensed and configured, when performing a remote read of an object from a another store via
+ If ScaleOut GeoServer Pro is licensed and configured, when performing a remote read of an object from a another store via
  GeoServer pull replication, the <a href="../../../../../../../../org/springframework/session/soss/ScaleoutSessionRepository.html" title="class in org.springframework.session.soss"><code>ScaleoutSessionRepository</code></a> may need to repeatedly attempt to
  perform the remote read in a number of situations (for example, the master copy of the object may be in transit to
  a different remote store, or another thread in this client may already be trying to perform a remote read and is
@@ -307,7 +295,7 @@ <h4>maxRemoteReadRetries</h4>
  The <a href="../../../../../../../../org/springframework/session/soss/config/annotation/web/http/EnableScaleoutHttpSession.html#maxRemoteReadRetries--"><code>maxRemoteReadRetries()</code></a> can be used to set the maximum number of retries
  the <a href="../../../../../../../../org/springframework/session/soss/ScaleoutSessionRepository.html" title="class in org.springframework.session.soss"><code>ScaleoutSessionRepository</code></a> will exhaust before throwing a CantAccessException.
 
- If GeoServer pull is licensed and configured, when performing a remote read of an object from a another store
+ If ScaleOut GeoServer Pro is licensed and configured, when performing a remote read of an object from a another store
  via GeoServer pull replication, the <a href="../../../../../../../../org/springframework/session/soss/ScaleoutSessionRepository.html" title="class in org.springframework.session.soss"><code>ScaleoutSessionRepository</code></a> may need to repeatedly attempt to
  perform the remote read in a number of situations (for example, the master copy of the object may be in transit
  to a different remote store, or another thread in this client may already be trying to perform a remote read and
@@ -375,7 +363,7 @@ <h4>maxRemoteReadRetries</h4>
 <ul class="subNavList">
 <li>Summary:&nbsp;</li>
 <li>Field&nbsp;|&nbsp;</li>
-<li><a href="#annotation.type.required.element.summary">Required</a>&nbsp;|&nbsp;</li>
+<li>Required&nbsp;|&nbsp;</li>
 <li><a href="#annotation.type.optional.element.summary">Optional</a></li>
 </ul>
 <ul class="subNavList">