UP-4728: Undo IntelliJ's butchered import order; moce the CACHE_CONTR…

…OL_NOSTORE and CACHE_CONTROL_NOCACHE constants to uPortal-soffit/ because they're needed by both submodules

uPortal-soffit/src/main/java/org/apereo/portal/soffit/Headers.java

@@ -83,6 +83,20 @@ public enum Headers {
      */
     public static final String BEARER_TOKEN_PREFIX = "Bearer ";
 
+    /**
+     * The default value for the <code>Cache-Control</code> header is "no-store,"
+     * which indicates the response should never be cached.  Currently, this
+     * header value will be sent if the Soffit does not specify a value for
+     * <strong>both</strong> scope or max-age.
+     */
+    public static final String CACHE_CONTROL_NOSTORE = "no-store";
+
+    /**
+     * Indicates the response may be cached with validation caching based on
+     * Last-Modified or ETag.  These features are not currently implemented.
+     */
+    public static final String CACHE_CONTROL_NOCACHE = "no-cache";
+
     /*
      * Implementation
      */

uPortal-soffit/src/main/java/org/apereo/portal/soffit/model/v1_0/Bearer.java

@@ -19,12 +19,12 @@
 
 package org.apereo.portal.soffit.model.v1_0;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 /**
  * Encapsulates username, user attributes, and group affiliations.
  *

uPortal-soffit/src/main/java/org/apereo/portal/soffit/model/v1_0/Definition.java

@@ -19,12 +19,12 @@
 
 package org.apereo.portal.soffit.model.v1_0;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 /**
  * Provides information about the publication record of the soffit within the
  * portal.

uPortal-soffit/src/main/java/org/apereo/portal/soffit/model/v1_0/PortalRequest.java

@@ -19,12 +19,12 @@
 
 package org.apereo.portal.soffit.model.v1_0;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 /**
  * Provides some information about the user's request to which the portal will
  * respond using output from the soffit.  This information is organized into

uPortal-soffit/src/main/java/org/apereo/portal/soffit/model/v1_0/Preferences.java

@@ -19,12 +19,12 @@
 
 package org.apereo.portal.soffit.model.v1_0;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
 /**
  * Collection of preferences for this Soffit and their values.  Preferences are
  * typically defined by administrators at publish time.

uPortal-soffit/src/main/java/org/apereo/portal/soffit/service/AbstractJwtService.java

@@ -19,6 +19,11 @@
 
 package org.apereo.portal.soffit.service;
 
+import java.util.Date;
+import java.util.UUID;
+
+import javax.annotation.PostConstruct;
+
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;
 import io.jsonwebtoken.Jwts;
@@ -30,10 +35,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 
-import javax.annotation.PostConstruct;
-import java.util.Date;
-import java.util.UUID;
-
 /**
  * Base class for services that produce JASON Web Tokens.
  *

uPortal-soffit/src/main/java/org/apereo/portal/soffit/service/BearerService.java

@@ -19,13 +19,13 @@
 
 package org.apereo.portal.soffit.service;
 
+import java.util.*;
+
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;
 import org.apereo.portal.soffit.model.v1_0.Bearer;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
-
 /**
  * Responsible for issuing and parsing Bearer tokens.
  *

uPortal-soffit/src/main/java/org/apereo/portal/soffit/service/DefinitionService.java

@@ -19,15 +19,15 @@
 
 package org.apereo.portal.soffit.service;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;
 import org.apereo.portal.soffit.model.v1_0.Definition;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Responsible for issuing and parsing Definition tokens.
  *

uPortal-soffit/src/main/java/org/apereo/portal/soffit/service/PortalRequestService.java

@@ -19,15 +19,15 @@
 
 package org.apereo.portal.soffit.service;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;
 import org.apereo.portal.soffit.model.v1_0.PortalRequest;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Responsible for issuing and parsing the {@link PortalRequest} provided by the
  * Soffit Connector.

uPortal-soffit/src/main/java/org/apereo/portal/soffit/service/PreferencesService.java

@@ -19,16 +19,16 @@
 
 package org.apereo.portal.soffit.service;
 
-import io.jsonwebtoken.Claims;
-import io.jsonwebtoken.Jws;
-import org.apereo.portal.soffit.model.v1_0.Preferences;
-import org.springframework.stereotype.Service;
-
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import org.apereo.portal.soffit.model.v1_0.Preferences;
+import org.springframework.stereotype.Service;
+
 /**
  * Responsible for issuing and parsing the collection of preferences.
  *