소스 검색

Eliminating a circular dependency

Sam Jaffe 8 년 전
부모
커밋
c6b5f037ff
2개의 변경된 파일3개의 추가작업 그리고 13개의 파일을 삭제
  1. 2 2
      resources/Potato.json
  2. 1 11
      src/org/leumasjaffe/charsheet/model/magic/DDSpellbook.java

+ 2 - 2
resources/Potato.json

@@ -6,7 +6,7 @@
       "level":3,
       "name":"Cleric",
       "spellBook":{
-        "@type":"Inspired",
+        "@class":"org.leumasjaffe.charsheet.model.magic.impl.Inspired",
         "classRef":"Cleric",
         "spellInfo":{
           "0":{
@@ -33,7 +33,7 @@
       "level":2,
       "name":"Bard",
       "spellBook":{
-        "@type":"Spontaneous",
+        "@class":"org.leumasjaffe.charsheet.model.magic.impl.Spontaneous",
         "spellInfo":{
           "0":{
             "spellsPerDay":3,

+ 1 - 11
src/org/leumasjaffe/charsheet/model/magic/DDSpellbook.java

@@ -3,21 +3,11 @@ package org.leumasjaffe.charsheet.model.magic;
 import java.util.Collection;
 import java.util.List;
 
-import org.leumasjaffe.charsheet.model.magic.impl.Inspired;
-import org.leumasjaffe.charsheet.model.magic.impl.Researched;
-import org.leumasjaffe.charsheet.model.magic.impl.Spontaneous;
-
-import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 
 import lombok.NonNull;
 
-@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY)
-@JsonSubTypes({
-	@JsonSubTypes.Type(value=Spontaneous.class, name="Spontaneous"),
-	@JsonSubTypes.Type(value=Researched.class, name="Researched"),
-	@JsonSubTypes.Type(value=Inspired.class, name="Inspired")
-})
+@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY)
 public interface DDSpellbook {
 	@NonNull Collection<DDSpell> spellsKnownAtLevel( int level );
 	@NonNull List<DDSpell> spellsPreparedAtLevel( int level );