Etrog 2784 case insensitive enum (#124)

* ETROG-2784: Expose /morphology model type option

* ETROG-2784: make enum deser case insensitive

* ETROG-2784: remove unused imports

Author: Li Xu

json/src/main/java/com/basistech/rosette/apimodel/jackson/AccuracyModeDeserializer.java

@@ -1,5 +1,5 @@
 /*
-* Copyright 2017 Basis Technology Corp.
+* Copyright 2018 Basis Technology Corp.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,18 +16,16 @@
 
 package com.basistech.rosette.apimodel.jackson;
 
-import com.basistech.rosette.apimodel.AccuracyMode;
 import com.basistech.rosette.apimodel.AdmRequest;
 import com.basistech.rosette.apimodel.DocumentRequest;
 import com.basistech.rosette.apimodel.Name;
 import com.basistech.rosette.apimodel.NameDeduplicationRequest;
 import com.basistech.rosette.apimodel.NameSimilarityRequest;
 import com.basistech.rosette.apimodel.NameTranslationRequest;
-import com.basistech.rosette.apimodel.SentimentModelType;
 import com.basistech.rosette.dm.jackson.AnnotatedDataModelModule;
+import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleSerializers;
 
 /**
  * Jackson module to configure Json serialization and deserialization for the
@@ -59,17 +57,6 @@ public void setupModule(Module.SetupContext context) {
         context.setMixInAnnotations(NameTranslationRequest.NameTranslationRequestBuilder.class, NameTranslationRequestMixin.NameTranslationRequestBuilderMixin.class);
         context.setMixInAnnotations(NameDeduplicationRequest.class, NameDeduplicationRequestMixin.class);
         context.setMixInAnnotations(NameDeduplicationRequest.NameDeduplicationRequestBuilder.class, NameDeduplicationRequestMixin.NameDeduplicationRequestBuilderMixin.class);
-
-        // TODO: see if there's something similar that can be used to generalize enum handling
-        context.setMixInAnnotations(AccuracyMode.class, AccuracyModeMixin.class);
-        SimpleSerializers keySerializers = new SimpleSerializers();
-        keySerializers.addSerializer(new AccuracyModeSerializer());
-        context.addKeySerializers(keySerializers);
-
-        context.setMixInAnnotations(SentimentModelType.class, SentimentModelTypeMixin.class);
-        keySerializers = new SimpleSerializers();
-        keySerializers.addSerializer(new SentimentModelTypeSerializer());
-        context.addKeySerializers(keySerializers);
     }
 
     /**
@@ -81,6 +68,7 @@ public void setupModule(Module.SetupContext context) {
     public static ObjectMapper setupObjectMapper(ObjectMapper mapper) {
         final ApiModelMixinModule module = new ApiModelMixinModule();
         mapper.registerModule(module);
+        mapper.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_ENUMS);
         return mapper;
     }
 }

json/src/main/java/com/basistech/rosette/apimodel/jackson/AccuracyModeMixin.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright 2018 Basis Technology Corp.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.basistech.rosette.apimodel;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import com.basistech.rosette.apimodel.jackson.ApiModelMixinModule;
+
+public class EnumTest extends Assert {
+    private ObjectMapper mapper;
+
+    @Before
+    public void init() {
+        mapper = ApiModelMixinModule.setupObjectMapper(new ObjectMapper());
+    }
+
+    @Test
+    public void testCaseInsensitivity() throws Exception {
+        String json = "{\"content\": \"foo\", \"options\": {\"modelType\": \"dEfAuLT\"}}";
+        Request request = mapper.readValue(json, new TypeReference<DocumentRequest<MorphologyOptions>>() { });
+        assertTrue(request instanceof DocumentRequest);
+        DocumentRequest docRequest = (DocumentRequest) request;
+        MorphologyOptions options = (MorphologyOptions) docRequest.getOptions();
+        assertEquals(MorphologyModelType.DEFAULT, options.getModelType());
+    }
+}

json/src/main/java/com/basistech/rosette/apimodel/jackson/AccuracyModeSerializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Basis Technology Corp.
+ * Copyright 2018 Basis Technology Corp.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package com.basistech.rosette.apimodel.jackson;
+package com.basistech.rosette.apimodel;
 
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-@JsonSerialize(using = SentimentModelTypeSerializer.class, keyUsing = SentimentModelTypeSerializer.class)
-@JsonDeserialize(using = SentimentModelTypeDeserializer.class)
-public class SentimentModelTypeMixin {
+/**
+ * A model type for morphological analysis.
+ */
+public enum MorphologyModelType {
+    DEFAULT,
+    PERCEPTRON,
+    /**/;
 }

json/src/main/java/com/basistech/rosette/apimodel/jackson/ApiModelMixinModule.java

@@ -1,5 +1,5 @@
 /*
-* Copyright 2017 Basis Technology Corp.
+* Copyright 2018 Basis Technology Corp.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -49,4 +49,9 @@ public class MorphologyOptions extends Options {
      * indicates the default.
      */
     private final PartOfSpeechTagSet partOfSpeechTagSet;
+
+    /**
+     * @return the model type
+     */
+    private final MorphologyModelType modelType;
 }