Merge remote-tracking branch 'origin/develop' into develop

Author: niclash

core/api/src/main/java/org/apache/polygene/api/composite/CompositeDescriptor.java

@@ -20,13 +20,15 @@
 
 package org.apache.polygene.api.composite;
 
+import org.apache.polygene.api.util.VisitableModelDescriptor;
+
 import java.util.stream.Stream;
 
 /**
  * Composite Descriptor.
  */
 public interface CompositeDescriptor
-    extends ModelDescriptor
+    extends VisitableModelDescriptor
 {
     Class<?> primaryType();
 

core/api/src/main/java/org/apache/polygene/api/object/ObjectDescriptor.java

@@ -21,11 +21,12 @@
 package org.apache.polygene.api.object;
 
 import org.apache.polygene.api.composite.ModelDescriptor;
+import org.apache.polygene.api.util.VisitableModelDescriptor;
 
 /**
  * Object Descriptor.
  */
 public interface ObjectDescriptor
-    extends ModelDescriptor
+    extends VisitableModelDescriptor
 {
 }

core/api/src/main/java/org/apache/polygene/api/service/ImportedServiceDescriptor.java

@@ -22,12 +22,13 @@
 
 import org.apache.polygene.api.composite.ModelDescriptor;
 import org.apache.polygene.api.identity.Identifiable;
+import org.apache.polygene.api.util.VisitableModelDescriptor;
 
 /**
  * {@code ServiceDescriptor} provides meta information of a service.
  */
 public interface ImportedServiceDescriptor
-    extends ModelDescriptor, Identifiable
+    extends VisitableModelDescriptor, Identifiable
 {
     Class<? extends ServiceImporter> serviceImporter();
 

core/api/src/main/java/org/apache/polygene/api/util/VisitableModelDescriptor.java

@@ -0,0 +1,30 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *
+ */
+package org.apache.polygene.api.util;
+
+import org.apache.polygene.api.composite.ModelDescriptor;
+
+/**
+ * A modeldescriptor, that is also part of a VisitableHierarchy
+ */
+public interface VisitableModelDescriptor
+        extends ModelDescriptor, VisitableHierarchy<Object, Object>
+{
+}

core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositeModel.java

@@ -47,7 +47,7 @@
  * JAVADOC
  */
 public abstract class CompositeModel
-    implements VisitableHierarchy<Object, Object>, Dependencies, CompositeDescriptor
+    implements Dependencies, CompositeDescriptor
 {
     protected final ModuleDescriptor module;
     protected final MixinsModel mixinsModel;

core/runtime/src/main/java/org/apache/polygene/runtime/composite/CompositesModel.java

@@ -0,0 +1,61 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *
+ */
+
+package org.apache.polygene.runtime.composite;
+
+import org.apache.polygene.api.util.HierarchicalVisitor;
+import org.apache.polygene.api.util.VisitableHierarchy;
+import org.apache.polygene.api.util.VisitableModelDescriptor;
+
+import java.util.List;
+import java.util.stream.Stream;
+
+public abstract class CompositesModel<MD extends VisitableModelDescriptor>
+        implements VisitableHierarchy<Object, Object>
+{
+    private final List<MD> compositeModels;
+
+    public CompositesModel( List<MD> compositeModels)
+    {
+        this.compositeModels = compositeModels;
+    }
+
+    @Override
+    public final <ThrowableType extends Throwable> boolean accept( HierarchicalVisitor<? super Object, ? super Object, ThrowableType> modelVisitor )
+            throws ThrowableType
+    {
+        if( modelVisitor.visitEnter( this ) )
+        {
+            for( MD compositeModel : compositeModels)
+            {
+                if( !compositeModel.accept( modelVisitor ) )
+                {
+                    break;
+                }
+            }
+        }
+        return modelVisitor.visitLeave( this );
+    }
+
+    public final Stream<MD> stream()
+    {
+        return compositeModels.stream();
+    }
+}

core/runtime/src/main/java/org/apache/polygene/runtime/composite/TransientsModel.java

@@ -21,48 +21,14 @@
 package org.apache.polygene.runtime.composite;
 
 import java.util.List;
-import java.util.stream.Stream;
-import org.apache.polygene.api.composite.TransientDescriptor;
-import org.apache.polygene.api.util.HierarchicalVisitor;
-import org.apache.polygene.api.util.VisitableHierarchy;
 
 /**
  * JAVADOC
  */
-public class TransientsModel
-    implements VisitableHierarchy<Object, Object>
+public class TransientsModel extends CompositesModel<TransientModel>
 {
-    private final List<TransientModel> transientModels;
-
     public TransientsModel( List<TransientModel> transientModels )
     {
-        this.transientModels = transientModels;
-    }
-
-    public Stream<TransientModel> models()
-    {
-        return transientModels.stream();
-    }
-
-    @Override
-    public <ThrowableType extends Throwable> boolean accept( HierarchicalVisitor<? super Object, ? super Object, ThrowableType> modelVisitor )
-        throws ThrowableType
-    {
-        if( modelVisitor.visitEnter( this ) )
-        {
-            for( TransientModel transientModel : transientModels )
-            {
-                if( !transientModel.accept( modelVisitor ) )
-                {
-                    break;
-                }
-            }
-        }
-        return modelVisitor.visitLeave( this );
-    }
-
-    public Stream<? extends TransientDescriptor> stream()
-    {
-        return transientModels.stream();
+        super(transientModels);
     }
 }

core/runtime/src/main/java/org/apache/polygene/runtime/entity/EntitiesModel.java

@@ -20,49 +20,19 @@
 
 package org.apache.polygene.runtime.entity;
 
-import java.util.List;
-import java.util.stream.Stream;
-import org.apache.polygene.api.entity.EntityDescriptor;
-import org.apache.polygene.api.util.HierarchicalVisitor;
 import org.apache.polygene.api.util.VisitableHierarchy;
+import org.apache.polygene.runtime.composite.CompositesModel;
+
+import java.util.List;
 
 /**
  * Model of entities in a particular Module.
  */
-public class EntitiesModel
+public class EntitiesModel extends CompositesModel<EntityModel>
     implements VisitableHierarchy<Object, Object>
 {
-    private final List<EntityModel> entityModels;
-
     public EntitiesModel( List<EntityModel> entityModels )
     {
-        this.entityModels = entityModels;
-    }
-
-    public Stream<EntityModel> models()
-    {
-        return entityModels.stream();
-    }
-
-    @Override
-    public <ThrowableType extends Throwable> boolean accept( HierarchicalVisitor<? super Object, ? super Object, ThrowableType> modelVisitor )
-        throws ThrowableType
-    {
-        if( modelVisitor.visitEnter( this ) )
-        {
-            for( EntityModel entityModel : entityModels )
-            {
-                if( !entityModel.accept( modelVisitor ) )
-                {
-                    break;
-                }
-            }
-        }
-        return modelVisitor.visitLeave( this );
-    }
-
-    public Stream<? extends EntityDescriptor> stream()
-    {
-        return entityModels.stream();
+        super(entityModels);
     }
 }

core/runtime/src/main/java/org/apache/polygene/runtime/object/ObjectModel.java

@@ -39,7 +39,7 @@
  * JAVADOC
  */
 public final class ObjectModel
-    implements ObjectDescriptor, VisitableHierarchy<Object, Object>
+    implements ObjectDescriptor
 {
     private final ModuleDescriptor module;
     private final Class<?> objectType;

core/runtime/src/main/java/org/apache/polygene/runtime/object/ObjectsModel.java

@@ -20,43 +20,19 @@
 
 package org.apache.polygene.runtime.object;
 
-import java.util.List;
-import java.util.stream.Stream;
-import org.apache.polygene.api.util.HierarchicalVisitor;
 import org.apache.polygene.api.util.VisitableHierarchy;
+import org.apache.polygene.runtime.composite.CompositesModel;
+
+import java.util.List;
 
 /**
  * JAVADOC
  */
-public class ObjectsModel
+public class ObjectsModel extends CompositesModel<ObjectModel>
     implements VisitableHierarchy<Object, Object>
 {
-    private final List<ObjectModel> objectModels;
-
     public ObjectsModel( List<ObjectModel> objectModels )
     {
-        this.objectModels = objectModels;
-    }
-
-    @Override
-    public <ThrowableType extends Throwable> boolean accept( HierarchicalVisitor<? super Object, ? super Object, ThrowableType> visitor )
-        throws ThrowableType
-    {
-        if( visitor.visitEnter( this ) )
-        {
-            for( ObjectModel objectModel : objectModels )
-            {
-                if( !objectModel.accept( visitor ) )
-                {
-                    break;
-                }
-            }
-        }
-        return visitor.visitLeave( this );
-    }
-
-    public Stream<ObjectModel> models()
-    {
-        return objectModels.stream();
+        super(objectModels);
     }
 }