Merge pull request #4 from rigatti/updateModel

Update model V2

Author: frogermcs

README.md

@@ -154,7 +154,7 @@ public class TextRequestHandler extends RequestHandler {
 
     @Override
     public RootResponse getResponse() {
-        return ResponseBuilder.tellResponse("You've just said: " + getRootRequest().inputs.get(0).raw_inputs.get(0).query);
+        return ResponseBuilder.tellResponse("You've just said: " + getRootRequest().inputs.get(0).rawInputs.get(0).query);
     }
 }
 ```

gactions-sample/build.gradle

@@ -6,8 +6,8 @@ apply plugin: 'war'
 apply plugin: 'com.google.cloud.tools.appengine'
 
 compileJava {
-    targetCompatibility = JavaVersion.VERSION_1_7
-    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
 repositories {
@@ -23,7 +23,7 @@ repositories {
 dependencies {
     providedCompile 'javax.servlet:servlet-api:2.5'
 //    compile project(':gactions')
-    compile 'com.frogermcs.gactions:gactions:0.1.1'
+    compile 'com.frogermcs.gactions:gactions:0.2.0'
     compile 'com.google.appengine:appengine:+'
     testCompile group: 'junit', name: 'junit', version: '4.11'
 }

gactions-sample/src/main/java/com/frogermcs/gactions/sample/TextRequestHandler.java

@@ -16,6 +16,6 @@ public class TextRequestHandler extends RequestHandler {
 
     @Override
     public RootResponse getResponse() {
-        return ResponseBuilder.tellResponse("You've just said: " + getRootRequest().inputs.get(0).raw_inputs.get(0).query);
+        return ResponseBuilder.tellResponse("You've just said: " + getRootRequest().inputs.get(0).rawInputs.get(0).query);
     }
 }

gactions/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'java'
 
 compileJava {
-    targetCompatibility = JavaVersion.VERSION_1_7
-    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
 repositories {
@@ -16,12 +16,14 @@ repositories {
 dependencies {
     compile 'com.google.code.findbugs:jsr305:3.0.1'
     compile 'com.google.code.gson:gson:2.8.0'
+    compile 'org.projectlombok:lombok:1.16.2'
 
-    testCompile 'junit:junit:4.11'
-    testCompile 'org.mockito:mockito-core:1.+'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.mockito:mockito-core:2.+'
     testCompile 'org.hamcrest:hamcrest-core:1.3'
     testCompile 'org.hamcrest:hamcrest-library:1.3'
     testCompile 'org.hamcrest:hamcrest-integration:1.3'
+
 }
 
 apply from: rootProject.file('gradle/gradle-bintray-push.gradle')

gactions/src/main/java/com/frogermcs/gactions/ResponseBuilder.java

@@ -12,66 +12,99 @@
  */
 public class ResponseBuilder {
 
-    /**
-     * @param message - speech response for Google Actions request
-     * @return {@link RootResponse} object that contains speech response for Google Actions request
-     */
     public static RootResponse tellResponse(String message) {
+        return ResponseBuilder.tellResponse(SpeechResponse.builder().textToSpeech(message).displayText(message).build());
+    }
+
+    public static RootResponse tellResponse(SpeechResponse message) {
         RootResponse rootResponse = new RootResponse();
-        rootResponse.expect_user_response = false;
-        rootResponse.final_response = new FinalResponse();
-        rootResponse.final_response.speech_response = new SpeechResponse(message, null);
+        rootResponse.expectUserResponse = false;
+        rootResponse.finalResponse = new FinalResponse();
+        rootResponse.finalResponse.speechResponse = message;
         return rootResponse;
     }
 
-    /**
-     * @param message - speech response for Google Actions request
-     * @return {@link RootResponse} object that uses speech response to ask user for additional data
-     */
     public static RootResponse askResponse(String message) {
+        return ResponseBuilder.askResponse(SpeechResponse.builder().textToSpeech(message).displayText(message).build());
+    }
+
+    public static RootResponse askResponse(SpeechResponse message) {
         return askResponse(message, null, null);
     }
 
-    /**
-     * @param message        - speech response for Google Actions request
-     * @param noInputPrompts
-     * @return {@link RootResponse} object that uses speech response to ask user for additional data
-     */
     public static RootResponse askResponse(String message, String[] noInputPrompts) {
         return askResponse(message, null, noInputPrompts);
     }
 
+    public static RootResponse askResponseWithRichInput(SpeechResponse message) {
+        return askResponseWithRichInput(message, null, null, null);
+    }
+
+    public static RootResponse askResponseWithRichInput(SpeechResponse message, String conversationToken, List<SpeechResponse> noInputPrompts, List<SuggestionResponse> suggestions ) {
+        RootResponse rootResponse = new RootResponse();
+        rootResponse.expectUserResponse = true;
+        rootResponse.conversationToken = conversationToken;
+        rootResponse.expectedInputs = new ArrayList<>();
+
+        ExpectedInputs expectedInput = new ExpectedInputs();
+        expectedInput.inputPrompt = new InputPrompt();
+
+        RichInitialPromptItems richInitialPromptItems = RichInitialPromptItems.builder().simpleResponse(message).build();
+
+        RichInitialPrompt richInitialPrompt = RichInitialPrompt.builder().items(Collections.singletonList(richInitialPromptItems)).suggestions(suggestions).build();
+
+        expectedInput.inputPrompt.richInitialPrompt = richInitialPrompt;
+
+        if (noInputPrompts != null && noInputPrompts.size() > 0) {
+            expectedInput.inputPrompt.noInputPrompts = noInputPrompts;
+        }
+
+        expectedInput.possibleIntents = new ArrayList<>();
+        expectedInput.possibleIntents.add(new ExpectedIntent(StandardIntents.TEXT));
+
+        rootResponse.expectedInputs.add(expectedInput);
+        return rootResponse;
+    }
+
     /**
      * @param message           - speech response for Google Actions request
      * @param conversationToken
      * @param noInputPrompts
      * @return {@link RootResponse} object that uses speech response to ask user for additional data
      */
-    public static RootResponse askResponse(String message, String conversationToken, String[] noInputPrompts) {
+    public static RootResponse askResponse(SpeechResponse message, String conversationToken, List<SpeechResponse> noInputPrompts ) {
         RootResponse rootResponse = new RootResponse();
-        rootResponse.expect_user_response = true;
-        rootResponse.conversation_token = conversationToken;
-        rootResponse.expected_inputs = new ArrayList<>();
+        rootResponse.expectUserResponse = true;
+        rootResponse.conversationToken = conversationToken;
+        rootResponse.expectedInputs = new ArrayList<>();
 
         ExpectedInputs expectedInput = new ExpectedInputs();
-        expectedInput.input_prompt = new InputPrompt();
-        expectedInput.input_prompt.initial_prompts = Collections.singletonList(new SpeechResponse(message, null));
-
-        if (noInputPrompts != null && noInputPrompts.length > 0) {
-            expectedInput.input_prompt.no_input_prompts = new ArrayList<>();
-            for (String noInputPrompt : noInputPrompts) {
-                expectedInput.input_prompt.no_input_prompts.add(new SpeechResponse(noInputPrompt, null));
-            }
+        expectedInput.inputPrompt = new InputPrompt();
+        expectedInput.inputPrompt.initialPrompts = Collections.singletonList(message);
 
+        if (noInputPrompts != null && noInputPrompts.size() > 0) {
+            expectedInput.inputPrompt.noInputPrompts = noInputPrompts;
         }
 
-        expectedInput.possible_intents = new ArrayList<>();
-        expectedInput.possible_intents.add(new ExpectedIntent(StandardIntents.TEXT));
+        expectedInput.possibleIntents = new ArrayList<>();
+        expectedInput.possibleIntents.add(new ExpectedIntent(StandardIntents.TEXT));
 
-        rootResponse.expected_inputs.add(expectedInput);
+        rootResponse.expectedInputs.add(expectedInput);
         return rootResponse;
     }
 
+    public static RootResponse askResponse(String message, String conversationToken, String[] noInputPrompts) {
+        List<SpeechResponse> noInputPromptsConverted = null;
+        if (noInputPrompts != null && noInputPrompts.length > 0) {
+            List<SpeechResponse> result = new ArrayList<>();
+            for(String noInputPrompt : noInputPrompts) {
+                noInputPromptsConverted.add(SpeechResponse.builder().textToSpeech(noInputPrompt).displayText(noInputPrompt).build());
+            }
+        }
+
+        return ResponseBuilder.askResponse(SpeechResponse.builder().textToSpeech(message).displayText(message).build(), conversationToken, noInputPromptsConverted);
+    }
+
     /**
      * @param permissionContext -  Context why the permission is being asked; it's the TTS
      *                          prompt prefix (action phrase) we ask the user.
@@ -130,24 +163,24 @@ public static RootResponse askForPermissionResponse(String permissionContext, Co
         }
 
         RootResponse rootResponse = new RootResponse();
-        rootResponse.expect_user_response = true;
+        rootResponse.expectUserResponse = true;
 
         PermissionValueSpec permissionValueSpec = new PermissionValueSpec();
-        permissionValueSpec.opt_context = permissionContext;
+        permissionValueSpec.optContext = permissionContext;
         permissionValueSpec.permissions = new ArrayList<>(permissions);
 
         InputValueSpec inputValueSpec = new InputValueSpec();
         inputValueSpec.permission_value_spec = permissionValueSpec;
 
         ExpectedIntent expectedIntent = new ExpectedIntent(StandardIntents.PERMISSION);
-        expectedIntent.input_value_spec = inputValueSpec;
+        expectedIntent.inputValueSpec = inputValueSpec;
 
         ExpectedInputs expectedInput = new ExpectedInputs();
-        expectedInput.possible_intents = new ArrayList<>();
-        expectedInput.possible_intents.add(expectedIntent);
+        expectedInput.possibleIntents = new ArrayList<>();
+        expectedInput.possibleIntents.add(expectedIntent);
 
-        rootResponse.expected_inputs = new ArrayList<>();
-        rootResponse.expected_inputs.add(expectedInput);
+        rootResponse.expectedInputs = new ArrayList<>();
+        rootResponse.expectedInputs.add(expectedInput);
 
         return rootResponse;
     }

gactions/src/main/java/com/frogermcs/gactions/api/AssistantIntents.java

@@ -0,0 +1,19 @@
+package com.frogermcs.gactions.api;
+
+/**
+ * Standard action intents handled by Google Assistant
+ */
+public class AssistantIntents {
+    /**
+     * Assistant fires MAIN intent for queries like [talk to $action].
+     */
+    public static final String MAIN = "assistant.intent.action.MAIN";
+    /**
+     * Assistant fires TEXT intent when action issues ask intent.
+     */
+    public static final String TEXT = "assistant.intent.action.TEXT";
+    /**
+     * Assistant fires PERMISSION intent when action invokes askForPermission.
+     */
+    public static final String PERMISSION = "assistant.intent.action.PERMISSION";
+}

gactions/src/main/java/com/frogermcs/gactions/api/RequestHandler.java

@@ -26,7 +26,7 @@ public RootRequest getRootRequest() {
      * @return UserId from Google Actions API request
      */
     public String getUserId() {
-        return rootRequest.user.user_id;
+        return rootRequest.user.userId;
     }
 
     /**

gactions/src/main/java/com/frogermcs/gactions/api/StandardIntents.java

@@ -7,13 +7,13 @@ public class StandardIntents {
     /**
      * Assistant fires MAIN intent for queries like [talk to $action].
      */
-    public static final String MAIN = "assistant.intent.action.MAIN";
+    public static final String MAIN = "actions.intent.MAIN";
     /**
      * Assistant fires TEXT intent when action issues ask intent.
      */
-    public static final String TEXT = "assistant.intent.action.TEXT";
+    public static final String TEXT = "actions.intent.TEXT";
     /**
      * Assistant fires PERMISSION intent when action invokes askForPermission.
      */
-    public static final String PERMISSION = "assistant.intent.action.PERMISSION";
+    public static final String PERMISSION = "actions.intent.PERMISSION";
 }

gactions/src/main/java/com/frogermcs/gactions/api/request/Argument.java

@@ -1,8 +1,12 @@
 package com.frogermcs.gactions.api.request;
 
-/**
- * Created by froger_mcs on 17/01/2017.
- */
+import lombok.*;
+
+@Builder
+@EqualsAndHashCode
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
 public class Argument {
     public String name;
     public String raw_text;
@@ -13,52 +17,4 @@ public class Argument {
     public String time_value;
     public Location location_value;
     public String formatted_address;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Argument argument = (Argument) o;
-
-        if (name != null ? !name.equals(argument.name) : argument.name != null) return false;
-        if (raw_text != null ? !raw_text.equals(argument.raw_text) : argument.raw_text != null) return false;
-        if (int_value != null ? !int_value.equals(argument.int_value) : argument.int_value != null) return false;
-        if (bool_value != null ? !bool_value.equals(argument.bool_value) : argument.bool_value != null) return false;
-        if (text_value != null ? !text_value.equals(argument.text_value) : argument.text_value != null) return false;
-        if (date_value != null ? !date_value.equals(argument.date_value) : argument.date_value != null) return false;
-        if (time_value != null ? !time_value.equals(argument.time_value) : argument.time_value != null) return false;
-        if (location_value != null ? !location_value.equals(argument.location_value) : argument.location_value != null)
-            return false;
-        return formatted_address != null ? formatted_address.equals(argument.formatted_address) : argument.formatted_address == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = name != null ? name.hashCode() : 0;
-        result = 31 * result + (raw_text != null ? raw_text.hashCode() : 0);
-        result = 31 * result + (int_value != null ? int_value.hashCode() : 0);
-        result = 31 * result + (bool_value != null ? bool_value.hashCode() : 0);
-        result = 31 * result + (text_value != null ? text_value.hashCode() : 0);
-        result = 31 * result + (date_value != null ? date_value.hashCode() : 0);
-        result = 31 * result + (time_value != null ? time_value.hashCode() : 0);
-        result = 31 * result + (location_value != null ? location_value.hashCode() : 0);
-        result = 31 * result + (formatted_address != null ? formatted_address.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "Argument{" +
-                "name='" + name + '\'' +
-                ", raw_text='" + raw_text + '\'' +
-                ", int_value='" + int_value + '\'' +
-                ", bool_value='" + bool_value + '\'' +
-                ", text_value='" + text_value + '\'' +
-                ", date_value='" + date_value + '\'' +
-                ", time_value='" + time_value + '\'' +
-                ", location_value=" + location_value +
-                ", formatted_address='" + formatted_address + '\'' +
-                '}';
-    }
 }

gactions/src/main/java/com/frogermcs/gactions/api/request/Conversation.java

@@ -1,40 +1,17 @@
 package com.frogermcs.gactions.api.request;
 
+import lombok.*;
+
 /**
  * Created by froger_mcs on 17/01/2017.
  */
+@Builder
+@EqualsAndHashCode
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
 public class Conversation {
-    public String conversation_id;
+    public String conversationId;
     public ConversationType type;
-    public String conversation_token;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        Conversation that = (Conversation) o;
-
-        if (conversation_id != null ? !conversation_id.equals(that.conversation_id) : that.conversation_id != null)
-            return false;
-        if (type != that.type) return false;
-        return conversation_token != null ? conversation_token.equals(that.conversation_token) : that.conversation_token == null;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = conversation_id != null ? conversation_id.hashCode() : 0;
-        result = 31 * result + (type != null ? type.hashCode() : 0);
-        result = 31 * result + (conversation_token != null ? conversation_token.hashCode() : 0);
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "Conversation{" +
-                "conversation_id='" + conversation_id + '\'' +
-                ", type=" + type +
-                ", conversation_token='" + conversation_token + '\'' +
-                '}';
-    }
+    public String conversationToken;
 }