You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2021/09/24 18:46:33 UTC
[deltaspike] 03/04: DELTASPIKE-1437 remove more unused parts
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit 9c9d279e326e94a5eded1493d179d90c1b3d0aac
Author: Mark Struberg <st...@apache.org>
AuthorDate: Thu Sep 23 22:17:24 2021 +0200
DELTASPIKE-1437 remove more unused parts
---
.../deltaspike/core/api/common/DeltaSpike.java | 0
.../deltaspike/core/api/lifecycle/Destroyed.java | 0
.../deltaspike/core/api/lifecycle/Initialized.java | 0
.../apache/deltaspike/core/util/Annotateds.java | 0
.../deltaspike/core/util/AnnotationUtils.java | 0
.../deltaspike/core/util/CollectionUtils.java | 0
.../core/util/metadata/InjectionPointWrapper.java | 0
.../core/api/config/base/CoreBaseConfig.java | 32 ----------------------
.../core/util/ClassDeactivationUtils.java | 20 --------------
.../interceptor/GlobalInterceptorExtension.java | 0
.../jakarta.enterprise.inject.spi.Extension | 1 -
11 files changed, 53 deletions(-)
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/common/DeltaSpike.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/common/DeltaSpike.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/common/DeltaSpike.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/common/DeltaSpike.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/lifecycle/Destroyed.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/api/lifecycle/Initialized.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/Annotateds.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/Annotateds.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/AnnotationUtils.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/CollectionUtils.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/InjectionPointWrapper.java b/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/InjectionPointWrapper.java
similarity index 100%
rename from deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/metadata/InjectionPointWrapper.java
rename to deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/metadata/InjectionPointWrapper.java
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
index 313bb9b..aac6b95 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/config/base/CoreBaseConfig.java
@@ -39,38 +39,6 @@ public interface CoreBaseConfig extends DeltaSpikeBaseConfig
.getValue();
}
- interface InterceptorCustomization
- {
- Integer PRIORITY =
- ConfigResolver.resolve("deltaspike.interceptor.priority")
- .as(Integer.class)
- .withCurrentProjectStage(true)
- .withDefault(999) //PLATFORM_BEFORE is 0, LIBRARY_BEFORE is 1000 and APPLICATION is 2000
- .getValue();
- }
-
- interface Validation
- {
- ViolationMode VIOLATION_MODE =
- ConfigResolver.resolve("deltaspike.validation.violation-mode")
- .as(ViolationMode.class, new ConfigResolver.Converter<ViolationMode>()
- {
- @Override
- public ViolationMode convert(String value)
- {
- return ViolationMode.valueOf(value);
- }
- })
- .withCurrentProjectStage(true)
- .withDefault(ViolationMode.FAIL)
- .getValue();
-
- enum ViolationMode
- {
- IGNORE, WARN, FAIL
- }
- }
-
interface MBeanIntegration
{
Boolean AUTO_UNREGISTER =
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
index c0314ba..c3a10f2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ClassDeactivationUtils.java
@@ -19,7 +19,6 @@
package org.apache.deltaspike.core.util;
import org.apache.deltaspike.core.api.config.ConfigResolver;
-import org.apache.deltaspike.core.api.config.base.CoreBaseConfig;
import org.apache.deltaspike.core.api.projectstage.ProjectStage;
import org.apache.deltaspike.core.spi.activation.ClassDeactivator;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
@@ -193,25 +192,6 @@ public abstract class ClassDeactivationUtils
//synchronized isn't needed - #initDeactivatableCacheFor is already synchronized
private static List<ClassDeactivator> initConfiguredClassDeactivators(ClassLoader classLoader)
{
- if (!ServiceUtils.loadServiceImplementations(ClassDeactivator.class).isEmpty())
- {
- CoreBaseConfig.Validation.ViolationMode violationMode = CoreBaseConfig.Validation.VIOLATION_MODE;
-
- String message = "It isn't supported to configure " + ClassDeactivator.class.getName() +
- " via the std. service-loader config. " +
- "Please remove all META-INF/services/" + ClassDeactivator.class.getName() + " files. " +
- "Please configure it via the DeltaSpike-Config (e.g. META-INF/apache-deltaspike.properties).";
-
- if (violationMode == CoreBaseConfig.Validation.ViolationMode.FAIL)
- {
- throw new IllegalStateException(message);
- }
- else if (violationMode == CoreBaseConfig.Validation.ViolationMode.WARN)
- {
- LOG.warning(message);
- }
- }
-
List<String> classDeactivatorClassNames = ConfigResolver.getAllPropertyValues(ClassDeactivator.class.getName());
List<ClassDeactivator> classDeactivators = new ArrayList<ClassDeactivator>();
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java b/deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
similarity index 100%
rename from deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
rename to deltaspike/core/impl/obsolete/src/main/java/org/apache/deltaspike/core/impl/interceptor/GlobalInterceptorExtension.java
diff --git a/deltaspike/core/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension b/deltaspike/core/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
index ed1dc83..d11c308 100644
--- a/deltaspike/core/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
+++ b/deltaspike/core/impl/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
@@ -22,5 +22,4 @@ org.apache.deltaspike.core.impl.message.MessageBundleExtension
org.apache.deltaspike.core.impl.config.ConfigurationExtension
org.apache.deltaspike.core.impl.jmx.MBeanExtension
org.apache.deltaspike.core.impl.scope.DeltaSpikeContextExtension
-org.apache.deltaspike.core.impl.interceptor.GlobalInterceptorExtension
org.apache.deltaspike.core.impl.interceptor.interdyn.InterDynExtension
\ No newline at end of file