Update file names to match concept.

Author: MikeNeilson

cwms-data-api/src/main/java/cwms/cda/ApiServlet.java

@@ -158,6 +158,7 @@
 import cwms.cda.formatters.FormattingException;
 import cwms.cda.formatters.UnsupportedFormatException;
 import cwms.cda.security.Authenticator;
+import cwms.cda.security.CdaAccessManager;
 import cwms.cda.security.CwmsAuthException;
 import cwms.cda.security.MissingRolesException;
 import cwms.cda.security.Role;

cwms-data-api/src/main/java/cwms/cda/security/KeyAccessManagerProvider.java renamed to cwms-data-api/src/main/java/cwms/cda/security/ApiKeyIdentityProvider.java

@@ -14,7 +14,7 @@
 import cwms.cda.data.dao.JooqDao;
 
 @AutoService(IdentityProvider.class)
-public class KeyAccessManagerProvider implements IdentityProvider {
+public class ApiKeyIdentityProvider implements IdentityProvider {
 
     public static final String AUTH_HEADER = "Authorization";
     private static AuthDao authDao;

cwms-data-api/src/main/java/cwms/cda/CdaAccessManager.java renamed to cwms-data-api/src/main/java/cwms/cda/security/CdaAccessManager.java

@@ -1,10 +1,10 @@
-package cwms.cda;
+package cwms.cda.security;
 
 import java.util.Set;
 
+import cwms.cda.ApiServlet;
 import cwms.cda.data.dao.AuthDao;
 import cwms.cda.data.dao.JooqDao;
-import cwms.cda.security.DataApiPrincipal;
 import io.javalin.core.security.AccessManager;
 import io.javalin.core.security.RouteRole;
 import io.javalin.http.Context;

cwms-data-api/src/main/java/cwms/cda/security/CwmsAccessManagerProvider.java renamed to cwms-data-api/src/main/java/cwms/cda/security/CwmsAaaIdentityProvider.java

@@ -22,9 +22,9 @@
 import cwms.auth.CwmsUserPrincipal;
 
 @AutoService(IdentityProvider.class)
-public class CwmsAccessManagerProvider implements IdentityProvider {
+public class CwmsAaaIdentityProvider implements IdentityProvider {
 
-    private static final Logger logger = Logger.getLogger(CwmsAccessManagerProvider.class.getName());
+    private static final Logger logger = Logger.getLogger(CwmsAaaIdentityProvider.class.getName());
     private static final String SESSION_COOKIE_NAME = "JSESSIONIDSSO";    
 
     private DataApiPrincipal getApiPrincipal(Context ctx) {
@@ -73,7 +73,7 @@ private static Set<RouteRole> getRoles(Principal principal) {
                 CwmsUserPrincipal cup = (CwmsUserPrincipal) principal;
                 roleNames = cup.getRoles();
                 if (roleNames != null) {
-                    roleNames.stream().map(CwmsAccessManagerProvider::buildRole).forEach(retval::add);
+                    roleNames.stream().map(CwmsAaaIdentityProvider::buildRole).forEach(retval::add);
                 }
                 logger.log(Level.FINE, "Principal had roles: {0}", retval);
             } catch (ClassCastException e) {

cwms-data-api/src/main/java/cwms/cda/security/OpenIDAccessManagerProvider.java renamed to cwms-data-api/src/main/java/cwms/cda/security/OpenIdConnectIdentitityProvider.java

@@ -41,7 +41,7 @@
 
 
 @AutoService(IdentityProvider.class)
-public class OpenIDAccessManagerProvider implements IdentityProvider {
+public class OpenIdConnectIdentitityProvider implements IdentityProvider {
     private static final FluentLogger log = FluentLogger.forEnclosingClass();
 
     public static final String WELL_KNOWN_PROPERTY = "cwms.dataapi.access.openid.wellKnownUrl";
@@ -60,7 +60,7 @@ public class OpenIDAccessManagerProvider implements IdentityProvider {
     private JwtParser jwtParser = null;
     private OpenIDConfig config = null;
 
-    public OpenIDAccessManagerProvider() {
+    public OpenIdConnectIdentitityProvider() {
         String wellKnownUrl = System.getProperty(WELL_KNOWN_PROPERTY,System.getenv(WELL_KNOWN_PROPERTY));
         String issuer = System.getProperty(ISSUER_PROPERTY,System.getenv(ISSUER_PROPERTY));
         String timeoutStr = System.getProperty(TIMEOUT_PROPERTY,System.getenv(TIMEOUT_PROPERTY));

cwms-data-api/src/test/java/cwms/cda/api/BasinControllerIT.java

@@ -43,7 +43,7 @@
 import org.junit.jupiter.api.Test;
 
 import static cwms.cda.api.Controllers.*;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 
 import javax.servlet.http.HttpServletResponse;
 

cwms-data-api/src/test/java/cwms/cda/api/DownstreamLocationsGetControllerIT.java

@@ -17,7 +17,7 @@
 import cwms.cda.data.dto.stream.StreamLocation;
 import cwms.cda.formatters.ContentType;
 import cwms.cda.formatters.Formats;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import fixtures.CwmsDataApiSetupCallback;
 import fixtures.TestAccounts;
 import static io.restassured.RestAssured.given;

cwms-data-api/src/test/java/cwms/cda/api/EmbankmentControllerIT.java

@@ -56,7 +56,7 @@
 import static cwms.cda.api.Controllers.FAIL_IF_EXISTS;
 import static cwms.cda.api.Controllers.OFFICE;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 

cwms-data-api/src/test/java/cwms/cda/api/ForecastInstanceControllerTestIT.java

@@ -28,7 +28,7 @@
 import java.util.Random;
 
 import static cwms.cda.api.ForecastSpecControllerTestIT.*;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static java.util.stream.Collectors.toMap;
 import static org.hamcrest.Matchers.*;

cwms-data-api/src/test/java/cwms/cda/api/ForecastSpecControllerTestIT.java

@@ -26,7 +26,7 @@
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;

cwms-data-api/src/test/java/cwms/cda/api/LockControllerIT.java

@@ -28,7 +28,7 @@
 import static cwms.cda.api.Controllers.PROJECT_ID;
 import static cwms.cda.api.Controllers.UNIT;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;

cwms-data-api/src/test/java/cwms/cda/api/LookupTypeControllerIT.java

@@ -39,7 +39,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

cwms-data-api/src/test/java/cwms/cda/api/MeasurementControllerTestIT.java

@@ -36,7 +36,7 @@
 import cwms.cda.data.dto.stream.Stream;
 import cwms.cda.formatters.ContentType;
 import cwms.cda.formatters.Formats;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import fixtures.CwmsDataApiSetupCallback;
 import fixtures.MinimumSchema;
 import fixtures.TestAccounts;

cwms-data-api/src/test/java/cwms/cda/api/ProjectControllerIT.java

@@ -26,7 +26,7 @@
 
 import static cwms.cda.api.Controllers.NAME;
 import static cwms.cda.api.Controllers.OFFICE;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.Matchers.empty;

cwms-data-api/src/test/java/cwms/cda/api/PropertyControllerIT.java

@@ -39,7 +39,7 @@
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

cwms-data-api/src/test/java/cwms/cda/api/StreamControllerTestIT.java

@@ -56,7 +56,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

cwms-data-api/src/test/java/cwms/cda/api/StreamLocationControllerTestIT.java

@@ -60,7 +60,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

cwms-data-api/src/test/java/cwms/cda/api/StreamReachControllerTestIT.java

@@ -59,7 +59,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 

cwms-data-api/src/test/java/cwms/cda/api/TimeSeriesProfileControllerIT.java

@@ -49,7 +49,7 @@
 import java.util.logging.Logger;
 
 import static cwms.cda.api.Controllers.*;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

cwms-data-api/src/test/java/cwms/cda/api/TimeSeriesProfileInstanceControllerIT.java

@@ -44,7 +44,7 @@
 import static cwms.cda.api.Controllers.UNIT;
 import static cwms.cda.api.Controllers.VERSION;
 import static cwms.cda.api.Controllers.VERSION_DATE;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static cwms.cda.api.Controllers.PROFILE_DATA;
 import static org.hamcrest.Matchers.*;

cwms-data-api/src/test/java/cwms/cda/api/TimeSeriesProfileParserControllerIT.java

@@ -54,7 +54,7 @@
 import java.util.logging.Logger;
 
 import static cwms.cda.api.Controllers.*;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

cwms-data-api/src/test/java/cwms/cda/api/TimeSeriesRecentControllerIT.java

@@ -28,7 +28,7 @@
 
 import static cwms.cda.api.Controllers.*;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;

cwms-data-api/src/test/java/cwms/cda/api/TurbineChangesControllerIT.java

@@ -26,7 +26,7 @@
 
 import static cwms.cda.api.Controllers.OVERRIDE_PROTECTION;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;

cwms-data-api/src/test/java/cwms/cda/api/TurbineControllerIT.java

@@ -57,7 +57,7 @@
 
 import static cwms.cda.api.Controllers.FAIL_IF_EXISTS;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 

cwms-data-api/src/test/java/cwms/cda/api/UpstreamLocationsGetControllerIT.java

@@ -17,7 +17,7 @@
 import cwms.cda.data.dto.stream.StreamLocation;
 import cwms.cda.formatters.ContentType;
 import cwms.cda.formatters.Formats;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import fixtures.CwmsDataApiSetupCallback;
 import fixtures.TestAccounts;
 import static io.restassured.RestAssured.given;

cwms-data-api/src/test/java/cwms/cda/api/WaterContractControllerTestIT.java

@@ -62,7 +62,7 @@
 import java.time.ZoneId;
 import static cwms.cda.api.Controllers.*;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 

cwms-data-api/src/test/java/cwms/cda/api/WaterContractTypeControllerTestIT.java

@@ -27,7 +27,7 @@
 package cwms.cda.api;
 
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static java.lang.String.format;
 import static org.hamcrest.Matchers.equalTo;

cwms-data-api/src/test/java/cwms/cda/api/WaterPumpDisassociateControllerTestIT.java

@@ -61,7 +61,7 @@
 
 import static cwms.cda.api.Controllers.*;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 

cwms-data-api/src/test/java/cwms/cda/api/WaterSupplyAccountingControllerIT.java

@@ -65,7 +65,7 @@
 
 import static cwms.cda.api.Controllers.UNIT;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;

cwms-data-api/src/test/java/cwms/cda/api/WaterUserControllerTestIT.java

@@ -28,7 +28,7 @@
 
 import static cwms.cda.api.Controllers.*;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;

cwms-data-api/src/test/java/cwms/cda/api/location/kind/GateChangeControllerTestIT.java

@@ -54,7 +54,7 @@
 
 import static cwms.cda.api.Controllers.*;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertNotNull;

cwms-data-api/src/test/java/cwms/cda/api/location/kind/OutletControllerTestIT.java

@@ -42,7 +42,7 @@
 import org.junit.jupiter.api.Test;
 import static cwms.cda.api.Controllers.*;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 

cwms-data-api/src/test/java/cwms/cda/api/location/kind/VirtualOutletControllerTestIT.java

@@ -45,7 +45,7 @@
 import static cwms.cda.api.Controllers.FAIL_IF_EXISTS;
 import static cwms.cda.api.Controllers.METHOD;
 import static cwms.cda.data.dao.DaoTest.getDslContext;
-import static cwms.cda.security.KeyAccessManagerProvider.AUTH_HEADER;
+import static cwms.cda.security.ApiKeyIdentityProvider.AUTH_HEADER;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.*;
 

cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java

@@ -25,7 +25,7 @@
 import com.google.common.flogger.FluentLogger;
 
 import cwms.cda.data.dao.Dao;
-import cwms.cda.security.OpenIDAccessManagerProvider;
+import cwms.cda.security.OpenIdConnectIdentitityProvider;
 import fixtures.tomcat.SingleSignOnWrapper;
 import helpers.TsRandomSampler;
 import io.restassured.RestAssured;
@@ -143,9 +143,9 @@ public void beforeAll(ExtensionContext context) throws Exception {
 
             // OIDC properties
             System.setProperty("cwms.dataapi.access.providers","KeyAccessManager,OpenID,CwmsAccessManager");
-            System.setProperty(OpenIDAccessManagerProvider.CREATE_USERS_KEY,"true");
-            System.setProperty(OpenIDAccessManagerProvider.WELL_KNOWN_PROPERTY,KeyCloakExtension.getOidcWellKnown());
-            System.setProperty(OpenIDAccessManagerProvider.ISSUER_PROPERTY,KeyCloakExtension.getIssuer());
+            System.setProperty(OpenIdConnectIdentitityProvider.CREATE_USERS_KEY,"true");
+            System.setProperty(OpenIdConnectIdentitityProvider.WELL_KNOWN_PROPERTY,KeyCloakExtension.getOidcWellKnown());
+            System.setProperty(OpenIdConnectIdentitityProvider.ISSUER_PROPERTY,KeyCloakExtension.getIssuer());
 
             logger.atInfo().log("warFile property:" + System.getProperty("warFile"));