use wrapper only for reflectWith

Author: mh-northlander

src/main/java/com/worksap/nlp/lucene/sudachi/ja/attributes/MorphemeAttributeImpl.kt

@@ -25,51 +25,38 @@ import org.apache.lucene.util.AttributeImpl
 import org.apache.lucene.util.AttributeReflector
 
 class MorphemeAttributeImpl : AttributeImpl(), MorphemeAttribute {
-  private val inner: ToXContentWrapper = ToXContentWrapper(null, listOf())
+  private var morpheme: Morpheme? = null
+  // mapping from the character offset to the original reader offset
+  private var offsetMap: List<Int> = listOf()
 
-  private class ToXContentWrapper(morpheme: Morpheme?, offsetMap: List<Int>) : ToXContent {
-    private var morpheme = morpheme
-    // mapping from the character to the original reader
-    private var offsetMap = offsetMap
+  // wrapper class to convert data ToXContent-able
+  private class ToXContentWrapper(morpheme: Morpheme, offsetMap: List<Int>) : ToXContent {
+    private val morpheme = morpheme
+    private val offsetMap = offsetMap
 
     override fun toXContent(builder: XContentBuilder, params: ToXContentParams): XContentBuilder {
       builder.value(
           mapOf(
-              "surface" to morpheme?.surface(),
-              "dictionaryForm" to morpheme?.dictionaryForm(),
-              "normalizedForm" to morpheme?.normalizedForm(),
-              "readingForm" to morpheme?.readingForm(),
-              "partOfSpeech" to morpheme?.partOfSpeech(),
+              "surface" to morpheme.surface(),
+              "dictionaryForm" to morpheme.dictionaryForm(),
+              "normalizedForm" to morpheme.normalizedForm(),
+              "readingForm" to morpheme.readingForm(),
+              "partOfSpeech" to morpheme.partOfSpeech(),
               "offsetMap" to offsetMap,
           ))
       return builder
     }
-
-    fun getMorpheme(): Morpheme? {
-      return morpheme
-    }
-
-    fun setMorpheme(morpheme: Morpheme?) {
-      this.morpheme = morpheme
-    }
-
-    fun getOffsets(): List<Int> {
-      return offsetMap
-    }
-
-    fun setOffsets(offsets: List<Int>) {
-      this.offsetMap = offsets
-    }
   }
 
   override fun clear() {
-    inner.setMorpheme(null)
-    inner.setOffsets(listOf())
+    morpheme = null
+    offsetMap = listOf()
   }
 
   override fun reflectWith(reflector: AttributeReflector) {
+    // show only when a morpheme is set
     reflector.reflect<MorphemeAttribute>(
-        "morpheme", if (inner.getMorpheme() != null) inner else null)
+        "morpheme", morpheme?.let { m -> ToXContentWrapper(m, offsetMap) })
   }
 
   override fun copyTo(target: AttributeImpl?) {
@@ -80,18 +67,18 @@ class MorphemeAttributeImpl : AttributeImpl(), MorphemeAttribute {
   }
 
   override fun getMorpheme(): Morpheme? {
-    return inner.getMorpheme()
+    return morpheme
   }
 
   override fun setMorpheme(morpheme: Morpheme?) {
-    inner.setMorpheme(morpheme)
+    this.morpheme = morpheme
   }
 
   override fun getOffsets(): List<Int> {
-    return inner.getOffsets()
+    return offsetMap
   }
 
   override fun setOffsets(offsets: List<Int>) {
-    inner.setOffsets(offsets)
+    this.offsetMap = offsets
   }
 }