Skip to content

Java type alias fix #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
delta2323 wants to merge 2 commits into from
Closed

Java type alias fix #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cab082
Added genAliasClass
Jun 20, 2012
ae51f74
Disabled resoluation of type alias
Jun 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 36 additions & 19 deletions msgpack-idl/Language/MessagePack/IDL/CodeGen/Java.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ generate config spec = do
let typeAlias = map genAlias $ filter isMPType spec

genTuple config
mapM_ (genClient typeAlias config) spec
mapM_ (genStruct typeAlias $ configPackage config) spec
mapM_ (genAliasClass config) $ typeAlias
mapM_ (genClient config) spec
mapM_ (genStruct config) spec
mapM_ (genException $ configPackage config) spec

{--
Expand All @@ -40,6 +41,24 @@ package #{configPackage}
|]
--}

genAliasClass :: Config -> (T.Text, Type) -> IO()
genAliasClass Config{..} alias = do
let typeName = formatClassNameT $ fst alias
actualType = snd alias
dirName = joinPath $ map LT.unpack $ LT.split (== '.') $ LT.pack configPackage
fileName = dirName ++ "/" ++ (T.unpack typeName) ++ ".java"
LT.writeFile fileName $ templ configFilePath [lt|
package #{configPackage};

import org.msgpack.MessagePack;
import org.msgpack.annotation.Message;

@Message
public class #{typeName} {
#{genType actualType} impl;
};
|]

genTuple :: Config -> IO()
genTuple Config {..} = do
LT.writeFile("Tuple.java") $ templ (configFilePath) [lt|
Expand All @@ -56,30 +75,29 @@ genImport packageName MPMessage {..} =
|]
genImport _ _ = ""

genStruct :: [(T.Text, Type)] -> FilePath -> Decl -> IO()
genStruct alias packageName MPMessage {..} = do
genStruct :: Config -> Decl -> IO()
genStruct Config {..} MPMessage {..} = do
let params = if null msgParam then "" else [lt|<#{T.intercalate ", " msgParam}>|]
resolvedMsgFields = map (resolveFieldAlias alias) msgFields
hashMapImport | not $ null [() | TMap _ _ <- map fldType resolvedMsgFields] = [lt|import java.util.HashMap;|]
hashMapImport | not $ null [() | TMap _ _ <- map fldType msgFields] = [lt|import java.util.HashMap;|]
| otherwise = ""
arrayListImport | not $ null [() | TList _ <- map fldType resolvedMsgFields] = [lt|import java.util.ArrayList;|]
arrayListImport | not $ null [() | TList _ <- map fldType msgFields] = [lt|import java.util.ArrayList;|]
| otherwise = ""

LT.writeFile ( (formatClassName $ T.unpack msgName) ++ ".java") [lt|
package #{packageName};
package #{configPackage};

#{hashMapImport}
#{arrayListImport}

public class #{formatClassNameT msgName} #{params} {

#{LT.concat $ map genDecl resolvedMsgFields}
#{LT.concat $ map genDecl msgFields}
public #{formatClassNameT msgName}() {
#{LT.concat $ map genInit resolvedMsgFields}
#{LT.concat $ map genInit msgFields}
}
};
|]
genStruct _ _ _ = return ()
genStruct _ _ = return ()

resolveMethodAlias :: [(T.Text, Type)] -> Method -> Method
resolveMethodAlias alias Function {..} = Function methodInherit methodName (resolveTypeAlias alias methodRetType) (map (resolveFieldAlias alias) methodArgs)
Expand Down Expand Up @@ -135,12 +153,11 @@ public class #{formatClassNameT excName} #{params}{
Nothing -> ""
genException _ _ = return ()

genClient :: [(T.Text, Type)] -> Config -> Decl -> IO()
genClient alias Config {..} MPService {..} = do
let resolvedServiceMethods = map (resolveMethodAlias alias) serviceMethods
hashMapImport | not $ null [() | TMap _ _ <- map methodRetType resolvedServiceMethods ] = [lt|import java.util.HashMap;|]
genClient :: Config -> Decl -> IO()
genClient Config {..} MPService {..} = do
let hashMapImport | not $ null [() | TMap _ _ <- map methodRetType serviceMethods ] = [lt|import java.util.HashMap;|]
| otherwise = ""
arrayListImport | not $ null [() | TList _ <- map methodRetType resolvedServiceMethods] = [lt|import java.util.ArrayList;|]
arrayListImport | not $ null [() | TList _ <- map methodRetType serviceMethods] = [lt|import java.util.ArrayList;|]
| otherwise = ""

LT.writeFile (T.unpack className ++ ".java") $ templ configFilePath [lt|
Expand All @@ -159,10 +176,10 @@ public class #{className} {
}

public static interface RPCInterface {
#{LT.concat $ map genSignature resolvedServiceMethods}
#{LT.concat $ map genSignature serviceMethods}
}

#{LT.concat $ map genMethodCall resolvedServiceMethods}
#{LT.concat $ map genMethodCall serviceMethods}
private Client c_;
private RPCInterface iface_;
};
Expand All @@ -185,7 +202,7 @@ public class #{className} {
|]
genMethodCall _ = ""

genClient _ _ _ = return ()
genClient _ _ = return ()

genSignature :: Method -> LT.Text
genSignature Function {..} =
Expand Down