Merge pull request #29 from ashitikov/master

Fixed generation of compositions with abstract components

api/build.gradle

@@ -1,5 +1,5 @@
 group 'trollsoftware'
-version '1.1.1-SNAPSHOT'
+version '1.1.3-SNAPSHOT'
 
 apply plugin: 'java'
 

build.gradle

@@ -1,5 +1,5 @@
 group 'trollsoftware'
-version '1.1.1-SNAPSHOT'
+version '1.1.3-SNAPSHOT'
 
 task wrapper(type: Wrapper) {
     gradleVersion = '2.5'

processor/build.gradle

@@ -1,5 +1,5 @@
 group 'trollsoftware'
-version '1.1.1-SNAPSHOT'
+version '1.1.3-SNAPSHOT'
 
 apply plugin: 'java'
 

processor/src/main/java/jcomposition/processor/steps/GenerateStep.java

@@ -146,6 +146,7 @@ private TypeSpec getTypeSpec(TypeElement typeElement) {
 
             specBuilder.addMethod(MethodSpec.methodBuilder("onInject")
                     .addModifiers(Modifier.ABSTRACT, Modifier.PROTECTED)
+                    .addAnnotation(ShareProtected.class)
                     .addParameter(ParameterSpec.builder(nestedCompositionTypeClassName, "composition", Modifier.FINAL)
                             .build())
                     .build());
@@ -180,7 +181,8 @@ private MethodSpec getMethodSpec(Map.Entry<ExecutableElementContainer, List<Type
         DeclaredType declaredType = entry.getKey().getDeclaredType();
         MethodSpec.Builder builder = MethodSpecUtils.getBuilder(executableElement, declaredType, getProcessingEnv().getTypeUtils());
 
-        if (container.getRelationShip() == TypeElementPairContainer.ExecutableRelationShip.Overriding
+        if (container.getRelationShip() == TypeElementPairContainer.ExecutableRelationShip.OverridingAbstract
+                || container.getRelationShip() == TypeElementPairContainer.ExecutableRelationShip.Overriding
                 || container.getRelationShip() == TypeElementPairContainer.ExecutableRelationShip.Same) {
             builder.addAnnotation(Override.class);
         }

processor/src/main/java/jcomposition/processor/types/ExecutableElementContainer.java

@@ -72,4 +72,12 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(executableElement.getSimpleName(), executableElement.getParameters().size());
     }
+
+    @Override
+    public String toString() {
+        return "ExecutableElementContainer{" +
+                "executableElement=" + executableElement +
+                ", declaredType=" + declaredType +
+                '}';
+    }
 }

processor/src/main/java/jcomposition/processor/types/TypeElementPairContainer.java

@@ -29,6 +29,7 @@ public enum ExecutableRelationShip {
         Nothing,
         Same,
         Overriding,
+        OverridingAbstract,
         Hiding
     }
 
@@ -104,8 +105,11 @@ public void setDeclaredType(DeclaredType declaredType) {
     public String toString() {
         return "TypeElementPairContainer{" +
                 "intf=" + intf +
+                ", bind=" + bind +
                 ", declaredType=" + declaredType +
                 ", relationShip=" + relationShip +
+                ", useInjection=" + useInjection +
+                ", isAbstract=" + isAbstract +
                 '}';
     }
 

processor/src/main/java/jcomposition/processor/utils/TypeElementUtils.java

@@ -96,6 +96,9 @@ private static TypeElementPairContainer.ExecutableRelationShip findRelation(Exec
         if (overrider.equals(overridden)) {
             return TypeElementPairContainer.ExecutableRelationShip.Same;
         } else if (els.overrides(overrider, overridden, containing)) {
+            if (isAbstract(overrider)) {
+                return TypeElementPairContainer.ExecutableRelationShip.OverridingAbstract;
+            }
             return TypeElementPairContainer.ExecutableRelationShip.Overriding;
         } else if (els.hides(overrider, overridden)) {
             return TypeElementPairContainer.ExecutableRelationShip.Hiding;
@@ -150,7 +153,8 @@ private static void processInterfaceElements(List<ExecutableElement> elementsFro
 
             if (result.isDuplicateFound()) {
                 TypeElementPairContainer typeElementPairContainer = new TypeElementPairContainer(concreteIntf, bind, baseDt, intfInjected, result.getRelationShip());
-                typeElementPairContainer.setAbstract(result.getRelationShip() == TypeElementPairContainer.ExecutableRelationShip.Same);
+                typeElementPairContainer.setAbstract(result.getRelationShip() == TypeElementPairContainer.ExecutableRelationShip.Same
+                        || result.getRelationShip() == TypeElementPairContainer.ExecutableRelationShip.OverridingAbstract);
 
                 addValueToMapList(container, typeElementPairContainer, map);
             } else {

src/main/java/jcomposition/example/partial/DrawableFull.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright 2017 TrollSoftware ([email protected])
+ *
+ * Licensed 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 jcomposition.example.partial;
+
+public class DrawableFull extends DrawableFullBase {
+
+    @Override
+    public String getPart() {
+        return "Drawable Full part";
+    }
+
+    @Override
+    protected void onInject(FullBase.Composition composition) {
+        // inject
+    }
+
+    @Override
+    protected void onMove() {
+
+    }
+}

src/main/java/jcomposition/example/partial/Full.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017 TrollSoftware ([email protected])
+ *
+ * Licensed 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 jcomposition.example.partial;
+
+public abstract class Full extends FullBase {
+}

src/main/java/jcomposition/example/partial/IDrawableFull.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2017 TrollSoftware ([email protected])
+ *
+ * Licensed 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 jcomposition.example.partial;
+
+import jcomposition.api.annotations.Bind;
+import jcomposition.api.annotations.Composition;
+import jcomposition.example.interfaces.IDrawable;
+
+@Bind(DrawableFull.class)
+@Composition(name = "DrawableFullBase")
+public interface IDrawableFull extends IFull, IDrawable {
+}

src/main/java/jcomposition/example/partial/IFull.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2017 TrollSoftware ([email protected])
+ *
+ * Licensed 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 jcomposition.example.partial;
+
+import jcomposition.api.annotations.Bind;
+import jcomposition.api.annotations.Composition;
+import jcomposition.example.interfaces.IMovable;
+
+@Bind(Full.class)
+@Composition(name = "FullBase")
+public interface IFull extends IMovable, IPartial {
+}

src/main/java/jcomposition/example/partial/IPartial.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright 2017 TrollSoftware ([email protected])
+ *
+ * Licensed 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 jcomposition.example.partial;
+
+import jcomposition.api.annotations.Bind;
+import jcomposition.api.annotations.Composition;
+import jcomposition.example.interfaces.IUpdatable;
+import jcomposition.example.interfaces.IVisible;
+
+@Bind(Partial.class)
+@Composition(name = "PartialBase")
+public interface IPartial extends IVisible, IUpdatable {
+    String getPart();
+}

src/main/java/jcomposition/example/partial/Partial.java

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2017 TrollSoftware ([email protected])
+ *
+ * Licensed 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 jcomposition.example.partial;
+
+public abstract class Partial extends PartialBase {
+
+}