diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/OpenApiSchema.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/OpenApiSchema.java deleted file mode 100644 index d409f3d..0000000 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/OpenApiSchema.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.cobbzilla.wizard.model; - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.RUNTIME) -public @interface OpenApiSchema { - - String[] exclude() default ""; - String[] include() default ""; - -} diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/EntityConfig.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/EntityConfig.java index f86cfa8..c0aba7d 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/EntityConfig.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/EntityConfig.java @@ -9,7 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.cobbzilla.util.reflect.ReflectionUtil; import org.cobbzilla.util.string.HasLocale; import org.cobbzilla.util.string.StringUtil; -import org.cobbzilla.wizard.model.OpenApiSchema; +import org.cobbzilla.util.reflect.OpenApiSchema; import org.cobbzilla.wizard.model.entityconfig.annotations.*; import org.cobbzilla.wizard.model.search.SqlViewField; import org.cobbzilla.wizard.validation.HasValue; diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/EntityConfigSource.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/EntityConfigSource.java index a38b410..46ad270 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/EntityConfigSource.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/entityconfig/EntityConfigSource.java @@ -1,6 +1,6 @@ package org.cobbzilla.wizard.model.entityconfig; -import org.cobbzilla.wizard.model.OpenApiSchema; +import org.cobbzilla.util.reflect.OpenApiSchema; public interface EntityConfigSource { diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/model/support/SupportInfo.java b/wizard-common/src/main/java/org/cobbzilla/wizard/model/support/SupportInfo.java index 2146930..639d770 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/model/support/SupportInfo.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/model/support/SupportInfo.java @@ -3,7 +3,7 @@ package org.cobbzilla.wizard.model.support; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Getter; import lombok.Setter; -import org.cobbzilla.wizard.model.OpenApiSchema; +import org.cobbzilla.util.reflect.OpenApiSchema; import java.util.HashMap; import java.util.Map; diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/model/search/SearchResults.java b/wizard-server/src/main/java/org/cobbzilla/wizard/model/search/SearchResults.java index ff4fe5c..37411ac 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/model/search/SearchResults.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/model/search/SearchResults.java @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; import org.cobbzilla.util.json.JsonUtil; import org.cobbzilla.wizard.filters.Scrubbable; import org.cobbzilla.wizard.filters.ScrubbableField; -import org.cobbzilla.wizard.model.OpenApiSchema; +import org.cobbzilla.util.reflect.OpenApiSchema; import org.cobbzilla.wizard.model.entityconfig.EntityFieldType; import org.cobbzilla.wizard.model.entityconfig.annotations.ECField; diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/resources/AbstractEntityConfigsResource.java b/wizard-server/src/main/java/org/cobbzilla/wizard/resources/AbstractEntityConfigsResource.java index 234ea20..da1ae9c 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/resources/AbstractEntityConfigsResource.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/resources/AbstractEntityConfigsResource.java @@ -17,7 +17,7 @@ import org.cobbzilla.util.string.StringUtil; import org.cobbzilla.wizard.dao.AbstractCRUDDAO; import org.cobbzilla.wizard.dao.DAO; import org.cobbzilla.wizard.model.Identifiable; -import org.cobbzilla.wizard.model.OpenApiSchema; +import org.cobbzilla.util.reflect.OpenApiSchema; import org.cobbzilla.wizard.model.entityconfig.EntityConfig; import org.cobbzilla.wizard.model.entityconfig.EntityConfigSource; import org.cobbzilla.wizard.model.entityconfig.EntityFieldConfig; diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java index 280221c..1a5342f 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/OpenApiConfiguration.java @@ -18,7 +18,7 @@ import org.apache.commons.collections4.map.SingletonMap; import org.cobbzilla.util.handlebars.HandlebarsUtil; import org.cobbzilla.util.handlebars.HasHandlebars; import org.cobbzilla.wizard.filters.auth.AuthFilter; -import org.cobbzilla.wizard.model.OpenApiSchema; +import org.cobbzilla.util.reflect.OpenApiSchema; import org.cobbzilla.wizard.model.entityconfig.EntityConfig; import org.cobbzilla.wizard.model.entityconfig.EntityConfigSource; import org.cobbzilla.wizard.util.ClasspathScanner;