This is an automated email from the ASF dual-hosted git repository. tandraschko pushed a commit to branch revert-147-master in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit e7eb16e837e4837f6b9ac6e6fae8aec32f77a857 Author: Thomas Andraschko <[email protected]> AuthorDate: Mon Feb 19 14:44:52 2024 +0100 Revert "Weld5 - add Dependent scope to @Repository, skip intermediate generic…" --- .github/workflows/ds-ci.yml | 6 ++-- .../org/apache/deltaspike/data/api/Repository.java | 2 -- .../deltaspike/data/impl/RepositoryExtension.java | 5 --- .../data/impl/meta/EntityMetadataInitializer.java | 8 ----- .../impl/handler/EntityRepositoryHandlerTest.java | 13 -------- .../deltaspike/data/test/domain/Simple5.java | 26 --------------- .../deltaspike/data/test/domain/SimpleBase.java | 23 ------------- .../ExtendedRepositoryAbstractSomeInterface.java | 28 ---------------- ...xtendedRepositoryAbstractSomeInterfaceBase.java | 39 ---------------------- .../data/test/service/SomeInterface.java | 30 ----------------- 10 files changed, 3 insertions(+), 177 deletions(-) diff --git a/.github/workflows/ds-ci.yml b/.github/workflows/ds-ci.yml index c3d2f8f66..b5a7d0f13 100644 --- a/.github/workflows/ds-ci.yml +++ b/.github/workflows/ds-ci.yml @@ -48,16 +48,16 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 with: persist-credentials: false - name: Set up JDK 11 - uses: actions/setup-java@v4 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: 11 - name: Cache Maven packages - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} diff --git a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Repository.java b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Repository.java index caba3f7c9..e2a5ad66d 100755 --- a/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Repository.java +++ b/deltaspike/modules/data/api/src/main/java/org/apache/deltaspike/data/api/Repository.java @@ -26,7 +26,6 @@ import java.lang.annotation.Target; import org.apache.deltaspike.partialbean.api.PartialBeanBinding; -import jakarta.enterprise.context.Dependent; import jakarta.enterprise.inject.Stereotype; /** @@ -37,7 +36,6 @@ import jakarta.enterprise.inject.Stereotype; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Inherited -@Dependent @PartialBeanBinding public @interface Repository { diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java index d03324253..0807ef0f2 100755 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/RepositoryExtension.java @@ -90,11 +90,6 @@ public class RepositoryExtension implements Extension, Deactivatable LOG.log(Level.FINER, "Class {0} is Deactivated", repositoryClass); return; } - if (repositoryClass.getDeclaredAnnotation(Repository.class) == null) - { - LOG.log(Level.FINER, "Class {0} not annotated Repository", repositoryClass); - return; - } repositoryClasses.add(repositoryClass); REPOSITORY_CLASSES.add(repositoryClass); diff --git a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/EntityMetadataInitializer.java b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/EntityMetadataInitializer.java index 2f0d50e7f..e6e10c62d 100644 --- a/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/EntityMetadataInitializer.java +++ b/deltaspike/modules/data/impl/src/main/java/org/apache/deltaspike/data/impl/meta/EntityMetadataInitializer.java @@ -35,10 +35,6 @@ public class EntityMetadataInitializer public EntityMetadata init(RepositoryMetadata metadata) { EntityMetadata entityMetadata = extract(metadata.getRepositoryClass()); - if (entityMetadata == null) - { - return null; - } entityMetadata.setPrimaryKeyProperty(EntityUtils.primaryKeyProperty(entityMetadata.getEntityClass())); entityMetadata.setVersionProperty(EntityUtils.getVersionProperty(entityMetadata.getEntityClass())); @@ -49,10 +45,6 @@ public class EntityMetadataInitializer private EntityMetadata extract(Class<?> repositoryClass) { - if (!repositoryClass.isAnnotationPresent(Repository.class)) - { - return null; - } // get from annotation Repository repository = repositoryClass.getAnnotation(Repository.class); Class<?> entityClass = repository.forEntity(); diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandlerTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandlerTest.java index 5bdf3a263..c8bcb42de 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandlerTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/handler/EntityRepositoryHandlerTest.java @@ -26,7 +26,6 @@ import org.apache.deltaspike.data.test.domain.Simple_; import org.apache.deltaspike.data.test.service.ExtendedRepositoryAbstract; import org.apache.deltaspike.data.test.service.ExtendedRepositoryAbstract2; import org.apache.deltaspike.data.test.service.ExtendedRepositoryAbstract4; -import org.apache.deltaspike.data.test.service.ExtendedRepositoryAbstractSomeInterface; import org.apache.deltaspike.data.test.service.ExtendedRepositoryInterface; import org.apache.deltaspike.data.test.service.SimpleIntermediateRepository; import org.apache.deltaspike.data.test.service.SimpleStringIdRepository; @@ -59,7 +58,6 @@ public class EntityRepositoryHandlerTest extends TransactionalTestCase .addClasses(ExtendedRepositoryAbstract.class) .addClasses(ExtendedRepositoryAbstract2.class) .addClasses(ExtendedRepositoryAbstract4.class) - .addClasses(ExtendedRepositoryAbstractSomeInterface.class) .addClasses(SimpleStringIdRepository.class, SimpleIntermediateRepository.class) .addPackage(Simple.class.getPackage()); } @@ -75,9 +73,6 @@ public class EntityRepositoryHandlerTest extends TransactionalTestCase @Inject private ExtendedRepositoryAbstract4 repoAbstract4; - - @Inject - private ExtendedRepositoryAbstractSomeInterface repoAbstractRepo; @Inject private SimpleStringIdRepository stringIdRepo; @@ -438,14 +433,6 @@ public class EntityRepositoryHandlerTest extends TransactionalTestCase assertEquals("EntitySimple4", entityName2); } - @Test - public void abstract_should_return_entity_name() - { - final String entityName = repoAbstractRepo.getEntityName(); - - assertEquals("Simple", entityName); - } - @Test public void should_return_entity_primary_key() { diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/Simple5.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/Simple5.java deleted file mode 100644 index dab931e94..000000000 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/Simple5.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * 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.deltaspike.data.test.domain; - -import jakarta.persistence.Entity; - -@Entity(name = "EntitySimple5") -public class Simple5 extends SimpleBase { - -} diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/SimpleBase.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/SimpleBase.java deleted file mode 100644 index b28952814..000000000 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/domain/SimpleBase.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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.deltaspike.data.test.domain; - -public class SimpleBase { - -} diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstractSomeInterface.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstractSomeInterface.java deleted file mode 100644 index c80ed4434..000000000 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstractSomeInterface.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.deltaspike.data.test.service; - -import org.apache.deltaspike.data.api.Repository; -import org.apache.deltaspike.data.test.domain.Simple5; - -@Repository -public abstract class ExtendedRepositoryAbstractSomeInterface - extends ExtendedRepositoryAbstractSomeInterfaceBase<Simple5, Long> -{ -} diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstractSomeInterfaceBase.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstractSomeInterfaceBase.java deleted file mode 100644 index bc7fe84ac..000000000 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/ExtendedRepositoryAbstractSomeInterfaceBase.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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.deltaspike.data.test.service; - -import java.io.Serializable; - -import org.apache.deltaspike.data.api.AbstractEntityRepository; -import org.apache.deltaspike.data.test.domain.Simple4; -import org.apache.deltaspike.data.test.domain.SimpleBase; - -public abstract class ExtendedRepositoryAbstractSomeInterfaceBase<E extends SimpleBase, PK extends Serializable> - extends AbstractEntityRepository<E, PK> implements SomeInterface<E> -{ - public String getEntityName() - { - return entityName(); - } - - @Override - public void someMethod() - { - } -} diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/SomeInterface.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/SomeInterface.java deleted file mode 100644 index 0e725067e..000000000 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/test/service/SomeInterface.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * 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.deltaspike.data.test.service; - -import org.apache.deltaspike.data.test.domain.SimpleBase; - -/** - * Some interface that a repository may implement additionally - */ -public interface SomeInterface<E extends SimpleBase> { - - void someMethod(); - -}
