More extensive Go code generation for constants.
Add annotations to Constants to specify that a Go struct should be created, and what data type the fields should use (if not string). Rough pass at assigning these annotations correctly. It almost certainly will need further tweaking after trying to use the results in the Go code extensively.
This commit is contained in:
Andy Janata
parent
6a6172742b
commit
72fd7f827a
|
|
@ -210,11 +210,16 @@ public class Constants {
|
|||
/**
|
||||
* Parameters for client requests.
|
||||
*/
|
||||
@GoStruct
|
||||
public enum AjaxRequest {
|
||||
@GoDataType("int")
|
||||
CARD_ID("cid"),
|
||||
CARDCAST_ID("cci"),
|
||||
@GoDataType("bool")
|
||||
EMOTE("me"),
|
||||
@GoDataType("int")
|
||||
GAME_ID("gid"),
|
||||
@GoDataType("GameOptionData")
|
||||
GAME_OPTIONS("go"),
|
||||
ID_CODE("idc"),
|
||||
MESSAGE("m"),
|
||||
|
|
@ -222,7 +227,9 @@ public class Constants {
|
|||
OP("o"),
|
||||
PASSWORD("pw"),
|
||||
PERSISTENT_ID("pid"),
|
||||
@GoDataType("int")
|
||||
SERIAL("s"),
|
||||
@GoDataType("bool")
|
||||
WALL("wall");
|
||||
|
||||
private final String field;
|
||||
|
|
@ -240,32 +247,47 @@ public class Constants {
|
|||
/**
|
||||
* Keys for client request responses.
|
||||
*/
|
||||
@GoStruct
|
||||
public enum AjaxResponse implements ReturnableData {
|
||||
@GoDataType("int")
|
||||
BLACK_CARD("bc"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("int")
|
||||
CARD_ID(AjaxRequest.CARD_ID),
|
||||
@GoDataType("[]CardSetData")
|
||||
CARD_SETS("css"),
|
||||
CLIENT_NAME("cn"),
|
||||
@GoDataType("int")
|
||||
CONNECTED_AT("ca"),
|
||||
@GoDataType("bool")
|
||||
ERROR("e"),
|
||||
ERROR_CODE("ec"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("int")
|
||||
GAME_ID(AjaxRequest.GAME_ID),
|
||||
@GoDataType("GameInfo")
|
||||
GAME_INFO("gi"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("GameOptionData")
|
||||
GAME_OPTIONS(AjaxRequest.GAME_OPTIONS),
|
||||
GAME_STATE_DESCRIPTION("gss"),
|
||||
@GoDataType("[]GameInfo")
|
||||
GAMES("gl"),
|
||||
@GoDataType("[]int")
|
||||
HAND("h"),
|
||||
@DuplicationAllowed
|
||||
ID_CODE(AjaxRequest.ID_CODE),
|
||||
@GoDataType("int")
|
||||
IDLE("idl"),
|
||||
IP_ADDRESS("IP"),
|
||||
/**
|
||||
* Whether this client is reconnecting or not.
|
||||
*/
|
||||
@GoDataType("bool")
|
||||
IN_PROGRESS("ip"),
|
||||
@GoDataType("int")
|
||||
MAX_GAMES("mg"),
|
||||
@GoDataType("[]string")
|
||||
NAMES("nl"),
|
||||
/**
|
||||
* Next thing that should be done in reconnect process. Used once, long string OK.
|
||||
|
|
@ -275,13 +297,16 @@ public class Constants {
|
|||
NICKNAME(AjaxRequest.NICKNAME),
|
||||
@DuplicationAllowed
|
||||
PERSISTENT_ID(AjaxRequest.PERSISTENT_ID),
|
||||
@GoDataType("GamePlayerInfo")
|
||||
PLAYER_INFO("pi"),
|
||||
/**
|
||||
* Sigil to display next to user's name.
|
||||
*/
|
||||
SIGIL("?"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("int")
|
||||
SERIAL(AjaxRequest.SERIAL),
|
||||
@GoDataType("[]int")
|
||||
WHITE_CARDS("wc");
|
||||
|
||||
private final String field;
|
||||
|
|
@ -300,6 +325,7 @@ public class Constants {
|
|||
}
|
||||
}
|
||||
|
||||
// hmm this just gets dumped into the regular data it looks like
|
||||
public enum ErrorInformation implements ReturnableData {
|
||||
BLACK_CARDS_PRESENT("bcp"),
|
||||
BLACK_CARDS_REQUIRED("bcr"),
|
||||
|
|
@ -466,13 +492,17 @@ public class Constants {
|
|||
/**
|
||||
* Data keys that can be in a long poll response.
|
||||
*/
|
||||
@GoStruct
|
||||
public enum LongPollResponse implements ReturnableData {
|
||||
@DuplicationAllowed
|
||||
@GoDataType("BlackCardData")
|
||||
BLACK_CARD(AjaxResponse.BLACK_CARD),
|
||||
CARDCAST_DECK_INFO("cdi"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("bool")
|
||||
EMOTE(AjaxRequest.EMOTE),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("bool")
|
||||
ERROR(AjaxResponse.ERROR),
|
||||
@DuplicationAllowed
|
||||
ERROR_CODE(AjaxResponse.ERROR_CODE),
|
||||
|
|
@ -486,26 +516,33 @@ public class Constants {
|
|||
* @deprecated Compare the SIGIL field to Sigil.ADMIN.
|
||||
*/
|
||||
@Deprecated
|
||||
@GoDataType("bool")
|
||||
FROM_ADMIN("fa"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("int")
|
||||
GAME_ID(AjaxResponse.GAME_ID),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("GameInfo")
|
||||
GAME_INFO(AjaxResponse.GAME_INFO),
|
||||
GAME_STATE("gs"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("[]WhiteCardData")
|
||||
HAND(AjaxResponse.HAND),
|
||||
@DuplicationAllowed
|
||||
ID_CODE(AjaxRequest.ID_CODE),
|
||||
/**
|
||||
* The delay until the next game round begins.
|
||||
*/
|
||||
@GoDataType("int")
|
||||
INTERMISSION("i"),
|
||||
@DuplicationAllowed
|
||||
MESSAGE(AjaxRequest.MESSAGE),
|
||||
@DuplicationAllowed
|
||||
NICKNAME(AjaxRequest.NICKNAME),
|
||||
@GoDataType("int")
|
||||
PLAY_TIMER("Pt"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("[]GamePlayerInfo")
|
||||
PLAYER_INFO(AjaxResponse.PLAYER_INFO),
|
||||
/**
|
||||
* Reason why a player disconnected.
|
||||
|
|
@ -517,11 +554,15 @@ public class Constants {
|
|||
*/
|
||||
@DuplicationAllowed
|
||||
SIGIL(AjaxResponse.SIGIL),
|
||||
@GoDataType("int")
|
||||
TIMESTAMP("ts"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("bool")
|
||||
WALL(AjaxRequest.WALL),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("[]WhiteCardData")
|
||||
WHITE_CARDS(AjaxResponse.WHITE_CARDS),
|
||||
@GoDataType("WhiteCardData")
|
||||
WINNING_CARD("WC");
|
||||
|
||||
private final String field;
|
||||
|
|
@ -561,11 +602,14 @@ public class Constants {
|
|||
/**
|
||||
* Data fields for white cards.
|
||||
*/
|
||||
@GoStruct
|
||||
public enum WhiteCardData {
|
||||
@DuplicationAllowed
|
||||
@GoDataType("int")
|
||||
ID(AjaxRequest.CARD_ID),
|
||||
TEXT("T"),
|
||||
WATERMARK("W"),
|
||||
@GoDataType("bool")
|
||||
WRITE_IN("wi");
|
||||
|
||||
private final String key;
|
||||
|
|
@ -587,10 +631,14 @@ public class Constants {
|
|||
/**
|
||||
* Data fields for black cards.
|
||||
*/
|
||||
@GoStruct
|
||||
public enum BlackCardData {
|
||||
@GoDataType("int")
|
||||
DRAW("D"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("int")
|
||||
ID(WhiteCardData.ID),
|
||||
@GoDataType("int")
|
||||
PICK("PK"),
|
||||
@DuplicationAllowed
|
||||
TEXT(WhiteCardData.TEXT),
|
||||
|
|
@ -616,14 +664,20 @@ public class Constants {
|
|||
/**
|
||||
* Data fields for card sets.
|
||||
*/
|
||||
@GoStruct
|
||||
public enum CardSetData {
|
||||
@GoDataType("bool")
|
||||
BASE_DECK("bd"),
|
||||
@GoDataType("int")
|
||||
BLACK_CARDS_IN_DECK("bcid"),
|
||||
CARD_SET_DESCRIPTION("csd"),
|
||||
CARD_SET_NAME("csn"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("int")
|
||||
ID(WhiteCardData.ID),
|
||||
@GoDataType("int")
|
||||
WEIGHT("w"),
|
||||
@GoDataType("int")
|
||||
WHITE_CARDS_IN_DECK("wcid");
|
||||
|
||||
private final String key;
|
||||
|
|
@ -674,14 +728,20 @@ public class Constants {
|
|||
/**
|
||||
* Fields for information about a game.
|
||||
*/
|
||||
@GoStruct
|
||||
public enum GameInfo {
|
||||
HOST("H"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("int")
|
||||
ID(AjaxRequest.GAME_ID),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("GameOptionData")
|
||||
GAME_OPTIONS(AjaxRequest.GAME_OPTIONS),
|
||||
@GoDataType("bool")
|
||||
HAS_PASSWORD("hp"),
|
||||
@GoDataType("[]string")
|
||||
PLAYERS("P"),
|
||||
@GoDataType("[]string")
|
||||
SPECTATORS("V"),
|
||||
STATE("S");
|
||||
|
||||
|
|
@ -704,14 +764,20 @@ public class Constants {
|
|||
/**
|
||||
* Fields for options about a game.
|
||||
*/
|
||||
@GoStruct
|
||||
public enum GameOptionData {
|
||||
@GoDataType("int")
|
||||
BLANKS_LIMIT("bl"),
|
||||
@DuplicationAllowed
|
||||
@GoDataType("[]int")
|
||||
CARD_SETS(AjaxResponse.CARD_SETS),
|
||||
@DuplicationAllowed
|
||||
PASSWORD(AjaxRequest.PASSWORD),
|
||||
@GoDataType("int")
|
||||
PLAYER_LIMIT("pL"),
|
||||
@GoDataType("int")
|
||||
SPECTATOR_LIMIT("vL"),
|
||||
@GoDataType("int")
|
||||
SCORE_LIMIT("sl"),
|
||||
TIMER_MULTIPLIER("tm");
|
||||
|
||||
|
|
@ -734,8 +800,10 @@ public class Constants {
|
|||
/**
|
||||
* Keys for the information about players in a game.
|
||||
*/
|
||||
@GoStruct
|
||||
public enum GamePlayerInfo {
|
||||
NAME("N"),
|
||||
@GoDataType("int")
|
||||
SCORE("sc"),
|
||||
STATUS("st");
|
||||
|
||||
|
|
@ -806,4 +874,21 @@ public class Constants {
|
|||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface DuplicationAllowed {
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark an enum to generate a struct for it in the Go output. This would be used for things that
|
||||
* describe objects, not a list of valid values for a field.
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface GoStruct {
|
||||
}
|
||||
|
||||
/**
|
||||
* Mark an enum value as having a specific Go data type. The default (if this annotation is not
|
||||
* specified) is string.
|
||||
*/
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface GoDataType {
|
||||
String value() default "string";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,9 +27,12 @@ import java.io.File;
|
|||
import java.io.PrintWriter;
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.HashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
import net.socialgamer.cah.Constants.DoubleLocalizable;
|
||||
import net.socialgamer.cah.Constants.GoDataType;
|
||||
import net.socialgamer.cah.Constants.GoStruct;
|
||||
import net.socialgamer.cah.Constants.Localizable;
|
||||
|
||||
|
||||
|
|
@ -44,6 +47,10 @@ public class UpdateGoConstants {
|
|||
private static final String enumValueFmt = "\t%s_%s = \"%s\"\r\n";
|
||||
private static final String enumTailFmt = ")\r\n";
|
||||
|
||||
private static final String structHeaderFmt = "type %s struct {\r\n";
|
||||
private static final String structValueFmt = "\t%s %s `%s`\r\n";
|
||||
private static final String structTailFmt = "}\r\n";
|
||||
|
||||
private static final String msgHeaderFmt = "var %sMsgs = map[string]string{\r\n";
|
||||
private static final String msgValueFmt = "\t \"%s\": \"%s\",\r\n";
|
||||
private static final String msgTailFmt = "}\r\n";
|
||||
|
|
@ -82,6 +89,7 @@ public class UpdateGoConstants {
|
|||
// We need to know the name of the enum itself, not that it's Constants$Foo.
|
||||
final String cName = c.getName().split("\\$")[1];
|
||||
System.out.println(cName);
|
||||
|
||||
writer.format(enumHeaderFmt, cName);
|
||||
final Map<String, String> values = getEnumValues(c);
|
||||
for (final String key : values.keySet()) {
|
||||
|
|
@ -90,6 +98,19 @@ public class UpdateGoConstants {
|
|||
}
|
||||
writer.println(enumTailFmt);
|
||||
|
||||
if (c.isAnnotationPresent(GoStruct.class)) {
|
||||
writer.format(structHeaderFmt, cName);
|
||||
for (final String key : values.keySet()) {
|
||||
final String value = values.get(key);
|
||||
String type = "string";
|
||||
if (c.getField(key).isAnnotationPresent(GoDataType.class)) {
|
||||
type = c.getField(key).getAnnotation(GoDataType.class).value();
|
||||
}
|
||||
writer.format(structValueFmt, formatGoName(key), type, value);
|
||||
}
|
||||
writer.println(structTailFmt);
|
||||
}
|
||||
|
||||
if (Localizable.class.isAssignableFrom(c) || DoubleLocalizable.class.isAssignableFrom(c)) {
|
||||
System.out.println(cName + "_msg");
|
||||
writer.format(msgHeaderFmt, cName);
|
||||
|
|
@ -117,6 +138,15 @@ public class UpdateGoConstants {
|
|||
writer.close();
|
||||
}
|
||||
|
||||
private static String formatGoName(final String constName) {
|
||||
final StringBuilder out = new StringBuilder(constName.length());
|
||||
for (final String part : constName.split("_")) {
|
||||
out.append(part.substring(0, 1).toUpperCase(Locale.ENGLISH));
|
||||
out.append(part.substring(1).toLowerCase(Locale.ENGLISH));
|
||||
}
|
||||
return out.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a map of enum values in an Enum class, with the enum field names as keys and the values
|
||||
* of toString() as the values.
|
||||
|
|
|
|||
Loading…
Reference in New Issue