diff options
10 files changed, 57 insertions, 71 deletions
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml index 2f0d42d..74b73f1 100644 --- a/src/META-INF/plugin.xml +++ b/src/META-INF/plugin.xml @@ -1,7 +1,7 @@ <idea-plugin version="2"> <id>com.google.cluestick.studioclient</id> <name>Google Developers Samples</name> - <version>0.3.0</version> + <version>0.3.1</version> <vendor url="https://developers.google.com">Google Developers</vendor> <!-- TODO(thorogood): These provide e.g. NetHttpTransport --> diff --git a/src/com/appspot/cluestick_server/search/Search.java b/src/com/appspot/cluestick_server/search/Search.java index 855648e..7a7055e 100644 --- a/src/com/appspot/cluestick_server/search/Search.java +++ b/src/com/appspot/cluestick_server/search/Search.java @@ -11,8 +11,6 @@ */ /* * This code was generated by https://github.com/google/apis-client-generator/ - * (build: 2016-01-08 17:48:37 UTC) - * on 2016-02-17 at 11:17:28 UTC * Modify at your own risk. */ @@ -48,7 +46,7 @@ public class Search extends com.google.api.client.googleapis.services.json.Abstr com.google.api.client.googleapis.GoogleUtils.MINOR_VERSION >= 15, "You are currently running with version %s of google-api-client. " + "You need at least version 1.15 of google-api-client to run version " + - "1.21.0 of the search library.", com.google.api.client.googleapis.GoogleUtils.VERSION); + "1.22.0-SNAPSHOT of the search library.", com.google.api.client.googleapis.GoogleUtils.VERSION); } /** @@ -274,62 +272,62 @@ public class Search extends com.google.api.client.googleapis.services.json.Abstr } @com.google.api.client.util.Key - private java.lang.String lang; + private java.lang.Boolean allContext; /** */ - public java.lang.String getLang() { - return lang; + public java.lang.Boolean getAllContext() { + return allContext; } - public SearchOperation setLang(java.lang.String lang) { - this.lang = lang; + public SearchOperation setAllContext(java.lang.Boolean allContext) { + this.allContext = allContext; return this; } - @com.google.api.client.util.Key("package") - private java.lang.String package__; + @com.google.api.client.util.Key + private java.lang.String env; /** */ - public java.lang.String getPackage() { - return package__; + public java.lang.String getEnv() { + return env; } - public SearchOperation setPackage(java.lang.String package__) { - this.package__ = package__; + public SearchOperation setEnv(java.lang.String env) { + this.env = env; return this; } @com.google.api.client.util.Key - private java.lang.String symbol; + private java.lang.Boolean hasIndex; /** */ - public java.lang.String getSymbol() { - return symbol; + public java.lang.Boolean getHasIndex() { + return hasIndex; } - public SearchOperation setSymbol(java.lang.String symbol) { - this.symbol = symbol; + public SearchOperation setHasIndex(java.lang.Boolean hasIndex) { + this.hasIndex = hasIndex; return this; } @com.google.api.client.util.Key - private java.lang.Boolean prefill; + private java.lang.String lang; /** */ - public java.lang.Boolean getPrefill() { - return prefill; + public java.lang.String getLang() { + return lang; } - public SearchOperation setPrefill(java.lang.Boolean prefill) { - this.prefill = prefill; + public SearchOperation setLang(java.lang.String lang) { + this.lang = lang; return this; } @@ -350,78 +348,78 @@ public class Search extends com.google.api.client.googleapis.services.json.Abstr return this; } - @com.google.api.client.util.Key - private java.lang.String sessionId; + @com.google.api.client.util.Key("package") + private java.lang.String package__; /** */ - public java.lang.String getSessionId() { - return sessionId; + public java.lang.String getPackage() { + return package__; } - public SearchOperation setSessionId(java.lang.String sessionId) { - this.sessionId = sessionId; + public SearchOperation setPackage(java.lang.String package__) { + this.package__ = package__; return this; } @com.google.api.client.util.Key - private java.lang.Boolean hasIndex; + private java.lang.Boolean prefill; /** */ - public java.lang.Boolean getHasIndex() { - return hasIndex; + public java.lang.Boolean getPrefill() { + return prefill; } - public SearchOperation setHasIndex(java.lang.Boolean hasIndex) { - this.hasIndex = hasIndex; + public SearchOperation setPrefill(java.lang.Boolean prefill) { + this.prefill = prefill; return this; } @com.google.api.client.util.Key - private java.lang.String env; + private java.lang.String sessionId; /** */ - public java.lang.String getEnv() { - return env; + public java.lang.String getSessionId() { + return sessionId; } - public SearchOperation setEnv(java.lang.String env) { - this.env = env; + public SearchOperation setSessionId(java.lang.String sessionId) { + this.sessionId = sessionId; return this; } @com.google.api.client.util.Key - private java.lang.String userAgent; + private java.lang.String symbol; /** */ - public java.lang.String getUserAgent() { - return userAgent; + public java.lang.String getSymbol() { + return symbol; } - public SearchOperation setUserAgent(java.lang.String userAgent) { - this.userAgent = userAgent; + public SearchOperation setSymbol(java.lang.String symbol) { + this.symbol = symbol; return this; } @com.google.api.client.util.Key - private java.lang.Boolean allContext; + private java.lang.String userAgent; /** */ - public java.lang.Boolean getAllContext() { - return allContext; + public java.lang.String getUserAgent() { + return userAgent; } - public SearchOperation setAllContext(java.lang.Boolean allContext) { - this.allContext = allContext; + public SearchOperation setUserAgent(java.lang.String userAgent) { + this.userAgent = userAgent; return this; } diff --git a/src/com/appspot/cluestick_server/search/SearchRequest.java b/src/com/appspot/cluestick_server/search/SearchRequest.java index 171757e..f79010d 100644 --- a/src/com/appspot/cluestick_server/search/SearchRequest.java +++ b/src/com/appspot/cluestick_server/search/SearchRequest.java @@ -11,8 +11,6 @@ */ /* * This code was generated by https://github.com/google/apis-client-generator/ - * (build: 2016-01-08 17:48:37 UTC) - * on 2016-02-17 at 11:17:28 UTC * Modify at your own risk. */ diff --git a/src/com/appspot/cluestick_server/search/SearchRequestInitializer.java b/src/com/appspot/cluestick_server/search/SearchRequestInitializer.java index d7cff6e..3621152 100644 --- a/src/com/appspot/cluestick_server/search/SearchRequestInitializer.java +++ b/src/com/appspot/cluestick_server/search/SearchRequestInitializer.java @@ -11,8 +11,6 @@ */ /* * This code was generated by https://github.com/google/apis-client-generator/ - * (build: 2016-01-08 17:48:37 UTC) - * on 2016-02-17 at 11:17:28 UTC * Modify at your own risk. */ diff --git a/src/com/appspot/cluestick_server/search/model/CodeResult.java b/src/com/appspot/cluestick_server/search/model/CodeResult.java index 3f78ab1..76d5e1c 100644 --- a/src/com/appspot/cluestick_server/search/model/CodeResult.java +++ b/src/com/appspot/cluestick_server/search/model/CodeResult.java @@ -11,8 +11,6 @@ */ /* * This code was generated by https://github.com/google/apis-client-generator/ - * (build: 2016-01-08 17:48:37 UTC) - * on 2016-02-17 at 11:17:28 UTC * Modify at your own risk. */ diff --git a/src/com/appspot/cluestick_server/search/model/EventReq.java b/src/com/appspot/cluestick_server/search/model/EventReq.java index fef0073..f522829 100644 --- a/src/com/appspot/cluestick_server/search/model/EventReq.java +++ b/src/com/appspot/cluestick_server/search/model/EventReq.java @@ -11,8 +11,6 @@ */ /* * This code was generated by https://github.com/google/apis-client-generator/ - * (build: 2016-01-08 17:48:37 UTC) - * on 2016-02-17 at 11:17:28 UTC * Modify at your own risk. */ diff --git a/src/com/appspot/cluestick_server/search/model/Result.java b/src/com/appspot/cluestick_server/search/model/Result.java index 07ed0a7..6568016 100644 --- a/src/com/appspot/cluestick_server/search/model/Result.java +++ b/src/com/appspot/cluestick_server/search/model/Result.java @@ -11,8 +11,6 @@ */ /* * This code was generated by https://github.com/google/apis-client-generator/ - * (build: 2016-01-08 17:48:37 UTC) - * on 2016-02-17 at 11:17:28 UTC * Modify at your own risk. */ diff --git a/src/com/appspot/cluestick_server/search/model/ResultContext.java b/src/com/appspot/cluestick_server/search/model/ResultContext.java index 88f19fb..8ac636e 100644 --- a/src/com/appspot/cluestick_server/search/model/ResultContext.java +++ b/src/com/appspot/cluestick_server/search/model/ResultContext.java @@ -11,8 +11,6 @@ */ /* * This code was generated by https://github.com/google/apis-client-generator/ - * (build: 2016-01-08 17:48:37 UTC) - * on 2016-02-17 at 11:17:28 UTC * Modify at your own risk. */ diff --git a/src/com/appspot/cluestick_server/search/model/SearchResponse.java b/src/com/appspot/cluestick_server/search/model/SearchResponse.java index 184e5bd..9f62e78 100644 --- a/src/com/appspot/cluestick_server/search/model/SearchResponse.java +++ b/src/com/appspot/cluestick_server/search/model/SearchResponse.java @@ -11,8 +11,6 @@ */ /* * This code was generated by https://github.com/google/apis-client-generator/ - * (build: 2016-01-08 17:48:37 UTC) - * on 2016-02-17 at 11:17:28 UTC * Modify at your own risk. */ @@ -43,6 +41,12 @@ public final class SearchResponse extends com.google.api.client.json.GenericJson @com.google.api.client.util.Key private java.util.List<Result> results; + static { + // hack to force ProGuard to consider Result used, since otherwise it would be stripped out + // see https://github.com/google/google-api-java-client/issues/543 + com.google.api.client.util.Data.nullOf(Result.class); + } + /** * The value may be {@code null}. */ diff --git a/src/com/google/devrel/cluestick/searchservice/CluestickSearch.java b/src/com/google/devrel/cluestick/searchservice/CluestickSearch.java index cbfdaba..61fc76c 100644 --- a/src/com/google/devrel/cluestick/searchservice/CluestickSearch.java +++ b/src/com/google/devrel/cluestick/searchservice/CluestickSearch.java @@ -38,7 +38,6 @@ import java.util.List; public class CluestickSearch { private static final Logger LOG = Logger.getInstance("#com.google.devrel.cluestick.searchservice.CluestickSearch"); - public static final String DEFAULT_USER_AGENT = "cluestick search"; private final Search searchService; private String sessionId; @@ -61,6 +60,7 @@ public class CluestickSearch { public void logEvent(@Nullable String action, @Nullable String resultKey, int signal) { EventReq event = new EventReq(); event.setAction(action); + event.setSessionId(sessionId); event.setResultKey(resultKey); event.setSignal(signal); event.setSignal(event.getSignal().intValue() + signal); @@ -90,11 +90,7 @@ public class CluestickSearch { // TODO(thoroogod): For now, request all contents of result files. This may not be actually // that practical in terms of bandwidth. request.setAllContext(true); - if (userAgent == null) { - request.setUserAgent(userAgent); - } else { - request.setUserAgent(DEFAULT_USER_AGENT); - } + request.setUserAgent(userAgent); SearchResponse response = request.execute(); if (response.getSessionId() != null) { |