You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2019/12/11 16:12:57 UTC
[isis] branch master updated: ISIS-2158: move SwaggerService impl.
and infrastructure to ro-viewer
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 1c8a248 ISIS-2158: move SwaggerService impl. and infrastructure to ro-viewer
1c8a248 is described below
commit 1c8a2486f2ba7377e4cce1d23a9cb3b5e3c32c6a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Dec 11 17:12:45 2019 +0100
ISIS-2158: move SwaggerService impl. and infrastructure to ro-viewer
---
.../org/apache/isis/metamodel/IsisModuleMetamodel.java | 16 +++-------------
.../rendering/IsisModuleRestfulObjectsRendering.java | 18 ++++++++++++++++--
.../service}/swagger/SwaggerServiceDefault.java | 4 ++--
.../rendering/service}/swagger/internal/Caching.java | 2 +-
.../service}/swagger/internal/ClassExcluder.java | 2 +-
.../swagger/internal/ClassExcluderAbstract.java | 3 +--
.../swagger/internal/ClassExcluderDefault.java | 11 +----------
.../service}/swagger/internal/Generation.java | 2 +-
.../swagger/internal/SwaggerSpecGenerator.java | 2 +-
.../rendering/service}/swagger/internal/Tagger.java | 2 +-
.../service}/swagger/internal/TaggerDefault.java | 2 +-
.../rendering/service}/swagger/internal/Util.java | 2 +-
.../swagger/internal/ValuePropertyFactory.java | 2 +-
.../swagger/internal/ValuePropertyFactoryDefault.java | 5 +++--
.../service}/swagger/internal/ValuePropertyPlugin.java | 4 ++--
.../service}/swagger/internal/GenerationTest.java | 7 ++++++-
.../service}/swagger/internal/TaggerTest.java | 4 +++-
17 files changed, 45 insertions(+), 43 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
index 04bfda0..683d1eb 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
+++ b/core/metamodel/src/main/java/org/apache/isis/metamodel/IsisModuleMetamodel.java
@@ -18,6 +18,9 @@
*/
package org.apache.isis.metamodel;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.config.IsisModuleConfig;
import org.apache.isis.metamodel.context.MetaModelContexts;
@@ -37,20 +40,12 @@ import org.apache.isis.metamodel.services.grid.bootstrap3.GridSystemServiceBS3;
import org.apache.isis.metamodel.services.layout.LayoutServiceDefault;
import org.apache.isis.metamodel.services.metamodel.MetaModelServiceDefault;
import org.apache.isis.metamodel.services.registry.ServiceRegistryDefault;
-import org.apache.isis.metamodel.services.swagger.SwaggerServiceDefault;
-import org.apache.isis.metamodel.services.swagger.internal.ClassExcluderDefault;
-import org.apache.isis.metamodel.services.swagger.internal.SwaggerSpecGenerator;
-import org.apache.isis.metamodel.services.swagger.internal.TaggerDefault;
-import org.apache.isis.metamodel.services.swagger.internal.ValuePropertyFactoryDefault;
import org.apache.isis.metamodel.services.title.TitleServiceDefault;
import org.apache.isis.metamodel.services.user.UserServiceDefault;
import org.apache.isis.metamodel.specloader.InjectorMethodEvaluatorDefault;
import org.apache.isis.metamodel.specloader.ProgrammingModelServiceDefault;
import org.apache.isis.metamodel.specloader.SpecificationLoaderDefault;
import org.apache.isis.security.api.IsisModuleSecurityApi;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
@Configuration
@Import({
@@ -66,10 +61,6 @@ import org.springframework.context.annotation.Import;
// @Component's
ProgrammingModelInitFilterDefault.class,
ClassSubstitutorDefault.class,
- ClassExcluderDefault.class,
- SwaggerSpecGenerator.class,
- TaggerDefault.class,
- ValuePropertyFactoryDefault.class,
// @Service's
ObjectManagerDefault.class,
@@ -86,7 +77,6 @@ import org.springframework.context.annotation.Import;
MetaModelServiceDefault.class,
ProgrammingModelServiceDefault.class,
ServiceRegistryDefault.class,
- SwaggerServiceDefault.class,
TitleServiceDefault.class,
SpecificationLoaderDefault.class,
UserServiceDefault.class,
diff --git a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
index 93f83a6..5bf05e7 100644
--- a/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/IsisModuleRestfulObjectsRendering.java
@@ -1,5 +1,8 @@
package org.apache.isis.viewer.restfulobjects.rendering;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
import org.apache.isis.runtime.IsisModuleRuntime;
import org.apache.isis.viewer.restfulobjects.applib.IsisModuleRestfulObjectsApplib;
import org.apache.isis.viewer.restfulobjects.rendering.domainobjects.JsonValueEncoder;
@@ -8,8 +11,11 @@ import org.apache.isis.viewer.restfulobjects.rendering.service.acceptheader.Acce
import org.apache.isis.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceForRestfulObjectsV1_0;
import org.apache.isis.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceOrgApacheIsisV1;
import org.apache.isis.viewer.restfulobjects.rendering.service.conneg.ContentNegotiationServiceXRoDomainType;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.SwaggerServiceDefault;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.ClassExcluderDefault;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.SwaggerSpecGenerator;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.TaggerDefault;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyFactoryDefault;
@Configuration
@Import({
@@ -17,6 +23,13 @@ import org.springframework.context.annotation.Import;
IsisModuleRestfulObjectsApplib.class,
IsisModuleRuntime.class,
+ // @Component's
+ ClassExcluderDefault.class,
+ SwaggerSpecGenerator.class,
+ TaggerDefault.class,
+ ValuePropertyFactoryDefault.class,
+
+
// @Service's
AcceptHeaderServiceForRest.class,
ContentNegotiationServiceForRestfulObjectsV1_0.class,
@@ -24,6 +37,7 @@ import org.springframework.context.annotation.Import;
ContentNegotiationServiceXRoDomainType.class,
JsonValueEncoder.class,
RepresentationServiceContentNegotiator.class,
+ SwaggerServiceDefault.class,
})
public class IsisModuleRestfulObjectsRendering {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/SwaggerServiceDefault.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
similarity index 93%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/SwaggerServiceDefault.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
index 0e350cf..7061379 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/SwaggerServiceDefault.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/SwaggerServiceDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger;
import lombok.extern.log4j.Log4j2;
@@ -31,8 +31,8 @@ import org.springframework.stereotype.Service;
import org.apache.isis.applib.services.swagger.SwaggerService;
import org.apache.isis.commons.internal.base._Lazy;
-import org.apache.isis.metamodel.services.swagger.internal.SwaggerSpecGenerator;
import org.apache.isis.metamodel.specloader.SpecificationLoader;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.SwaggerSpecGenerator;
import static org.apache.isis.commons.internal.base._Strings.prefix;
import static org.apache.isis.commons.internal.base._With.ifPresentElse;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Caching.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Caching.java
similarity index 96%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Caching.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Caching.java
index 589ea42..e9f7981 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Caching.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Caching.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import io.swagger.models.Response;
import io.swagger.models.properties.IntegerProperty;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluder.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluder.java
similarity index 76%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluder.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluder.java
index f7a6c2c..70e377d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluder.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluder.java
@@ -1,4 +1,4 @@
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderAbstract.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java
similarity index 95%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderAbstract.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java
index 5f8920e..b5aaef4 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderAbstract.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderAbstract.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import java.util.List;
import java.util.Set;
@@ -24,7 +24,6 @@ import java.util.Set;
import org.apache.isis.commons.internal.collections._Sets;
import org.apache.isis.metamodel.spec.ObjectSpecification;
import org.apache.isis.metamodel.spec.feature.ObjectAction;
-import org.springframework.stereotype.Component;
public abstract class ClassExcluderAbstract implements ClassExcluder {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderDefault.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
similarity index 77%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderDefault.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
index 809b230..0139757 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ClassExcluderDefault.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ClassExcluderDefault.java
@@ -16,23 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
-
-import lombok.extern.log4j.Log4j2;
-
-import java.util.List;
-import java.util.Set;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import javax.inject.Named;
-import org.apache.isis.commons.internal.collections._Sets;
-import org.apache.isis.metamodel.spec.ObjectSpecification;
-import org.apache.isis.metamodel.spec.feature.ObjectAction;
import org.springframework.stereotype.Component;
@Component
@Named("isisMetaModel.ClassExcluderDefault")
-@Log4j2
public class ClassExcluderDefault extends ClassExcluderAbstract {
public ClassExcluderDefault() {
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Generation.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
similarity index 99%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Generation.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
index 626ae7c..43d2a5b 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Generation.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Generation.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/SwaggerSpecGenerator.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
similarity index 97%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/SwaggerSpecGenerator.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
index 6209a74..9f7cf84 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/SwaggerSpecGenerator.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/SwaggerSpecGenerator.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Tagger.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Tagger.java
similarity index 92%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Tagger.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Tagger.java
index 501d6a7..9b34d9d 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Tagger.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Tagger.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import org.apache.isis.applib.annotation.Programmatic;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/TaggerDefault.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
similarity index 97%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/TaggerDefault.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
index 027f271..9579d65 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/TaggerDefault.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import lombok.extern.log4j.Log4j2;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Util.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java
similarity index 98%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Util.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java
index 1f77574..a5941b7 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/Util.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/Util.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import java.util.Arrays;
import java.util.Collection;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactory.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactory.java
similarity index 92%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactory.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactory.java
index a00f88f..bdba12a 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactory.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactory.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import io.swagger.models.properties.Property;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactoryDefault.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
similarity index 96%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactoryDefault.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
index c8a9695..c90cef1 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyFactoryDefault.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyFactoryDefault.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -34,7 +34,8 @@ import org.joda.time.LocalDateTime;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.collections._Maps;
import org.apache.isis.commons.internal.context._Plugin;
-import org.apache.isis.metamodel.services.swagger.internal.ValuePropertyPlugin.ValuePropertyCollector;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyPlugin.ValuePropertyCollector;
+
import org.springframework.stereotype.Component;
import io.swagger.models.properties.BooleanProperty;
diff --git a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyPlugin.java b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java
similarity index 91%
rename from core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyPlugin.java
rename to core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java
index 112c554..2f10856 100644
--- a/core/metamodel/src/main/java/org/apache/isis/metamodel/services/swagger/internal/ValuePropertyPlugin.java
+++ b/core/viewers/restfulobjects/rendering/src/main/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/ValuePropertyPlugin.java
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import java.util.Map;
import java.util.Objects;
import java.util.function.BiConsumer;
import org.apache.isis.commons.internal.collections._Maps;
-import org.apache.isis.metamodel.services.swagger.internal.ValuePropertyFactoryDefault.Factory;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyFactoryDefault.Factory;
public interface ValuePropertyPlugin {
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/GenerationTest.java b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
similarity index 78%
rename from core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/GenerationTest.java
rename to core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
index 0c317ae..1efe03f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/GenerationTest.java
+++ b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/GenerationTest.java
@@ -16,12 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import java.util.Set;
import org.junit.Test;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.ClassExcluderDefault;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.Generation;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.TaggerDefault;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.ValuePropertyFactoryDefault;
+
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertThat;
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/TaggerTest.java b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
similarity index 93%
rename from core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/TaggerTest.java
rename to core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
index 2cd2a62..a357e23 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/swagger/internal/TaggerTest.java
+++ b/core/viewers/restfulobjects/rendering/src/test/java/org/apache/isis/viewer/restfulobjects/rendering/service/swagger/internal/TaggerTest.java
@@ -16,10 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.metamodel.services.swagger.internal;
+package org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal;
import org.junit.Test;
+import org.apache.isis.viewer.restfulobjects.rendering.service.swagger.internal.TaggerDefault;
+
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;