fix(cts): use the real java enum

Author: millotp

generators/src/main/java/com/algolia/codegen/AlgoliaJavaGenerator.java

@@ -20,6 +20,9 @@
 @SuppressWarnings("unchecked")
 public class AlgoliaJavaGenerator extends JavaClientCodegen {
 
+  // This is used for the CTS generation
+  private static final AlgoliaJavaGenerator INSTANCE = new AlgoliaJavaGenerator();
+
   @Override
   public String getName() {
     return "algolia-java";
@@ -95,13 +98,7 @@ public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<Mo
     return operations;
   }
 
-  @Override
-  public String toEnumVarName(String value, String datatype) {
-    // when it's not a string, we don't want to change the name of the variable generated
-    if (!"String".equals(datatype)) {
-      return super.toEnumVarName(value, datatype);
-    }
-
+  public static String toEnum(String value) {
     // In some cases, the API might accept characters instead of the textual notation, we will
     // replace it internally so that it doesn't output the character itself.
     switch (value) {
@@ -134,7 +131,17 @@ public String toEnumVarName(String value, String datatype) {
       return value.replaceAll("-", "_").replaceAll("(.+?)([A-Z]|[0-9])", "$1_$2").toUpperCase(Locale.ROOT);
     }
 
-    return super.toEnumVarName(value, datatype);
+    return value;
+  }
+
+  @Override
+  public String toEnumVarName(String value, String datatype) {
+    // when it's not a string, we don't want to change the name of the variable generated
+    if (!"String".equals(datatype)) {
+      return super.toEnumVarName(value, datatype);
+    }
+
+    return super.toEnumVarName(toEnum(value), datatype);
   }
 
   /** Convert a Seq type to a valid class name. */

generators/src/main/java/com/algolia/codegen/cts/AlgoliaCTSGenerator.java

@@ -98,6 +98,7 @@ protected Builder<String, Lambda> addMustacheLambdas() {
     lambdas.put("replaceBacktick", new ReplaceBacktickLambda());
     lambdas.put("scalaIdentifier", new ScalaIdentifierLambda());
     lambdas.put("csharpIdentifier", new CSharpIdentifierLambda());
+    lambdas.put("javaEnum", new JavaEnumLambda());
     lambdas.put("codeSnakeCase", new CodeSnakeCaseLambda());
     lambdas.put("escapeRubyKeywords", new EscapeRubyKeywordsLambda());
     lambdas.put("swiftIdentifier", new SwiftIdentifierLambda());

generators/src/main/java/com/algolia/codegen/cts/lambda/JavaEnumLambda.java

@@ -0,0 +1,17 @@
+package com.algolia.codegen.cts.lambda;
+
+import com.algolia.codegen.AlgoliaJavaGenerator;
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import java.io.IOException;
+import java.io.Writer;
+
+public class JavaEnumLambda implements Mustache.Lambda {
+
+  @Override
+  public void execute(Template.Fragment frag, Writer out) throws IOException {
+    String text = frag.execute();
+    var formatted = AlgoliaJavaGenerator.toEnum(text);
+    out.write(formatted);
+  }
+}

templates/java/tests/generateInnerParams.mustache

@@ -17,7 +17,7 @@
   {{{value}}}
 {{/isBoolean}}
 {{#isEnum}}
-  {{{objectName}}}.fromValue("{{{value}}}")
+  {{{objectName}}}.{{#lambda.javaEnum}}{{{value}}}{{/lambda.javaEnum}}
 {{/isEnum}}
 {{#isArray}}
   List.of({{#value}}{{> tests/generateParams}}{{^-last}},{{/-last}}{{/value}})

website/src/snippets.js

@@ -82,7 +82,7 @@ if err != nil {
     'java': {
       'add': `client.waitForApiKey(ApiKeyOperation.ADD, response.Key, null)`,
       'update': `client.waitForApiKey(ApiKeyOperation.UPDATE, response.Key, new ApiKey()
-        .setAcl(List.of(Acl.fromValue("search"), Acl.fromValue("addObject")))
+        .setAcl(List.of(Acl.SEARCH, Acl.ADD_OBJECT))
         .setValidity(300)
         .setMaxQueriesPerIPPerHour(100)
         .setMaxHitsPerQuery(20))`,