#ignite-189: move GridSecuritySubjectAdapter to org.gridgain.grid.aut…

…hentication.

modules/core/src/main/java/org/apache/ignite/internal/processors/security/os/GridOsSecurityProcessor.java

@@ -22,7 +22,9 @@
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.*;
 import org.apache.ignite.internal.processors.security.*;
+import org.apache.ignite.internal.util.tostring.*;
 import org.apache.ignite.internal.util.typedef.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
 import org.apache.ignite.plugin.security.*;
 import org.jetbrains.annotations.*;
 
@@ -121,4 +123,96 @@ public GridOsSecurityProcessor(GridKernalContext ctx) {
     @Override public boolean enabled() {
         return false;
     }
+
+     /**
+     * Authenticated security subject.
+     */
+     private class GridSecuritySubjectAdapter implements GridSecuritySubject {
+        /** */
+        private static final long serialVersionUID = 0L;
+
+        /** Subject ID. */
+        private UUID id;
+
+        /** Subject type. */
+        private GridSecuritySubjectType subjType;
+
+        /** Address. */
+        private InetSocketAddress addr;
+
+        /** Permissions assigned to a subject. */
+        private GridSecurityPermissionSet permissions;
+
+        /** Login. */
+        @GridToStringInclude
+        private Object login;
+
+        /**
+         * @param subjType Subject type.
+         * @param id Subject ID.
+         */
+        public GridSecuritySubjectAdapter(GridSecuritySubjectType subjType, UUID id) {
+            this.subjType = subjType;
+            this.id = id;
+        }
+
+        /**
+         * @return Subject ID.
+         */
+        @Override public UUID id() {
+            return id;
+        }
+
+        /**
+         * @return Subject type.
+         */
+        @Override public GridSecuritySubjectType type() {
+            return subjType;
+        }
+
+        /**
+         * @return Subject address.
+         */
+        @Override public InetSocketAddress address() {
+            return addr;
+        }
+
+        /**
+         * @param addr Subject address.
+         */
+        public void address(InetSocketAddress addr) {
+            this.addr = addr;
+        }
+
+        /**
+         * @return Security permissions.
+         */
+        @Override public GridSecurityPermissionSet permissions() {
+            return permissions;
+        }
+
+        /** {@inheritDoc} */
+        @Override public Object login() {
+            return login;
+        }
+
+        /**
+         * @param login Login.
+         */
+        public void login(Object login) {
+            this.login = login;
+        }
+
+        /**
+         * @param permissions Permissions.
+         */
+        public void permissions(GridSecurityPermissionSet permissions) {
+            this.permissions = permissions;
+        }
+
+        /** {@inheritDoc} */
+        public String toString() {
+            return S.toString(GridSecuritySubjectAdapter.class, this);
+        }
+    }
 }

modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties

@@ -279,7 +279,6 @@ org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager$1
 org.apache.ignite.internal.managers.security.GridAllowAllPermissionSet
 org.apache.ignite.internal.processors.security.GridSecurityContext
 org.gridgain.grid.kernal.processors.security.GridSecurityImpl
-org.apache.ignite.internal.processors.security.GridSecuritySubjectAdapter
 org.apache.ignite.internal.processors.affinity.GridAffinityAssignment
 org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache$AffinityReadyFuture
 org.apache.ignite.internal.processors.affinity.GridAffinityMessage

modules/core/src/test/java/org/apache/ignite/spi/discovery/AbstractDiscoverySelfTest.java

@@ -391,10 +391,7 @@ protected long getMaxMetricsWaitTime() {
 
                 spi.setAuthenticator(new DiscoverySpiNodeAuthenticator() {
                     @Override public GridSecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
-                        GridSecuritySubjectAdapter subj = new GridSecuritySubjectAdapter(
-                            GridSecuritySubjectType.REMOTE_NODE, n.id());
-
-                        subj.permissions(getAllPermissionSet());
+                        GridSecuritySubject subj = getGridSecuritySubject(GridSecuritySubjectType.REMOTE_NODE, n.id());
 
                         return new GridSecurityContext(subj);
                     }

modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpiStartStopSelfTest.java

@@ -66,10 +66,7 @@ public DiscoverySpiDataExchange getDataExchange() {
     public DiscoverySpiNodeAuthenticator getAuthenticator() {
         return new DiscoverySpiNodeAuthenticator() {
             @Override public GridSecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
-                GridSecuritySubjectAdapter subj = new GridSecuritySubjectAdapter(
-                    GridSecuritySubjectType.REMOTE_NODE, n.id());
-
-                subj.permissions(getAllPermissionSet());
+                GridSecuritySubject subj = getGridSecuritySubject(GridSecuritySubjectType.REMOTE_NODE, n.id());
 
                 return new GridSecurityContext(subj);
             }

modules/core/src/test/java/org/apache/ignite/testframework/junits/spi/GridSpiAbstractTest.java

@@ -38,6 +38,7 @@
 
 import java.io.*;
 import java.lang.reflect.*;
+import java.net.*;
 import java.util.*;
 import java.util.concurrent.*;
 
@@ -98,7 +99,7 @@ protected TestData<T> getTestData() {
     /**
      * @return Allow all permission security set.
      */
-    protected GridSecurityPermissionSet getAllPermissionSet() {
+    private GridSecurityPermissionSet getAllPermissionSet() {
         return new GridSecurityPermissionSet() {
             /** Serial version uid. */
             private static final long serialVersionUID = 0L;
@@ -125,6 +126,38 @@ protected GridSecurityPermissionSet getAllPermissionSet() {
         };
     }
 
+    /**
+     * @return Grid allow all security subject.
+     */
+    protected GridSecuritySubject getGridSecuritySubject(final GridSecuritySubjectType type, final UUID id) {
+        return new GridSecuritySubject() {
+            /** {@inheritDoc} */
+            @Override public UUID id() {
+                return id;
+            }
+
+            /** {@inheritDoc} */
+            @Override public GridSecuritySubjectType type() {
+                return type;
+            }
+
+            /** {@inheritDoc} */
+            @Override public Object login() {
+                return null;
+            }
+
+            /** {@inheritDoc} */
+            @Override public InetSocketAddress address() {
+                return null;
+            }
+
+            /** {@inheritDoc} */
+            @Override public GridSecurityPermissionSet permissions() {
+                return getAllPermissionSet();
+            }
+        };
+    }
+
     /**
      * @throws Exception If failed.
      */
@@ -349,10 +382,7 @@ private void configureDiscovery(GridSpiTest spiTest) throws Exception {
 
         discoSpi.setAuthenticator(new DiscoverySpiNodeAuthenticator() {
             @Override public GridSecurityContext authenticateNode(ClusterNode n, GridSecurityCredentials cred) {
-                GridSecuritySubjectAdapter subj = new GridSecuritySubjectAdapter(
-                    GridSecuritySubjectType.REMOTE_NODE, n.id());
-
-                subj.permissions(getAllPermissionSet());
+                GridSecuritySubject subj = getGridSecuritySubject(GridSecuritySubjectType.REMOTE_NODE, n.id());
 
                 return new GridSecurityContext(subj);
             }