Simplified inheritance hierarchy for ModelDescriptor(s) that are also part of a VisitableHierarchy

Author: soelvsten

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/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/service/ImportedServiceModel.java

@@ -38,7 +38,7 @@
  * JAVADOC
  */
 public final class ImportedServiceModel
-    implements ImportedServiceDescriptor, VisitableHierarchy<Object, Object>
+    implements ImportedServiceDescriptor
 {
     private final ModuleDescriptor module;
     private final Class<?> type;

extensions/indexing-sql/src/main/java/org/apache/polygene/index/sql/support/skeletons/SQLCompatEntityStateWrapper.java

@@ -35,6 +35,7 @@
 import org.apache.polygene.api.type.CollectionType;
 import org.apache.polygene.api.type.EntityCompositeType;
 import org.apache.polygene.api.type.ValueType;
+import org.apache.polygene.api.util.HierarchicalVisitor;
 import org.apache.polygene.api.value.ValueComposite;
 import org.apache.polygene.spi.entity.EntityState;
 import org.apache.polygene.spi.entity.EntityStatus;
@@ -279,6 +280,12 @@ public int hashCode()
         {
             return wrappedEntityDescriptor.hashCode();
         }
+
+        @Override
+        public <ThrowableType extends Throwable> boolean accept(HierarchicalVisitor<? super Object, ? super Object, ThrowableType> visitor) throws ThrowableType
+        {
+            return wrappedEntityDescriptor.accept(visitor);
+        }
     }
 
     private static class CompatAssociationStateDescriptorWrapper