Partial revert of 9fb51ae

* The AuthenticationType CLEARTEXT was not a fully different option but a simple name change for USERPASSWORD and was never included in a final release. * Reverts both AuthenticationType and Handshake to reflect 8.7 teiid client
Teiid-Designer · Aug 6, 2014 · 0513845 · 0513845
1 parent 33bde2d
commit 0513845
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 62 deletions.
diff --git a/plugins/teiid/org.teiid.runtime.client/client/org/teiid/net/socket/AuthenticationType.java b/plugins/teiid/org.teiid.runtime.client/client/org/teiid/net/socket/AuthenticationType.java
@@ -22,52 +22,7 @@
 
 package org.teiid.net.socket;
 
-import org.teiid.designer.annotation.Removed;
-import org.teiid.designer.annotation.Since;
-import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
-import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
 
 public enum AuthenticationType {
-    @Since(Version.TEIID_8_7)
-    USERPASSWORD,
-
-    GSS,
-
-    @Removed(Version.TEIID_8_7)
-    CLEARTEXT;
-
-    private static boolean lessThan87(ITeiidServerVersion teiidVersion) {
-        return teiidVersion.isLessThan(Version.TEIID_8_7.get());
-    }
-
-    /**
-     * @param teiidVersion
-     * @param readByte
-     *
-     * @return enum value
-     */
-    public static AuthenticationType value(ITeiidServerVersion teiidVersion, byte readByte) {
-        switch (readByte) {
-            case 0:
-                if (lessThan87(teiidVersion))
-                    return CLEARTEXT;
-                else
-                    return USERPASSWORD;
-            case 1:
-                return GSS;
-            default:
-                throw new IllegalStateException();
-        }
-    }
-
-    /**
-     * @param teiidVersion
-     * @return Same as ordinal but handle deprecated inclusion of CLEARTEXT
-     */
-    public int index(ITeiidServerVersion teiidVersion) {
-        if (lessThan87(teiidVersion) && this == CLEARTEXT)
-            return 0;
-
-        return this.ordinal();
-    }
+    USERPASSWORD, GSS;
 }
diff --git a/plugins/teiid/org.teiid.runtime.client/client/org/teiid/net/socket/Handshake.java b/plugins/teiid/org.teiid.runtime.client/client/org/teiid/net/socket/Handshake.java
@@ -32,7 +32,6 @@
 import org.teiid.core.util.StringUtil;
 import org.teiid.designer.runtime.version.spi.ITeiidServerVersion;
 import org.teiid.designer.runtime.version.spi.TeiidServerVersion;
-import org.teiid.designer.runtime.version.spi.TeiidServerVersion.Version;
 
 
 /**
@@ -59,18 +58,6 @@ private ITeiidServerVersion getTeiidVersion() {
         return version;
     }
 
-    private AuthenticationType getAuthenticationType() {
-        if (authType == null) {
-            ITeiidServerVersion version = getTeiidVersion();
-            if (version.isGreaterThanOrEqualTo(Version.TEIID_8_7.get()))
-                authType = AuthenticationType.USERPASSWORD;
-
-            authType = AuthenticationType.CLEARTEXT;
-        }
-
-        return authType;
-    }
-
     /** 
      * @return Returns the version.
      */
@@ -116,16 +103,20 @@ public void setPublicKey(byte[] key) {
     }
 
     public AuthenticationType getAuthType() {
-		return getAuthenticationType();
+		return authType;
 	}
 
+    public void setAuthType(AuthenticationType authType) {
+        this.authType = authType;
+    }
+
     @Override
     public void readExternal(ObjectInput in) throws IOException,
     		ClassNotFoundException {
     	version = (String)in.readObject();
     	publicKey = (byte[])in.readObject();
     	try {
-    		authType = AuthenticationType.value(getTeiidVersion(), in.readByte());
+    		authType = AuthenticationType.values()[in.readByte()];
     	} catch (EOFException e) {
 
     	}
@@ -135,7 +126,7 @@ public void readExternal(ObjectInput in) throws IOException,
     public void writeExternal(ObjectOutput out) throws IOException {
     	out.writeObject(version);
     	out.writeObject(publicKey);
-    	out.writeByte(authType.index(getTeiidVersion()));
+    	out.writeByte(authType.ordinal());
     }
 
 }