[java-plugin-shibd] branch main updated: Delete unused session modules.
Scott Cantor
cantor.2 at osu.edu
Tue Oct 15 15:18:36 UTC 2024
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-plugin-shibd.
View the commit online:
http://git.shibboleth.net/view/?p=java-plugin-shibd.git;a=commit;h=cf55ae7b7842b5dc9ccdee45babf996130ab6bd2
The following commit(s) were added to refs/heads/main by this push:
new cf55ae7 Delete unused session modules.
cf55ae7 is described below
commit cf55ae7b7842b5dc9ccdee45babf996130ab6bd2
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Oct 15 11:18:33 2024 -0400
Delete unused session modules.
---
pom.xml | 2 -
sp-bom/pom.xml | 12 +--
sp-session-api/.checkstyle | 10 --
sp-session-api/.gitignore | 1 -
sp-session-api/pom.xml | 46 ----------
.../sp/session/AbstractRemotableSPSession.java | 95 -------------------
.../shibboleth/sp/session/RemotableSPSession.java | 35 -------
.../java/net/shibboleth/sp/session/SPSession.java | 102 ---------------------
.../shibboleth/sp/session/SessionException.java | 58 ------------
.../net/shibboleth/sp/session/package-info.java | 18 ----
sp-session-impl/.checkstyle | 10 --
sp-session-impl/.gitignore | 1 -
sp-session-impl/pom.xml | 40 --------
13 files changed, 1 insertion(+), 429 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d427c1..6a5cc82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,8 +41,6 @@
<module>sp-conf-impl</module>
<module>sp-server-api</module>
<module>sp-server-impl</module>
- <module>sp-session-api</module>
- <module>sp-session-impl</module>
<module>sp-testing</module>
<module>sp-dist</module>
</modules>
diff --git a/sp-bom/pom.xml b/sp-bom/pom.xml
index 24dd72e..359ff2d 100644
--- a/sp-bom/pom.xml
+++ b/sp-bom/pom.xml
@@ -22,22 +22,12 @@
<artifactId>sp-server-api</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>sp-session-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>sp-server-impl</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>sp-session-impl</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/sp-session-api/.checkstyle b/sp-session-api/.checkstyle
deleted file mode 100644
index 1feabed..0000000
--- a/sp-session-api/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/java-plugin-shibd/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="protect-config-file" value="false"/>
- </local-check-config>
- <fileset name="all" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
diff --git a/sp-session-api/.gitignore b/sp-session-api/.gitignore
deleted file mode 100644
index b83d222..0000000
--- a/sp-session-api/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/sp-session-api/pom.xml b/sp-session-api/pom.xml
deleted file mode 100644
index 6b0ab28..0000000
--- a/sp-session-api/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- See LICENSE.txt file in the root directory of this repository for the copyright/license information. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.shibboleth.sp</groupId>
- <artifactId>sp-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sp-session-api</artifactId>
- <description>SP Session API.</description>
- <name>Shibboleth SP :: Processing Hub :: Session API</name>
- <packaging>jar</packaging>
-
- <properties>
- <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
- <automatic.module.name>net.shibboleth.sp.session</automatic.module.name>
- </properties>
-
- <dependencies>
- <!-- Compile dependencies -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>sp-server-api</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Provided dependencies -->
- <dependency>
- <groupId>${shib-attribute.groupId}</groupId>
- <artifactId>shib-attribute-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${shib-metadata.groupId}</groupId>
- <artifactId>shib-metadata-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Test Dependencies -->
- </dependencies>
-
-</project>
diff --git a/sp-session-api/src/main/java/net/shibboleth/sp/session/AbstractRemotableSPSession.java b/sp-session-api/src/main/java/net/shibboleth/sp/session/AbstractRemotableSPSession.java
deleted file mode 100644
index 8b72803..0000000
--- a/sp-session-api/src/main/java/net/shibboleth/sp/session/AbstractRemotableSPSession.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.sp.session;
-
-import java.time.Instant;
-import java.util.Collection;
-
-import javax.annotation.Nonnull;
-
-import com.google.common.collect.Multimap;
-
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.annotation.constraint.NotLive;
-import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.sp.ddf.DDF;
-
-/**
- * Abstract base class for a {@link RemotableSPSession}.
- */
-public abstract class AbstractRemotableSPSession implements RemotableSPSession {
-
- /** Underlying object housing session. */
- @Nonnull final DDF obj;
-
- /**
- * Constructor.
- *
- * @param id session identifier
- */
- protected AbstractRemotableSPSession(@Nonnull @NotEmpty final String id) {
- obj = new DDF(id);
- }
-
- /** {@inheritDoc} */
- @Nonnull @NotEmpty public String getId() {
- return obj.name();
- }
-
- /** {@inheritDoc} */
- @Nonnull public Instant getCreation() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /** {@inheritDoc} */
- @Nonnull public Instant getLastActivity() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /** {@inheritDoc} */
- @Nonnull public Instant getExpiration() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /** {@inheritDoc} */
- @Nonnull @NonnullElements @NotLive @Unmodifiable public Multimap<String,IdPAttribute> getAttributes() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /** {@inheritDoc} */
- public void addAttributes(@Nonnull @NonnullElements final Collection<IdPAttribute> attributes) {
- // TODO Auto-generated method stub
-
- }
-
- /** {@inheritDoc} */
- public void removeAttribute(@Nonnull @NonnullElements final Collection<IdPAttribute> attributes) {
- // TODO Auto-generated method stub
-
- }
-
- /** {@inheritDoc} */
- @Nonnull public DDF serialize() throws SessionException {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/sp-session-api/src/main/java/net/shibboleth/sp/session/RemotableSPSession.java b/sp-session-api/src/main/java/net/shibboleth/sp/session/RemotableSPSession.java
deleted file mode 100644
index b032737..0000000
--- a/sp-session-api/src/main/java/net/shibboleth/sp/session/RemotableSPSession.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.sp.session;
-
-import javax.annotation.Nonnull;
-
-import net.shibboleth.sp.ddf.DDF;
-
-/**
- * Extension for sessions that can generate a {@link DDF} representation.
- */
-public interface RemotableSPSession extends SPSession {
-
- /**
- * Serialize the session to a {@link DDF}.
- *
- * @return the serialized session
- *
- * @throws SessionException if unable to serialize
- */
- @Nonnull DDF serialize() throws SessionException;
-
-}
\ No newline at end of file
diff --git a/sp-session-api/src/main/java/net/shibboleth/sp/session/SPSession.java b/sp-session-api/src/main/java/net/shibboleth/sp/session/SPSession.java
deleted file mode 100644
index 1478fc1..0000000
--- a/sp-session-api/src/main/java/net/shibboleth/sp/session/SPSession.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.sp.session;
-
-import java.time.Instant;
-import java.util.Collection;
-
-import javax.annotation.Nonnull;
-import javax.annotation.concurrent.ThreadSafe;
-
-import com.google.common.collect.Multimap;
-
-import net.shibboleth.idp.attribute.IdPAttribute;
-import net.shibboleth.shared.annotation.constraint.NonnullElements;
-import net.shibboleth.shared.annotation.constraint.NotEmpty;
-import net.shibboleth.shared.annotation.constraint.NotLive;
-import net.shibboleth.shared.annotation.constraint.Unmodifiable;
-import net.shibboleth.shared.component.IdentifiedComponent;
-
-/**
- * A service provider session belonging to a particular subject and client device.
- */
- at ThreadSafe
-public interface SPSession extends IdentifiedComponent {
-
- /**
- * Get the time when this session was created.
- *
- * @return time this session was created
- */
- @Nonnull Instant getCreation();
-
- /**
- * Get the last activity time for the session.
- *
- * <p>This is generally an approximation based on periodic
- * updating of the value by external agents.</p>
- *
- * @return last activity for the session
- */
- @Nonnull Instant getLastActivity();
-
- /**
- * Get the expected expiration time of the session.
- *
- * @return expiration time
- */
- @Nonnull Instant getExpiration();
-
- /**
- * Get indexed map of {@link IdPAttribute} objects associated with this session.
- *
- * @return unmodifiable attribute map
- */
- @Nonnull @NonnullElements @NotLive @Unmodifiable public Multimap<String,IdPAttribute> getAttributes();
-
- /**
- * Add new {@link IdPAttribute} objects to the session.
- *
- * @param attributes attributes to add
- */
- void addAttributes(@Nonnull @NonnullElements final Collection<IdPAttribute> attributes);
-
- /**
- * Remove {@link IdPAttribute} objects from the session.
- *
- * @param attributes attributes to remove
- */
- void removeAttribute(@Nonnull @NonnullElements final Collection<IdPAttribute> attributes);
-
- /**
- * Test the session's validity based on the supplied client address, possibly binding it
- * to the session if appropriate.
- *
- * @param address client address for validation
- *
- * @return true iff the session is valid for the specified client address
- * @throws SessionException if an error occurs binding the address to the session
- */
- boolean checkAddress(@Nonnull @NotEmpty final String address) throws SessionException;
-
- /**
- * Test the session's validity based on inactivity, while updating the last activity time.
- *
- * @return true iff the session is still valid
- * @throws SessionException if an error occurs updating the activity time
- */
- boolean checkTimeout() throws SessionException;
-
-}
\ No newline at end of file
diff --git a/sp-session-api/src/main/java/net/shibboleth/sp/session/SessionException.java b/sp-session-api/src/main/java/net/shibboleth/sp/session/SessionException.java
deleted file mode 100644
index d0a43e6..0000000
--- a/sp-session-api/src/main/java/net/shibboleth/sp/session/SessionException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.shibboleth.sp.session;
-
-import javax.annotation.Nullable;
-
-/** Exception indicating a problem with the session layer. */
-public class SessionException extends Exception {
-
- /** Serial UUID. */
- private static final long serialVersionUID = 8243844915411488275L;
-
- /** Constructor. */
- public SessionException() {
-
- }
-
- /**
- * Constructor.
- *
- * @param message exception message
- */
- public SessionException(@Nullable final String message) {
- super(message);
- }
-
- /**
- * Constructor.
- *
- * @param wrappedException exception to be wrapped by this one
- */
- public SessionException(@Nullable final Exception wrappedException) {
- super(wrappedException);
- }
-
- /**
- * Constructor.
- *
- * @param message exception message
- * @param wrappedException exception to be wrapped by this one
- */
- public SessionException(@Nullable final String message, @Nullable final Exception wrappedException) {
- super(message, wrappedException);
- }
-
-}
\ No newline at end of file
diff --git a/sp-session-api/src/main/java/net/shibboleth/sp/session/package-info.java b/sp-session-api/src/main/java/net/shibboleth/sp/session/package-info.java
deleted file mode 100644
index 774513a..0000000
--- a/sp-session-api/src/main/java/net/shibboleth/sp/session/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * SP Session APIs.
- */
-package net.shibboleth.sp.session;
\ No newline at end of file
diff --git a/sp-session-impl/.checkstyle b/sp-session-impl/.checkstyle
deleted file mode 100644
index 1feabed..0000000
--- a/sp-session-impl/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
- <local-check-config name="Shibboleth Checkstyle" location="/java-plugin-shibd/resources/checkstyle/checkstyle.xml" type="project" description="">
- <additional-data name="protect-config-file" value="false"/>
- </local-check-config>
- <fileset name="all" enabled="true" check-config-name="Shibboleth Checkstyle" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
diff --git a/sp-session-impl/.gitignore b/sp-session-impl/.gitignore
deleted file mode 100644
index b83d222..0000000
--- a/sp-session-impl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/target/
diff --git a/sp-session-impl/pom.xml b/sp-session-impl/pom.xml
deleted file mode 100644
index debd6a5..0000000
--- a/sp-session-impl/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- See LICENSE.txt file in the root directory of this repository for the copyright/license information. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.shibboleth.sp</groupId>
- <artifactId>sp-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sp-session-impl</artifactId>
- <description>SP Session Implememntation.</description>
- <name>Shibboleth SP :: Processing Hub :: Session Implementation</name>
- <packaging>jar</packaging>
-
- <properties>
- <checkstyle.configLocation>${project.basedir}/../resources/checkstyle/checkstyle.xml</checkstyle.configLocation>
- <automatic.module.name>net.shibboleth.sp.session.impl</automatic.module.name>
- </properties>
-
- <dependencies>
- <!-- Compile dependencies -->
-
- <!-- Provided dependencies -->
- <dependency>
- <groupId>${shib-attribute.groupId}</groupId>
- <artifactId>shib-attribute-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${shib-metadata.groupId}</groupId>
- <artifactId>shib-metadata-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Test Dependencies -->
- </dependencies>
-
-</project>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list