[java-identity-provider COMMIT] in /trunk: idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPri...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov  4 14:10:57 2016
New Revision: 8556

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8556&view=rev
Log:
IDP-1078 - StorageBackedIdPSessionSerializer is slow under heavy load

https://issues.shibboleth.net/jira/browse/IDP-1078

Make very minor improvements to some similar code.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPrincipalSerializer.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/CollectionSerializer.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPrincipalSerializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPrincipalSerializer.java?rev=8556&r1=8555&r2=8556&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPrincipalSerializer.java	(original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/principal/AbstractPrincipalSerializer.java	Fri Nov  4 14:10:57 2016
@@ -22,9 +22,9 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.concurrent.ThreadSafe;
-import javax.json.Json;
 import javax.json.JsonReader;
 import javax.json.JsonReaderFactory;
+import javax.json.spi.JsonProvider;
 import javax.json.stream.JsonGenerator;
 import javax.json.stream.JsonGeneratorFactory;
 
@@ -49,8 +49,9 @@
      * Constructor.
      */
     public AbstractPrincipalSerializer() {
-        generatorFactory = Json.createGeneratorFactory(null);
-        readerFactory = Json.createReaderFactory(null);
+        final JsonProvider provider = JsonProvider.provider();
+        generatorFactory = provider.createGeneratorFactory(null);
+        readerFactory = provider.createReaderFactory(null);
     }
 
     /**

Modified: trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/CollectionSerializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/CollectionSerializer.java?rev=8556&r1=8555&r2=8556&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/CollectionSerializer.java	(original)
+++ trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/CollectionSerializer.java	Fri Nov  4 14:10:57 2016
@@ -25,7 +25,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonReader;
 import javax.json.JsonReaderFactory;
@@ -33,6 +32,7 @@
 import javax.json.JsonStructure;
 import javax.json.JsonValue;
 import javax.json.JsonValue.ValueType;
+import javax.json.spi.JsonProvider;
 import javax.json.stream.JsonGenerator;
 import javax.json.stream.JsonGeneratorFactory;
 
@@ -64,8 +64,9 @@
 
     /** Constructor. */
     public CollectionSerializer() {
-        generatorFactory = Json.createGeneratorFactory(null);
-        readerFactory = Json.createReaderFactory(null);
+        final JsonProvider provider = JsonProvider.provider();
+        generatorFactory = provider.createGeneratorFactory(null);
+        readerFactory = provider.createReaderFactory(null);
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java?rev=8556&r1=8555&r2=8556&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java	(original)
+++ trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/consent/storage/impl/ConsentSerializer.java	Fri Nov  4 14:10:57 2016
@@ -26,7 +26,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import javax.json.Json;
 import javax.json.JsonArray;
 import javax.json.JsonException;
 import javax.json.JsonNumber;
@@ -37,6 +36,7 @@
 import javax.json.JsonStructure;
 import javax.json.JsonValue;
 import javax.json.JsonValue.ValueType;
+import javax.json.spi.JsonProvider;
 import javax.json.stream.JsonGenerator;
 import javax.json.stream.JsonGeneratorFactory;
 
@@ -86,8 +86,9 @@
 
     /** Constructor. */
     public ConsentSerializer() {
-        generatorFactory = Json.createGeneratorFactory(null);
-        readerFactory = Json.createReaderFactory(null);
+        final JsonProvider provider = JsonProvider.provider();
+        generatorFactory = provider.createGeneratorFactory(null);
+        readerFactory = provider.createReaderFactory(null);
         symbolics = ImmutableBiMap.of();
     }