diff --git a/storage/src/main/java/com/zfoo/storage/manager/IStorageManager.java b/storage/src/main/java/com/zfoo/storage/manager/IStorageManager.java index 73a0ef48..72d4925b 100644 --- a/storage/src/main/java/com/zfoo/storage/manager/IStorageManager.java +++ b/storage/src/main/java/com/zfoo/storage/manager/IStorageManager.java @@ -14,6 +14,7 @@ package com.zfoo.storage.manager; import com.zfoo.storage.config.StorageConfig; +import com.zfoo.storage.model.IStorage; import java.util.Map; diff --git a/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java b/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java index 13dc7448..c06ea58b 100644 --- a/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java +++ b/storage/src/main/java/com/zfoo/storage/manager/StorageManager.java @@ -24,6 +24,7 @@ import com.zfoo.storage.anno.Storage; import com.zfoo.storage.anno.StorageAutowired; import com.zfoo.storage.config.StorageConfig; import com.zfoo.storage.interpreter.data.StorageEnum; +import com.zfoo.storage.model.IStorage; import com.zfoo.storage.model.StorageDefinition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/storage/src/main/java/com/zfoo/storage/manager/StorageObject.java b/storage/src/main/java/com/zfoo/storage/manager/StorageObject.java index a8e07c69..ff34ae02 100644 --- a/storage/src/main/java/com/zfoo/storage/manager/StorageObject.java +++ b/storage/src/main/java/com/zfoo/storage/manager/StorageObject.java @@ -18,6 +18,7 @@ import com.zfoo.protocol.util.IOUtils; import com.zfoo.protocol.util.ReflectionUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.storage.interpreter.ResourceInterpreter; +import com.zfoo.storage.model.IStorage; import com.zfoo.storage.model.IdDef; import com.zfoo.storage.model.IndexDef; import org.springframework.lang.Nullable; diff --git a/storage/src/main/java/com/zfoo/storage/manager/IStorage.java b/storage/src/main/java/com/zfoo/storage/model/IStorage.java similarity index 94% rename from storage/src/main/java/com/zfoo/storage/manager/IStorage.java rename to storage/src/main/java/com/zfoo/storage/model/IStorage.java index 20b6fad5..8e79989b 100644 --- a/storage/src/main/java/com/zfoo/storage/manager/IStorage.java +++ b/storage/src/main/java/com/zfoo/storage/model/IStorage.java @@ -10,9 +10,8 @@ * See the License for the specific language governing permissions and limitations under the License. */ -package com.zfoo.storage.manager; +package com.zfoo.storage.model; -import com.zfoo.storage.model.IdDef; import org.springframework.lang.Nullable; import java.util.Collection; diff --git a/storage/src/main/java/com/zfoo/storage/util/ExportUtils.java b/storage/src/main/java/com/zfoo/storage/util/ExportUtils.java index dc8fdf3b..0b34bd92 100644 --- a/storage/src/main/java/com/zfoo/storage/util/ExportUtils.java +++ b/storage/src/main/java/com/zfoo/storage/util/ExportUtils.java @@ -20,7 +20,7 @@ import com.zfoo.protocol.util.StringUtils; import com.zfoo.storage.interpreter.CsvReader; import com.zfoo.storage.interpreter.ExcelReader; import com.zfoo.storage.interpreter.data.StorageEnum; -import com.zfoo.storage.manager.IStorage; +import com.zfoo.storage.model.IStorage; import java.io.File; import java.io.IOException; diff --git a/storage/src/test/java/com/zfoo/storage/StudentManager.java b/storage/src/test/java/com/zfoo/storage/StudentManager.java index 2e78959b..8de80409 100644 --- a/storage/src/test/java/com/zfoo/storage/StudentManager.java +++ b/storage/src/test/java/com/zfoo/storage/StudentManager.java @@ -14,7 +14,7 @@ package com.zfoo.storage; import com.zfoo.storage.anno.StorageAutowired; -import com.zfoo.storage.manager.IStorage; +import com.zfoo.storage.model.IStorage; import com.zfoo.storage.resource.StudentCsvResource; import com.zfoo.storage.resource.StudentResource; import org.springframework.stereotype.Component; diff --git a/storage/src/test/java/com/zfoo/storage/TestManager.java b/storage/src/test/java/com/zfoo/storage/TestManager.java index c62fa54a..fc7bd3f0 100644 --- a/storage/src/test/java/com/zfoo/storage/TestManager.java +++ b/storage/src/test/java/com/zfoo/storage/TestManager.java @@ -14,7 +14,7 @@ package com.zfoo.storage; import com.zfoo.storage.anno.StorageAutowired; -import com.zfoo.storage.manager.IStorage; +import com.zfoo.storage.model.IStorage; import com.zfoo.storage.resource.TestResource; import org.springframework.stereotype.Component;