@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | /** |
105 | 105 | * Inject the realm's configuration. |
106 | 106 | * |
107 | - * @param \AppserverIo\Appserver\ServletEngine\Security\SecurityDomainInterface $configuration The realm's configuration |
|
107 | + * @param SecurityDomainNodeInterface $configuration The realm's configuration |
|
108 | 108 | * |
109 | 109 | * @return void |
110 | 110 | */ |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @param \AppserverIo\Lang\String $username The name of the user to authenticate |
150 | 150 | * @param \AppserverIo\Psr\Security\Auth\Callback\CallbackHandlerInterface $callbackHandler The callback handler used to load the credentials |
151 | 151 | * |
152 | - * @return \AppserverIo\Security\PrincipalInterface|null The authenticated user principal |
|
152 | + * @return GenericPrincipal|null The authenticated user principal |
|
153 | 153 | */ |
154 | 154 | public function authenticateByUsernameAndCallbackHandler(String $username, CallbackHandlerInterface $callbackHandler) |
155 | 155 | { |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | * @param \AppserverIo\Lang\String $username The name of the user to authenticate |
184 | 184 | * @param \AppserverIo\Lang\String $password The password used for authentication |
185 | 185 | * |
186 | - * @return \AppserverIo\Security\PrincipalInterface|null The authenticated user principal |
|
186 | + * @return GenericPrincipal|null The authenticated user principal |
|
187 | 187 | */ |
188 | 188 | public function authenticate(String $username, String $password) |
189 | 189 | { |
@@ -208,7 +208,7 @@ discard block |
||
208 | 208 | * @param \AppserverIo\Psr\Security\Auth\Subject $subject The Subject representing the logged-in user |
209 | 209 | * @param \AppserverIo\Psr\Security\Auth\Login\LoginContextInterface $loginContext Associated with the Principal so {@link LoginContext#logout()} can be called later |
210 | 210 | * |
211 | - * @return \AppserverIo\Security\PrincipalInterface the principal object |
|
211 | + * @return GenericPrincipal the principal object |
|
212 | 212 | */ |
213 | 213 | protected function createPrincipal(String $username, Subject $subject, LoginContextInterface $loginContext) |
214 | 214 | { |
@@ -22,7 +22,6 @@ |
||
22 | 22 | |
23 | 23 | use AppserverIo\Lang\String; |
24 | 24 | use AppserverIo\Collections\ArrayList; |
25 | -use AppserverIo\Configuration\Configuration; |
|
26 | 25 | use AppserverIo\Psr\Security\Auth\Subject; |
27 | 26 | use AppserverIo\Psr\Security\PrincipalInterface; |
28 | 27 | use AppserverIo\Psr\Security\Auth\Login\LoginContext; |
@@ -81,7 +81,7 @@ |
||
81 | 81 | * @param \AppserverIo\Lang\String $username The username to load the roles for |
82 | 82 | * @param \AppserverIo\Lang\String $lookupName The lookup name for the datasource |
83 | 83 | * @param \AppserverIo\Lang\String $rolesQuery The query to load the roles |
84 | - * @param \AppserverIo\Psr\Spi\LoginModuleInterface $aslm The login module to add the roles to |
|
84 | + * @param LoginModuleInterface $aslm The login module to add the roles to |
|
85 | 85 | * |
86 | 86 | * @return array An array of groups containing the sets of roles |
87 | 87 | * @throws \AppserverIo\Appserver\ServletEngine\Security\Logi\LoginException Is thrown if an error during login occured |
@@ -102,7 +102,7 @@ |
||
102 | 102 | * @param \AppserverIo\Server\Interfaces\RequestContextInterface $requestContext A requests context instance |
103 | 103 | * @param integer $hook The current hook to process logic for |
104 | 104 | * |
105 | - * @return boolean |
|
105 | + * @return boolean|null |
|
106 | 106 | * |
107 | 107 | * @throws \AppserverIo\Server\Exceptions\ModuleException |
108 | 108 | */ |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | /** |
59 | 59 | * Injects the additional directories to be parsed when looking for servlets. |
60 | 60 | * |
61 | - * @param array $directories The additional directories to be parsed |
|
61 | + * @param \AppserverIo\Appserver\Core\Api\Node\DirectoryNode[] $directories The additional directories to be parsed |
|
62 | 62 | * |
63 | 63 | * @return void |
64 | 64 | */ |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | /** |
294 | 294 | * Returns all servlets |
295 | 295 | * |
296 | - * @return array The servlets collection |
|
296 | + * @return StorageInterface The servlets collection |
|
297 | 297 | */ |
298 | 298 | public function getServlets() |
299 | 299 | { |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | * |
55 | 55 | * @param string $id The ID of the session we want to unpersist |
56 | 56 | * |
57 | - * @return \AppserverIo\Psr\Servlet\ServletSessionInterface The unpersisted session |
|
57 | + * @return null|Session The unpersisted session |
|
58 | 58 | */ |
59 | 59 | public function load($id) |
60 | 60 | { |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * |
148 | 148 | * @param string $id The ID of the session to load |
149 | 149 | * |
150 | - * @return \AppserverIo\Psr\Servlet\Http\HttpSessionInterface The unmarshalled session |
|
150 | + * @return null|Session The unmarshalled session |
|
151 | 151 | * @throws \AppserverIo\Appserver\ServletEngine\SessionDataNotReadableException Is thrown if the file containing the session data is not readable |
152 | 152 | */ |
153 | 153 | protected function unpersist($id) |
@@ -20,11 +20,8 @@ |
||
20 | 20 | |
21 | 21 | namespace AppserverIo\Appserver\ServletEngine\Session; |
22 | 22 | |
23 | -use AppserverIo\Lang\Reflection\ReflectionClass; |
|
24 | 23 | use AppserverIo\Psr\Servlet\ServletSessionInterface; |
25 | 24 | use AppserverIo\Appserver\ServletEngine\Http\Session; |
26 | -use AppserverIo\Appserver\ServletEngine\SessionSettingsInterface; |
|
27 | -use AppserverIo\Appserver\ServletEngine\SessionMarshallerInterface; |
|
28 | 25 | use AppserverIo\Appserver\ServletEngine\SessionCanNotBeSavedException; |
29 | 26 | use AppserverIo\Appserver\ServletEngine\SessionCanNotBeDeletedException; |
30 | 27 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * |
48 | 48 | * @param string $id The ID of the session we want to unpersist |
49 | 49 | * |
50 | - * @return \AppserverIo\Psr\Servlet\ServletSessionInterface The unpersisted session |
|
50 | + * @return null|Session The unpersisted session |
|
51 | 51 | */ |
52 | 52 | public function load($id) |
53 | 53 | { |
@@ -157,7 +157,7 @@ discard block |
||
157 | 157 | * |
158 | 158 | * @param string $pathname The path of the file to load the session data from |
159 | 159 | * |
160 | - * @return \AppserverIo\Psr\Servlet\Http\HttpSessionInterface The unmarshalled session |
|
160 | + * @return null|Session The unmarshalled session |
|
161 | 161 | * @throws \AppserverIo\Appserver\ServletEngine\SessionDataNotReadableException Is thrown if the file containing the session data is not readable |
162 | 162 | */ |
163 | 163 | protected function unpersist($pathname) |
@@ -20,11 +20,8 @@ |
||
20 | 20 | |
21 | 21 | namespace AppserverIo\Appserver\ServletEngine\Session; |
22 | 22 | |
23 | -use AppserverIo\Lang\Reflection\ReflectionClass; |
|
24 | 23 | use AppserverIo\Psr\Servlet\ServletSessionInterface; |
25 | 24 | use AppserverIo\Appserver\ServletEngine\Http\Session; |
26 | -use AppserverIo\Appserver\ServletEngine\SessionSettingsInterface; |
|
27 | -use AppserverIo\Appserver\ServletEngine\SessionMarshallerInterface; |
|
28 | 25 | use AppserverIo\Appserver\ServletEngine\SessionCanNotBeSavedException; |
29 | 26 | use AppserverIo\Appserver\ServletEngine\SessionCanNotBeDeletedException; |
30 | 27 |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | /** |
125 | 125 | * Returns the application instance. |
126 | 126 | * |
127 | - * @return \AppserverIo\Psr\Application\ApplicationInterface|\AppserverIo\Psr\Naming\NamingDirectoryInterface The application instance |
|
127 | + * @return ApplicationInterface The application instance |
|
128 | 128 | */ |
129 | 129 | public function getApplication() |
130 | 130 | { |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | /** |
213 | 213 | * Returns all registered session handlers. |
214 | 214 | * |
215 | - * @return \AppserverIo\Collections\ArrayList The session handlers |
|
215 | + * @return HashMap The session handlers |
|
216 | 216 | */ |
217 | 217 | public function getSessionHandlers() |
218 | 218 | { |
@@ -418,7 +418,7 @@ discard block |
||
418 | 418 | * |
419 | 419 | * @param string $id The unique session ID to that has to be returned |
420 | 420 | * |
421 | - * @return \AppserverIo\Psr\Servlet\Http\ServletSessionInterface|null The requested session |
|
421 | + * @return null|ServletSessionInterface The requested session |
|
422 | 422 | */ |
423 | 423 | public function find($id) |
424 | 424 | { |