#ignite-189: move AuthenticationContextAdapter from org.apache.ignite.authentication to org.apache.ignite.plugin.security package.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2703af8d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2703af8d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2703af8d Branch: refs/heads/ignite-189 Commit: 2703af8def9d95153bf49e739c13b10bc72a2f8a Parents: bd2ce38 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Feb 12 20:40:23 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Feb 12 20:40:23 2015 +0300 ---------------------------------------------------------------------- .../AuthenticationContextAdapter.java | 112 ------------------- .../processors/rest/GridRestProcessor.java | 1 - .../security/AuthenticationContextAdapter.java | 110 ++++++++++++++++++ 3 files changed, 110 insertions(+), 113 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2703af8d/modules/core/src/main/java/org/apache/ignite/authentication/AuthenticationContextAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/authentication/AuthenticationContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/authentication/AuthenticationContextAdapter.java deleted file mode 100644 index 0500676..0000000 --- a/modules/core/src/main/java/org/apache/ignite/authentication/AuthenticationContextAdapter.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.apache.ignite.authentication; - -import org.apache.ignite.plugin.security.*; - -import java.net.*; -import java.util.*; - -/** - * Authentication context. - */ -public class AuthenticationContextAdapter implements AuthenticationContext { - /** Subject type. */ - private GridSecuritySubjectType subjType; - - /** Subject ID.w */ - private UUID subjId; - - /** Credentials. */ - private GridSecurityCredentials credentials; - - /** Subject address. */ - private InetSocketAddress addr; - - /** - * Gets subject type. - * - * @return Subject type. - */ - @Override public GridSecuritySubjectType subjectType() { - return subjType; - } - - /** - * Sets subject type. - * - * @param subjType Subject type. - */ - public void subjectType(GridSecuritySubjectType subjType) { - this.subjType = subjType; - } - - /** - * Gets subject ID. - * - * @return Subject ID. - */ - @Override public UUID subjectId() { - return subjId; - } - - /** - * Sets subject ID. - * - * @param subjId Subject ID. - */ - public void subjectId(UUID subjId) { - this.subjId = subjId; - } - - /** - * Gets security credentials. - * - * @return Security credentials. - */ - @Override public GridSecurityCredentials credentials() { - return credentials; - } - - /** - * Sets security credentials. - * - * @param credentials Security credentials. - */ - public void credentials(GridSecurityCredentials credentials) { - this.credentials = credentials; - } - - /** - * Gets subject network address. - * - * @return Subject network address. - */ - @Override public InetSocketAddress address() { - return addr; - } - - /** - * Sets subject network address. - * - * @param addr Subject network address. - */ - public void address(InetSocketAddress addr) { - this.addr = addr; - } -} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2703af8d/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java index 9d36214..ddf6905 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java @@ -18,7 +18,6 @@ package org.apache.ignite.internal.processors.rest; import org.apache.ignite.*; -import org.apache.ignite.authentication.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2703af8d/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContextAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContextAdapter.java b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContextAdapter.java new file mode 100644 index 0000000..18fc0c1 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/plugin/security/AuthenticationContextAdapter.java @@ -0,0 +1,110 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You 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 org.apache.ignite.plugin.security; + +import java.net.*; +import java.util.*; + +/** + * Authentication context. + */ +public class AuthenticationContextAdapter implements AuthenticationContext { + /** Subject type. */ + private GridSecuritySubjectType subjType; + + /** Subject ID.w */ + private UUID subjId; + + /** Credentials. */ + private GridSecurityCredentials credentials; + + /** Subject address. */ + private InetSocketAddress addr; + + /** + * Gets subject type. + * + * @return Subject type. + */ + @Override public GridSecuritySubjectType subjectType() { + return subjType; + } + + /** + * Sets subject type. + * + * @param subjType Subject type. + */ + public void subjectType(GridSecuritySubjectType subjType) { + this.subjType = subjType; + } + + /** + * Gets subject ID. + * + * @return Subject ID. + */ + @Override public UUID subjectId() { + return subjId; + } + + /** + * Sets subject ID. + * + * @param subjId Subject ID. + */ + public void subjectId(UUID subjId) { + this.subjId = subjId; + } + + /** + * Gets security credentials. + * + * @return Security credentials. + */ + @Override public GridSecurityCredentials credentials() { + return credentials; + } + + /** + * Sets security credentials. + * + * @param credentials Security credentials. + */ + public void credentials(GridSecurityCredentials credentials) { + this.credentials = credentials; + } + + /** + * Gets subject network address. + * + * @return Subject network address. + */ + @Override public InetSocketAddress address() { + return addr; + } + + /** + * Sets subject network address. + * + * @param addr Subject network address. + */ + public void address(InetSocketAddress addr) { + this.addr = addr; + } +}