From 717a3bb508c1f1e2ae3edb4ffd0403150c89a5b9 Mon Sep 17 00:00:00 2001 From: Milosz Tylenda Date: Sat, 27 Jun 2009 09:53:46 +0000 Subject: [PATCH] OPENJPA-1146: Delete RuntimeUnenhancedClassses and link references to RuntimeUnenhancedClasses git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@788944 13f79535-47bb-0310-9956-ffa450edef68 --- .../openjpa/conf/OpenJPAConfiguration.java | 14 ++++----- .../conf/OpenJPAConfigurationImpl.java | 9 +++--- .../enhance/ManagedClassSubclasser.java | 4 +-- .../RuntimeUnenhancedClasssesModes.java | 31 ------------------- .../org/apache/openjpa/util/ImplHelper.java | 4 +-- 5 files changed, 15 insertions(+), 47 deletions(-) delete mode 100644 openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClasssesModes.java diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java index d52635591..d98207cce 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java @@ -24,7 +24,7 @@ import java.util.Map; import org.apache.openjpa.datacache.DataCache; import org.apache.openjpa.datacache.DataCacheManager; import org.apache.openjpa.ee.ManagedRuntime; -import org.apache.openjpa.enhance.RuntimeUnenhancedClasssesModes; +import org.apache.openjpa.enhance.RuntimeUnenhancedClassesModes; import org.apache.openjpa.event.BrokerFactoryEventManager; import org.apache.openjpa.event.LifecycleEventManager; import org.apache.openjpa.event.OrphanedKeyAction; @@ -1537,9 +1537,9 @@ public interface OpenJPAConfiguration * Return the runtime class optimization setting as one of the * following symbolic constants: * * * @since 1.0.0 @@ -1550,9 +1550,9 @@ public interface OpenJPAConfiguration * Set the runtime class optimization setting as one of the * following symbolic constants: * * * @since 1.0.0 diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java index 9bc0fd1ab..63e601268 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java @@ -28,8 +28,7 @@ import org.apache.openjpa.datacache.ConcurrentQueryCache; import org.apache.openjpa.datacache.DataCacheManager; import org.apache.openjpa.datacache.DataCacheManagerImpl; import org.apache.openjpa.ee.ManagedRuntime; -import org.apache.openjpa.enhance.PCEnhancerAgent; -import org.apache.openjpa.enhance.RuntimeUnenhancedClasssesModes; +import org.apache.openjpa.enhance.RuntimeUnenhancedClassesModes; import org.apache.openjpa.event.BrokerFactoryEventManager; import org.apache.openjpa.event.LifecycleEventManager; import org.apache.openjpa.event.OrphanedKeyAction; @@ -538,11 +537,11 @@ public class OpenJPAConfigurationImpl runtimeUnenhancedClasses = addInt("RuntimeUnenhancedClasses"); runtimeUnenhancedClasses.setAliases(new String[] { "supported", String.valueOf( - RuntimeUnenhancedClasssesModes.SUPPORTED), + RuntimeUnenhancedClassesModes.SUPPORTED), "unsupported", String.valueOf( - RuntimeUnenhancedClasssesModes.UNSUPPORTED), + RuntimeUnenhancedClassesModes.UNSUPPORTED), "warn", String.valueOf( - RuntimeUnenhancedClasssesModes.WARN), + RuntimeUnenhancedClassesModes.WARN), }); runtimeUnenhancedClasses.setDefault("supported"); runtimeUnenhancedClasses.setString("supported"); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java index 87aefe697..83a3873ce 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java @@ -89,7 +89,7 @@ public class ManagedClassSubclasser { Log log = conf.getLog(OpenJPAConfiguration.LOG_ENHANCE); if (conf.getRuntimeUnenhancedClassesConstant() - != RuntimeUnenhancedClasssesModes.SUPPORTED) { + != RuntimeUnenhancedClassesModes.SUPPORTED) { Collection unenhanced = new ArrayList(); for (Class cls : classes) if (!PersistenceCapable.class.isAssignableFrom(cls)) @@ -113,7 +113,7 @@ public class ManagedClassSubclasser { Message msg = _loc.get("runtime-optimization-disabled", unenhanced); if (conf.getRuntimeUnenhancedClassesConstant() - == RuntimeUnenhancedClasssesModes.WARN) + == RuntimeUnenhancedClassesModes.WARN) log.warn(msg); else throw new UserException(msg); diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClasssesModes.java b/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClasssesModes.java deleted file mode 100644 index 41848ae29..000000000 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/RuntimeUnenhancedClasssesModes.java +++ /dev/null @@ -1,31 +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.openjpa.enhance; - -/** - * Possible values for the openjpa.RuntimeUnenhancedClasses - * configuration setting. - * - * @since 1.0.0 - */ -public interface RuntimeUnenhancedClasssesModes { - public final static int SUPPORTED = 0; - public final static int UNSUPPORTED = 1; - public final static int WARN = 2; -} diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java index a305b59d6..bda6e6166 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java @@ -30,7 +30,7 @@ import org.apache.openjpa.enhance.PCRegistry; import org.apache.openjpa.enhance.StateManager; import org.apache.openjpa.enhance.ManagedInstanceProvider; import org.apache.openjpa.enhance.ReflectingPersistenceCapable; -import org.apache.openjpa.enhance.RuntimeUnenhancedClasssesModes; +import org.apache.openjpa.enhance.RuntimeUnenhancedClassesModes; import org.apache.openjpa.kernel.FetchConfiguration; import org.apache.openjpa.kernel.LockManager; import org.apache.openjpa.kernel.OpenJPAStateManager; @@ -222,7 +222,7 @@ public class ImplHelper { return (PersistenceCapable.class.isAssignableFrom(type) || (type != null && (conf == null || conf.getRuntimeUnenhancedClassesConstant() - == RuntimeUnenhancedClasssesModes.SUPPORTED) + == RuntimeUnenhancedClassesModes.SUPPORTED) && PCRegistry.isRegistered(type))); }