) DefineClassHelper.defineClass(className, b, 0, b.length, neighbor, loader, PROTECTION_DOMAIN);
// Force static initializers to run.
Class.forName(className, true, loader);
return c;
diff --git a/fine-objenesis/src/com/fr/third/org/objenesis/instantiator/util/DefineClassHelper.java b/fine-objenesis/src/com/fr/third/org/objenesis/instantiator/util/DefineClassHelper.java
new file mode 100644
index 000000000..6c2a4ebf7
--- /dev/null
+++ b/fine-objenesis/src/com/fr/third/org/objenesis/instantiator/util/DefineClassHelper.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2006-2019 the original author or authors.
+ *
+ * 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 com.fr.third.org.objenesis.instantiator.util;
+
+import com.fr.third.org.objenesis.ObjenesisException;
+import com.fr.third.org.objenesis.strategy.PlatformDescription;
+import sun.misc.Unsafe;
+
+
+
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
+import java.security.ProtectionDomain;
+
+/**
+ * Java 11+ removed sun.misc.Unsafe.defineClass. This class bridges the gap to work from Java 1.8 up to 11.
+ *
+ * It was inspired from javassist.
+ *
+ * @author Henri Tremblay
+ */
+public final class DefineClassHelper {
+
+ private static abstract class Helper {
+ abstract Class defineClass(String name, byte[] b, int off, int len, Class neighbor,
+ ClassLoader loader, ProtectionDomain protectionDomain);
+ }
+
+ private static class Java8 extends Helper {
+
+ private final MethodHandle defineClass = defineClass();
+
+ private MethodHandle defineClass() {
+ MethodType mt = MethodType.methodType(Class.class, String.class, byte[].class, int.class, int.class, ClassLoader.class, ProtectionDomain.class);
+ MethodHandle m;
+ try {
+ m = MethodHandles.publicLookup().findVirtual(Unsafe.class, "defineClass", mt);
+ } catch(NoSuchMethodException | IllegalAccessException e) {
+ throw new ObjenesisException(e);
+ }
+ Unsafe unsafe = UnsafeUtils.getUnsafe();
+ return m.bindTo(unsafe);
+ }
+
+ @Override
+ Class defineClass(String className, byte[] b, int off, int len, Class neighbor, ClassLoader loader, ProtectionDomain protectionDomain) {
+ try {
+ return (Class) defineClass.invokeExact(className, b, off, len, loader, protectionDomain);
+ } catch (Throwable e) {
+ if(e instanceof Error) {
+ throw (Error) e;
+ }
+ if(e instanceof RuntimeException) {
+ throw (RuntimeException) e;
+ }
+ throw new ObjenesisException(e);
+ }
+ }
+ }
+
+ private static class Java11 extends Helper {
+
+ private final Class module = module();
+ private final MethodHandles.Lookup lookup = MethodHandles.lookup();
+ private final MethodHandle getModule = getModule();
+ private final MethodHandle addReads = addReads();
+ private final MethodHandle privateLookupIn = privateLookupIn();
+ private final MethodHandle defineClass = defineClass();
+
+ private Class module() {
+ try {
+ return Class.forName("java.lang.Module");
+ } catch (ClassNotFoundException e) {
+ throw new ObjenesisException(e);
+ }
+ }
+
+ private MethodHandle getModule() {
+ try {
+ return lookup.findVirtual(Class.class, "getModule", MethodType.methodType(module));
+ } catch (NoSuchMethodException | IllegalAccessException e) {
+ throw new ObjenesisException(e);
+ }
+ }
+
+ private MethodHandle addReads() {
+ try {
+ return lookup.findVirtual(module, "addReads", MethodType.methodType(module, module));
+ } catch (NoSuchMethodException | IllegalAccessException e) {
+ throw new ObjenesisException(e);
+ }
+ }
+
+ private MethodHandle privateLookupIn() {
+ try {
+ return lookup.findStatic(MethodHandles.class, "privateLookupIn", MethodType.methodType(MethodHandles.Lookup.class, Class.class, MethodHandles.Lookup.class));
+ } catch (NoSuchMethodException | IllegalAccessException e) {
+ throw new ObjenesisException(e);
+ }
+ }
+
+ private MethodHandle defineClass() {
+ try {
+ return lookup.findVirtual(MethodHandles.Lookup.class, "defineClass", MethodType.methodType(Class.class, byte[].class));
+ } catch (NoSuchMethodException | IllegalAccessException e) {
+ throw new ObjenesisException(e);
+ }
+ }
+
+ @Override
+ Class defineClass(String className, byte[] b, int off, int len, Class neighbor, ClassLoader loader, ProtectionDomain protectionDomain) {
+ try {
+ Object module = getModule.invokeWithArguments(DefineClassHelper.class);
+ Object neighborModule = getModule.invokeWithArguments(neighbor);
+ addReads.invokeWithArguments(module, neighborModule);
+ MethodHandles.Lookup prvlookup = (MethodHandles.Lookup) privateLookupIn.invokeExact(neighbor, lookup);
+ return (Class) defineClass.invokeExact(prvlookup, b);
+ } catch (Throwable e) {
+ throw new ObjenesisException(neighbor.getName() + " has no permission to define the class", e);
+ }
+ }
+ }
+
+ // Java 11+ removed sun.misc.Unsafe.defineClass, so we fallback to invoking defineClass on
+ // ClassLoader until we have an implementation that uses MethodHandles.Lookup.defineClass
+ private static final Helper privileged = PlatformDescription.isAfterJava11() ?
+ new Java11() : new Java8();
+
+ public static Class defineClass(String name, byte[] b, int off, int len, Class neighbor,
+ ClassLoader loader, ProtectionDomain protectionDomain) {
+ return privileged.defineClass(name, b, off, len, neighbor, loader, protectionDomain);
+ }
+
+ private DefineClassHelper() {}
+}
\ No newline at end of file
diff --git a/fine-kryo/src/com/fr/third/org/objenesis/instantiator/util/UnsafeUtils.java b/fine-objenesis/src/com/fr/third/org/objenesis/instantiator/util/UnsafeUtils.java
similarity index 100%
rename from fine-kryo/src/com/fr/third/org/objenesis/instantiator/util/UnsafeUtils.java
rename to fine-objenesis/src/com/fr/third/org/objenesis/instantiator/util/UnsafeUtils.java
diff --git a/fine-kryo/src/com/fr/third/org/objenesis/strategy/BaseInstantiatorStrategy.java b/fine-objenesis/src/com/fr/third/org/objenesis/strategy/BaseInstantiatorStrategy.java
similarity index 100%
rename from fine-kryo/src/com/fr/third/org/objenesis/strategy/BaseInstantiatorStrategy.java
rename to fine-objenesis/src/com/fr/third/org/objenesis/strategy/BaseInstantiatorStrategy.java
diff --git a/fine-kryo/src/com/fr/third/org/objenesis/strategy/InstantiatorStrategy.java b/fine-objenesis/src/com/fr/third/org/objenesis/strategy/InstantiatorStrategy.java
similarity index 100%
rename from fine-kryo/src/com/fr/third/org/objenesis/strategy/InstantiatorStrategy.java
rename to fine-objenesis/src/com/fr/third/org/objenesis/strategy/InstantiatorStrategy.java
diff --git a/fine-kryo/src/com/fr/third/org/objenesis/strategy/PlatformDescription.java b/fine-objenesis/src/com/fr/third/org/objenesis/strategy/PlatformDescription.java
similarity index 89%
rename from fine-kryo/src/com/fr/third/org/objenesis/strategy/PlatformDescription.java
rename to fine-objenesis/src/com/fr/third/org/objenesis/strategy/PlatformDescription.java
index a401fc320..b5c886e27 100644
--- a/fine-kryo/src/com/fr/third/org/objenesis/strategy/PlatformDescription.java
+++ b/fine-objenesis/src/com/fr/third/org/objenesis/strategy/PlatformDescription.java
@@ -134,6 +134,29 @@ public final class PlatformDescription {
return bootClasspath != null && bootClasspath.toLowerCase().contains("core-oj.jar");
}
+ /**
+ * Tells if the current JVM is running Java 9 or above
+ *
+ * @return if the current JVM is Java 9 or above
+ */
+ public static boolean isAfterJigsaw() {
+ String version = PlatformDescription.SPECIFICATION_VERSION;
+ return version.indexOf('.') < 0; // No dot means the version is 9, 10, 11, ... not 1.6, 1.7, 1.8
+ }
+
+ /**
+ * Tells if the current JVM is running Java 11 or above
+ *
+ * @return if the current JVM is Java 11 or above
+ */
+ public static boolean isAfterJava11() {
+ if(!isAfterJigsaw()) {
+ return false;
+ }
+ int version = Integer.parseInt(PlatformDescription.SPECIFICATION_VERSION);
+ return version >= 11;
+ }
+
public static boolean isGoogleAppEngine() {
return GAE_VERSION != null;
}
diff --git a/fine-kryo/src/com/fr/third/org/objenesis/strategy/SerializingInstantiatorStrategy.java b/fine-objenesis/src/com/fr/third/org/objenesis/strategy/SerializingInstantiatorStrategy.java
similarity index 100%
rename from fine-kryo/src/com/fr/third/org/objenesis/strategy/SerializingInstantiatorStrategy.java
rename to fine-objenesis/src/com/fr/third/org/objenesis/strategy/SerializingInstantiatorStrategy.java
diff --git a/fine-kryo/src/com/fr/third/org/objenesis/strategy/SingleInstantiatorStrategy.java b/fine-objenesis/src/com/fr/third/org/objenesis/strategy/SingleInstantiatorStrategy.java
similarity index 100%
rename from fine-kryo/src/com/fr/third/org/objenesis/strategy/SingleInstantiatorStrategy.java
rename to fine-objenesis/src/com/fr/third/org/objenesis/strategy/SingleInstantiatorStrategy.java
diff --git a/fine-kryo/src/com/fr/third/org/objenesis/strategy/StdInstantiatorStrategy.java b/fine-objenesis/src/com/fr/third/org/objenesis/strategy/StdInstantiatorStrategy.java
similarity index 100%
rename from fine-kryo/src/com/fr/third/org/objenesis/strategy/StdInstantiatorStrategy.java
rename to fine-objenesis/src/com/fr/third/org/objenesis/strategy/StdInstantiatorStrategy.java
diff --git a/fine-poi/src/com/fr/third/v2/org/apache/poi/POIXMLTypeLoader.java b/fine-poi/src/com/fr/third/v2/org/apache/poi/POIXMLTypeLoader.java
index f9203a570..9776713d2 100644
--- a/fine-poi/src/com/fr/third/v2/org/apache/poi/POIXMLTypeLoader.java
+++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/POIXMLTypeLoader.java
@@ -18,9 +18,11 @@
package com.fr.third.v2.org.apache.poi;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
+import java.io.StringReader;
import java.net.URL;
import java.util.Collections;
import java.util.HashMap;
@@ -28,6 +30,7 @@ import java.util.Map;
import javax.xml.stream.XMLStreamReader;
+import com.fr.third.v2.org.apache.poi.util.DocumentHelper;
import com.fr.third.v2.org.apache.xmlbeans.SchemaType;
import com.fr.third.v2.org.apache.xmlbeans.XmlBeans;
import com.fr.third.v2.org.apache.xmlbeans.XmlException;
@@ -35,19 +38,26 @@ import com.fr.third.v2.org.apache.xmlbeans.XmlObject;
import com.fr.third.v2.org.apache.xmlbeans.XmlOptions;
import com.fr.third.v2.org.apache.xmlbeans.xml.stream.XMLInputStream;
import com.fr.third.v2.org.apache.xmlbeans.xml.stream.XMLStreamException;
+import org.w3c.dom.Document;
import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
@SuppressWarnings("deprecation")
public class POIXMLTypeLoader {
public static final XmlOptions DEFAULT_XML_OPTIONS;
+
static {
DEFAULT_XML_OPTIONS = new XmlOptions();
DEFAULT_XML_OPTIONS.setSaveOuter();
DEFAULT_XML_OPTIONS.setUseDefaultNamespace();
DEFAULT_XML_OPTIONS.setSaveAggressiveNamespaces();
DEFAULT_XML_OPTIONS.setCharacterEncoding("UTF-8");
- DEFAULT_XML_OPTIONS.setLoadEntityBytesLimit(4096);
+ // Piccolo is disabled for POI builts, i.e. JAXP is used for parsing
+ // so only user code using XmlObject/XmlToken.Factory.parse
+ // directly can bypass the entity check, which is probably unlikely (... and not within our responsibility :))
+ // DEFAULT_XML_OPTIONS.setLoadEntityBytesLimit(4096);
Map map = new HashMap();
map.put("http://schemas.openxmlformats.org/drawingml/2006/main", "a");
@@ -66,10 +76,9 @@ public class POIXMLTypeLoader {
map.put("urn:schemas-microsoft-com:vml", "v");
DEFAULT_XML_OPTIONS.setSaveSuggestedPrefixes(Collections.unmodifiableMap(map));
}
-
+
private static XmlOptions getXmlOptions(XmlOptions options) {
- XmlOptions opt = (options == null) ? DEFAULT_XML_OPTIONS : options;
- return opt;
+ return options == null ? DEFAULT_XML_OPTIONS : options;
}
public static XmlObject newInstance(SchemaType type, XmlOptions options) {
@@ -77,19 +86,38 @@ public class POIXMLTypeLoader {
}
public static XmlObject parse(String xmlText, SchemaType type, XmlOptions options) throws XmlException {
- return XmlBeans.getContextTypeLoader().parse(xmlText, type, getXmlOptions(options));
+ try {
+ return parse(new StringReader(xmlText), type, options);
+ } catch (IOException e) {
+ throw new XmlException("Unable to parse xml bean", e);
+ }
}
public static XmlObject parse(File file, SchemaType type, XmlOptions options) throws XmlException, IOException {
- return XmlBeans.getContextTypeLoader().parse(file, type, getXmlOptions(options));
+ InputStream is = new FileInputStream(file);
+ try {
+ return parse(is, type, options);
+ } finally {
+ is.close();
+ }
}
public static XmlObject parse(URL file, SchemaType type, XmlOptions options) throws XmlException, IOException {
- return XmlBeans.getContextTypeLoader().parse(file, type, getXmlOptions(options));
+ InputStream is = file.openStream();
+ try {
+ return parse(is, type, options);
+ } finally {
+ is.close();
+ }
}
public static XmlObject parse(InputStream jiois, SchemaType type, XmlOptions options) throws XmlException, IOException {
- return XmlBeans.getContextTypeLoader().parse(jiois, type, getXmlOptions(options));
+ try {
+ Document doc = DocumentHelper.readDocument(jiois);
+ return XmlBeans.getContextTypeLoader().parse(doc.getDocumentElement(), type, getXmlOptions(options));
+ } catch (SAXException e) {
+ throw new IOException("Unable to parse xml bean", e);
+ }
}
public static XmlObject parse(XMLStreamReader xsr, SchemaType type, XmlOptions options) throws XmlException {
@@ -97,7 +125,12 @@ public class POIXMLTypeLoader {
}
public static XmlObject parse(Reader jior, SchemaType type, XmlOptions options) throws XmlException, IOException {
- return XmlBeans.getContextTypeLoader().parse(jior, type, getXmlOptions(options));
+ try {
+ Document doc = DocumentHelper.readDocument(new InputSource(jior));
+ return XmlBeans.getContextTypeLoader().parse(doc.getDocumentElement(), type, getXmlOptions(options));
+ } catch (SAXException e) {
+ throw new XmlException("Unable to parse xml bean", e);
+ }
}
public static XmlObject parse(Node node, SchemaType type, XmlOptions options) throws XmlException {
@@ -107,8 +140,8 @@ public class POIXMLTypeLoader {
public static XmlObject parse(XMLInputStream xis, SchemaType type, XmlOptions options) throws XmlException, XMLStreamException {
return XmlBeans.getContextTypeLoader().parse(xis, type, getXmlOptions(options));
}
-
- public static XMLInputStream newValidatingXMLInputStream ( XMLInputStream xis, SchemaType type, XmlOptions options ) throws XmlException, XMLStreamException {
+
+ public static XMLInputStream newValidatingXMLInputStream(XMLInputStream xis, SchemaType type, XmlOptions options) throws XmlException, XMLStreamException {
return XmlBeans.getContextTypeLoader().newValidatingXMLInputStream(xis, type, getXmlOptions(options));
}
}
diff --git a/fine-poi/src/com/fr/third/v2/org/apache/poi/util/DocumentHelper.java b/fine-poi/src/com/fr/third/v2/org/apache/poi/util/DocumentHelper.java
index f6d7b5bb1..d9bba2eb8 100644
--- a/fine-poi/src/com/fr/third/v2/org/apache/poi/util/DocumentHelper.java
+++ b/fine-poi/src/com/fr/third/v2/org/apache/poi/util/DocumentHelper.java
@@ -29,12 +29,55 @@ import javax.xml.stream.events.Namespace;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.xml.sax.ErrorHandler;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
public final class DocumentHelper {
private static POILogger logger = POILogFactory.getLogger(DocumentHelper.class);
- private DocumentHelper() {}
+ private DocumentHelper() {
+ }
+
+ private static class DocHelperErrorHandler implements ErrorHandler {
+
+ public void warning(SAXParseException exception) throws SAXException {
+ printError(POILogger.WARN, exception);
+ }
+
+ public void error(SAXParseException exception) throws SAXException {
+ printError(POILogger.ERROR, exception);
+ }
+
+ public void fatalError(SAXParseException exception) throws SAXException {
+ printError(POILogger.FATAL, exception);
+ throw exception;
+ }
+
+ /**
+ * Prints the error message.
+ */
+ private void printError(int type, SAXParseException ex) {
+ StringBuilder sb = new StringBuilder();
+
+ String systemId = ex.getSystemId();
+ if (systemId != null) {
+ int index = systemId.lastIndexOf('/');
+ if (index != -1)
+ systemId = systemId.substring(index + 1);
+ sb.append(systemId);
+ }
+ sb.append(':');
+ sb.append(ex.getLineNumber());
+ sb.append(':');
+ sb.append(ex.getColumnNumber());
+ sb.append(": ");
+ sb.append(ex.getMessage());
+
+ logger.log(type, sb.toString(), ex);
+ }
+ }
/**
* Creates a new document builder, with sensible defaults
@@ -43,6 +86,7 @@ public final class DocumentHelper {
try {
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
documentBuilder.setEntityResolver(SAXHelper.IGNORING_ENTITY_RESOLVER);
+ documentBuilder.setErrorHandler(new DocHelperErrorHandler());
return documentBuilder;
} catch (ParserConfigurationException e) {
throw new IllegalStateException("cannot create a DocumentBuilder", e);
@@ -50,6 +94,7 @@ public final class DocumentHelper {
}
private static final DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
+
static {
documentBuilderFactory.setNamespaceAware(true);
documentBuilderFactory.setValidating(false);
@@ -66,10 +111,10 @@ public final class DocumentHelper {
logger.log(POILogger.WARN, "Cannot set SAX feature because outdated XML parser in classpath", feature, ame);
}
}
-
+
private static void trySetXercesSecurityManager(DocumentBuilderFactory documentBuilderFactory) {
// Try built-in JVM one first, standalone if not
- for (String securityManagerClassName : new String[] {
+ for (String securityManagerClassName : new String[]{
"com.sun.org.apache.xerces.internal.util.SecurityManager",
"org.apache.xerces.util.SecurityManager"
}) {
@@ -89,13 +134,25 @@ public final class DocumentHelper {
/**
* Parses the given stream via the default (sensible)
* DocumentBuilder
+ *
* @param inp Stream to read the XML data from
- * @return the parsed Document
+ * @return the parsed Document
*/
public static Document readDocument(InputStream inp) throws IOException, SAXException {
return newDocumentBuilder().parse(inp);
}
+ /**
+ * Parses the given stream via the default (sensible)
+ * DocumentBuilder
+ *
+ * @param inp sax source to read the XML data from
+ * @return the parsed Document
+ */
+ public static Document readDocument(InputSource inp) throws IOException, SAXException {
+ return newDocumentBuilder().parse(inp);
+ }
+
// must only be used to create empty documents, do not use it for parsing!
private static final DocumentBuilder documentBuilderSingleton = newDocumentBuilder();
diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/jobs/ee/ejb/EJB3InvokerJob.java b/fine-quartz/src/com/fr/third/v2/org/quartz/jobs/ee/ejb/EJB3InvokerJob.java
deleted file mode 100644
index b24a16182..000000000
--- a/fine-quartz/src/com/fr/third/v2/org/quartz/jobs/ee/ejb/EJB3InvokerJob.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.fr.third.v2.org.quartz.jobs.ee.ejb;
-
-import java.lang.reflect.InvocationTargetException;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import com.fr.third.v2.org.quartz.JobDataMap;
-import com.fr.third.v2.org.quartz.JobExecutionContext;
-import com.fr.third.v2.org.quartz.JobExecutionException;
-
-/**
- *
- * A Job that invokes a method on an EJB3.
- *
- *
- *
- * Expects the properties corresponding to the following keys to be in the
- * JobDataMap when it executes:
- *
- * EJB_JNDI_NAME_KEY- the JNDI name (location) of the EJB's
- * home interface.EJB_METHOD_KEY- the name of the method to invoke on the EJB.
- * EJB_ARGS_KEY- an Object[] of the args to pass to the method
- * (optional, if left out, there are no arguments).EJB_ARG_TYPES_KEY- an Class[] of the types of the args to
- * pass to the method (optional, if left out, the types will be derived by
- * calling getClass() on each of the arguments).
- *
- * The following keys can also be used at need:
- *
- * INITIAL_CONTEXT_FACTORY - the context factory used to build
- * the context.PROVIDER_URL - the name of the environment property for
- * specifying configuration information for the service provider to use.
- *
- *
- *
- * The result of the EJB method invocation will be available to
- * Job/TriggerListeners via
- * {@link com.fr.third.v2.org.quartz.JobExecutionContext#getResult()}.
- *
- *
- * @author hhuynh
- * @see {@link EJBInvokerJob}
- */
-public class EJB3InvokerJob extends EJBInvokerJob {
-
- @Override
- public void execute(JobExecutionContext context)
- throws JobExecutionException {
- JobDataMap dataMap = context.getMergedJobDataMap();
-
- String ejb = dataMap.getString(EJB_JNDI_NAME_KEY);
- String method = dataMap.getString(EJB_METHOD_KEY);
-
- Object[] arguments = (Object[]) dataMap.get(EJB_ARGS_KEY);
- if (arguments == null) {
- arguments = new Object[0];
- }
- if (ejb == null) {
- throw new JobExecutionException("must specify EJB_JNDI_NAME_KEY");
- }
- if (method == null) {
- throw new JobExecutionException("must specify EJB_METHOD_KEY");
- }
-
- InitialContext jndiContext = null;
- Object value = null;
- try {
- try {
- jndiContext = getInitialContext(dataMap);
- value = jndiContext.lookup(ejb);
- } catch (NamingException ne) {
- throw new JobExecutionException(ne);
- }
-
- Class[] argTypes = (Class[]) dataMap.get(EJB_ARG_TYPES_KEY);
- if (argTypes == null) {
- argTypes = new Class[arguments.length];
- for (int i = 0; i < arguments.length; i++) {
- argTypes[i] = arguments[i].getClass();
- }
- }
-
- try {
- Object returnValue = value.getClass()
- .getMethod(method, argTypes).invoke(value, arguments);
- context.setResult(returnValue);
- } catch (IllegalAccessException iae) {
- throw new JobExecutionException(iae);
- } catch (InvocationTargetException ite) {
- throw new JobExecutionException(ite.getTargetException());
- } catch (NoSuchMethodException nsme) {
- throw new JobExecutionException(nsme);
- }
- } finally {
- if (jndiContext != null) {
- try {
- jndiContext.close();
- } catch (Exception e) {
- // ignored
- }
- }
- }
- }
-}
diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/jobs/ee/ejb/EJBInvokerJob.java b/fine-quartz/src/com/fr/third/v2/org/quartz/jobs/ee/ejb/EJBInvokerJob.java
deleted file mode 100644
index 68d5ba7a2..000000000
--- a/fine-quartz/src/com/fr/third/v2/org/quartz/jobs/ee/ejb/EJBInvokerJob.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*
- * All content copyright Terracotta, Inc., unless otherwise indicated. All rights reserved.
- *
- * 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 com.fr.third.v2.org.quartz.jobs.ee.ejb;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-import java.util.Hashtable;
-
-import javax.ejb.EJBHome;
-import javax.ejb.EJBMetaData;
-import javax.ejb.EJBObject;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-
-import com.fr.third.v2.org.quartz.Job;
-import com.fr.third.v2.org.quartz.JobDataMap;
-import com.fr.third.v2.org.quartz.JobExecutionContext;
-import com.fr.third.v2.org.quartz.JobExecutionException;
-
-/**
- *
- * A Job that invokes a method on an EJB.
- *
- *
- *
- * Expects the properties corresponding to the following keys to be in the
- * JobDataMap when it executes:
- *
- * EJB_JNDI_NAME_KEY- the JNDI name (location) of the
- * EJB's home interface.EJB_METHOD_KEY- the name of the method to invoke on the
- * EJB.EJB_ARGS_KEY- an Object[] of the args to pass to the
- * method (optional, if left out, there are no arguments).EJB_ARG_TYPES_KEY- an Class[] of the types of the args to
- * pass to the method (optional, if left out, the types will be derived by
- * calling getClass() on each of the arguments).
- *
- * The following keys can also be used at need:
- *
- * INITIAL_CONTEXT_FACTORY - the context factory used to
- * build the context.PROVIDER_URL - the name of the environment property
- * for specifying configuration information for the service provider to use.
- *
- *
- *
- *
- * The result of the EJB method invocation will be available to
- * Job/TriggerListeners via
- * {@link com.fr.third.v2.org.quartz.JobExecutionContext#getResult()}.
- *
- *
- * @author Andrew Collins
- * @author James House
- * @author Joel Shellman
- * @author Chris Bonham
- */
-public class EJBInvokerJob implements Job {
-
- /*
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * Constants.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
- public static final String EJB_JNDI_NAME_KEY = "ejb";
-
- public static final String EJB_METHOD_KEY = "method";
-
- public static final String EJB_ARG_TYPES_KEY = "argTypes";
-
- public static final String EJB_ARGS_KEY = "args";
-
- public static final String INITIAL_CONTEXT_FACTORY = "java.naming.factory.initial";
-
- public static final String PROVIDER_URL = "java.naming.provider.url";
-
- public static final String PRINCIPAL = "java.naming.security.principal";
-
- public static final String CREDENTIALS = "java.naming.security.credentials";
-
-
- /*
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * Constructors.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
- public EJBInvokerJob() {
- // nothing
- }
-
- /*
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- * Interface.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
- public void execute(JobExecutionContext context)
- throws JobExecutionException {
- JobDataMap dataMap = context.getMergedJobDataMap();
-
- String ejb = dataMap.getString(EJB_JNDI_NAME_KEY);
- String method = dataMap.getString(EJB_METHOD_KEY);
- Object[] arguments = (Object[]) dataMap.get(EJB_ARGS_KEY);
- if (arguments == null) {
- arguments = new Object[0];
- }
-
- if (ejb == null) {
- // must specify remote home
- throw new JobExecutionException();
- }
-
- InitialContext jndiContext = null;
-
- // get initial context
- try {
- jndiContext = getInitialContext(dataMap);
- } catch (NamingException ne) {
- throw new JobExecutionException(ne);
- }
-
- try {
- Object value = null;
-
- // locate home interface
- try {
- value = jndiContext.lookup(ejb);
- } catch (NamingException ne) {
- throw new JobExecutionException(ne);
- }
-
- // get home interface
- EJBHome ejbHome = (EJBHome) PortableRemoteObject.narrow(value,
- EJBHome.class);
-
- // get meta data
- EJBMetaData metaData = null;
-
- try {
- metaData = ejbHome.getEJBMetaData();
- } catch (RemoteException re) {
- throw new JobExecutionException(re);
- }
-
- // get home interface class
- Class homeClass = metaData.getHomeInterfaceClass();
-
- // get remote interface class
- Class remoteClass = metaData.getRemoteInterfaceClass();
-
- // get home interface
- ejbHome = (EJBHome) PortableRemoteObject.narrow(ejbHome, homeClass);
-
- Method methodCreate = null;
-
- try {
- // create method 'create()' on home interface
- methodCreate = homeClass.getMethod("create", ((Class[])null));
- } catch (NoSuchMethodException nsme) {
- throw new JobExecutionException(nsme);
- }
-
- // create remote object
- EJBObject remoteObj = null;
-
- try {
- // invoke 'create()' method on home interface
- remoteObj = (EJBObject) methodCreate.invoke(ejbHome, ((Object[])null));
- } catch (IllegalAccessException iae) {
- throw new JobExecutionException(iae);
- } catch (InvocationTargetException ite) {
- throw new JobExecutionException(ite);
- }
-
- // execute user-specified method on remote object
- Method methodExecute = null;
-
- try {
- // create method signature
-
- Class[] argTypes = (Class[]) dataMap.get(EJB_ARG_TYPES_KEY);
- if (argTypes == null) {
- argTypes = new Class[arguments.length];
- for (int i = 0; i < arguments.length; i++) {
- argTypes[i] = arguments[i].getClass();
- }
- }
-
- // get method on remote object
- methodExecute = remoteClass.getMethod(method, argTypes);
- } catch (NoSuchMethodException nsme) {
- throw new JobExecutionException(nsme);
- }
-
- try {
- // invoke user-specified method on remote object
- Object returnObj = methodExecute.invoke(remoteObj, arguments);
-
- // Return any result in the JobExecutionContext so it will be
- // available to Job/TriggerListeners
- context.setResult(returnObj);
- } catch (IllegalAccessException iae) {
- throw new JobExecutionException(iae);
- } catch (InvocationTargetException ite) {
- throw new JobExecutionException(ite);
- }
- } finally {
- // Don't close jndiContext until after method execution because
- // WebLogic requires context to be open to keep the user credentials
- // available. See JIRA Issue: QUARTZ-401
- if (jndiContext != null) {
- try {
- jndiContext.close();
- } catch (NamingException e) {
- // Ignore any errors closing the initial context
- }
- }
- }
- }
-
- protected InitialContext getInitialContext(JobDataMap jobDataMap)
- throws NamingException {
- Hashtable params = new Hashtable(2);
-
- String initialContextFactory =
- jobDataMap.getString(INITIAL_CONTEXT_FACTORY);
- if (initialContextFactory != null) {
- params.put(Context.INITIAL_CONTEXT_FACTORY, initialContextFactory);
- }
-
- String providerUrl = jobDataMap.getString(PROVIDER_URL);
- if (providerUrl != null) {
- params.put(Context.PROVIDER_URL, providerUrl);
- }
-
- String principal = jobDataMap.getString(PRINCIPAL);
- if ( principal != null ) {
- params.put( Context.SECURITY_PRINCIPAL, principal );
- }
-
- String credentials = jobDataMap.getString(CREDENTIALS);
- if ( credentials != null ) {
- params.put( Context.SECURITY_CREDENTIALS, credentials );
- }
-
- return (params.size() == 0) ? new InitialContext() : new InitialContext(params);
- }
-}
\ No newline at end of file
diff --git a/fine-quartz/src/com/fr/third/v2/org/quartz/xml/XMLSchedulingDataProcessor.java b/fine-quartz/src/com/fr/third/v2/org/quartz/xml/XMLSchedulingDataProcessor.java
index b70a3992d..8bd0e53fa 100644
--- a/fine-quartz/src/com/fr/third/v2/org/quartz/xml/XMLSchedulingDataProcessor.java
+++ b/fine-quartz/src/com/fr/third/v2/org/quartz/xml/XMLSchedulingDataProcessor.java
@@ -203,7 +203,7 @@ public class XMLSchedulingDataProcessor implements ErrorHandler {
return XMLConstants.NULL_NS_URI;
}
- public Iterator getPrefixes(String namespaceURI)
+ public Iterator getPrefixes(String namespaceURI)
{
// This method isn't necessary for XPath processing.
throw new UnsupportedOperationException();
diff --git a/fine-spring/src/com/fr/third/springframework/aop/framework/ObjenesisCglibAopProxy.java b/fine-spring/src/com/fr/third/springframework/aop/framework/ObjenesisCglibAopProxy.java
index c26d3d1e5..3f8c40cde 100644
--- a/fine-spring/src/com/fr/third/springframework/aop/framework/ObjenesisCglibAopProxy.java
+++ b/fine-spring/src/com/fr/third/springframework/aop/framework/ObjenesisCglibAopProxy.java
@@ -16,8 +16,8 @@
package com.fr.third.springframework.aop.framework;
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.ObjenesisStd;
+import com.fr.third.org.objenesis.ObjenesisException;
+import com.fr.third.org.objenesis.ObjenesisStd;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import com.fr.third.springframework.cglib.proxy.Callback;
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/Objenesis.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/Objenesis.java
deleted file mode 100644
index 402c72ea2..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/Objenesis.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis;
-
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-
-/**
- * Common interface to all kind of Objenesis objects
- *
- * @author Henri Tremblay
- */
-public interface Objenesis {
-
- /**
- * Will create a new object without any constructor being called
- *
- * @param Type instantiated
- * @param clazz Class to instantiate
- * @return New instance of clazz
- */
- T newInstance(Class clazz);
-
- /**
- * Will pick the best instantiator for the provided class. If you need to create a lot of
- * instances from the same class, it is way more efficient to create them from the same
- * ObjectInstantiator than calling {@link #newInstance(Class)}.
- *
- * @param Type to instantiate
- * @param clazz Class to instantiate
- * @return Instantiator dedicated to the class
- */
- ObjectInstantiator getInstantiatorOf(Class clazz);
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisBase.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisBase.java
deleted file mode 100644
index c34690c95..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisBase.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis;
-
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.strategy.InstantiatorStrategy;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Base class to extend if you want to have a class providing your own default strategy. Can also be
- * instantiated directly.
- *
- * @author Henri Tremblay
- */
-public class ObjenesisBase implements Objenesis {
-
- /** Strategy used by this Objenesi implementation to create classes */
- protected final InstantiatorStrategy strategy;
-
- /** Strategy cache. Key = Class, Value = InstantiatorStrategy */
- protected ConcurrentHashMap> cache;
-
- /**
- * Constructor allowing to pick a strategy and using cache
- *
- * @param strategy Strategy to use
- */
- public ObjenesisBase(InstantiatorStrategy strategy) {
- this(strategy, true);
- }
-
- /**
- * Flexible constructor allowing to pick the strategy and if caching should be used
- *
- * @param strategy Strategy to use
- * @param useCache If {@link ObjectInstantiator}s should be cached
- */
- public ObjenesisBase(InstantiatorStrategy strategy, boolean useCache) {
- if(strategy == null) {
- throw new IllegalArgumentException("A strategy can't be null");
- }
- this.strategy = strategy;
- this.cache = useCache ? new ConcurrentHashMap>() : null;
- }
-
- @Override
- public String toString() {
- return getClass().getName() + " using " + strategy.getClass().getName()
- + (cache == null ? " without" : " with") + " caching";
- }
-
- /**
- * Will create a new object without any constructor being called
- *
- * @param clazz Class to instantiate
- * @return New instance of clazz
- */
- public T newInstance(Class clazz) {
- return getInstantiatorOf(clazz).newInstance();
- }
-
- /**
- * Will pick the best instantiator for the provided class. If you need to create a lot of
- * instances from the same class, it is way more efficient to create them from the same
- * ObjectInstantiator than calling {@link #newInstance(Class)}.
- *
- * @param clazz Class to instantiate
- * @return Instantiator dedicated to the class
- */
- @SuppressWarnings("unchecked")
- public ObjectInstantiator getInstantiatorOf(Class clazz) {
- if(clazz.isPrimitive()) {
- throw new IllegalArgumentException("Primitive types can't be instantiated in Java");
- }
- if(cache == null) {
- return strategy.newInstantiatorOf(clazz);
- }
- ObjectInstantiator instantiator = cache.get(clazz.getName());
- if(instantiator == null) {
- ObjectInstantiator newInstantiator = strategy.newInstantiatorOf(clazz);
- instantiator = cache.putIfAbsent(clazz.getName(), newInstantiator);
- if(instantiator == null) {
- instantiator = newInstantiator;
- }
- }
- return (ObjectInstantiator) instantiator;
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisException.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisException.java
deleted file mode 100644
index 682c45562..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis;
-
-/**
- * Exception thrown by Objenesis. It wraps any instantiation exceptions. Note that this exception is
- * runtime to prevent having to catch it.
- *
- * @author Henri Tremblay
- */
-public class ObjenesisException extends RuntimeException {
-
- private static final long serialVersionUID = -2677230016262426968L;
-
- /**
- * @param msg Error message
- */
- public ObjenesisException(String msg) {
- super(msg);
- }
-
- /**
- * @param cause Wrapped exception. The message will be the one of the cause.
- */
- public ObjenesisException(Throwable cause) {
- super(cause);
- }
-
- /**
- * @param msg Error message
- * @param cause Wrapped exception
- */
- public ObjenesisException(String msg, Throwable cause) {
- super(msg, cause);
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisHelper.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisHelper.java
deleted file mode 100644
index 3d0c81483..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisHelper.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis;
-
-import java.io.Serializable;
-
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-
-/**
- * Use Objenesis in a static way. It is strongly not recommended to use this class.
- *
- * @author Henri Tremblay
- */
-public final class ObjenesisHelper {
-
- private static final Objenesis OBJENESIS_STD = new ObjenesisStd();
-
- private static final Objenesis OBJENESIS_SERIALIZER = new ObjenesisSerializer();
-
- private ObjenesisHelper() {
- }
-
- /**
- * Will create a new object without any constructor being called
- *
- * @param Type instantiated
- * @param clazz Class to instantiate
- * @return New instance of clazz
- */
- public static T newInstance(Class clazz) {
- return OBJENESIS_STD.newInstance(clazz);
- }
-
- /**
- * Will create an object just like it's done by ObjectInputStream.readObject (the default
- * constructor of the first non serializable class will be called)
- *
- * @param Type instantiated
- * @param clazz Class to instantiate
- * @return New instance of clazz
- */
- public static T newSerializableInstance(Class clazz) {
- return (T) OBJENESIS_SERIALIZER.newInstance(clazz);
- }
-
- /**
- * Will pick the best instantiator for the provided class. If you need to create a lot of
- * instances from the same class, it is way more efficient to create them from the same
- * ObjectInstantiator than calling {@link #newInstance(Class)}.
- *
- * @param Type to instantiate
- * @param clazz Class to instantiate
- * @return Instantiator dedicated to the class
- */
- public static ObjectInstantiator getInstantiatorOf(Class clazz) {
- return OBJENESIS_STD.getInstantiatorOf(clazz);
- }
-
- /**
- * Same as {@link #getInstantiatorOf(Class)} but providing an instantiator emulating
- * ObjectInputStream.readObject behavior.
- *
- * @see #newSerializableInstance(Class)
- * @param Type to instantiate
- * @param clazz Class to instantiate
- * @return Instantiator dedicated to the class
- */
- public static ObjectInstantiator getSerializableObjectInstantiatorOf(Class clazz) {
- return OBJENESIS_SERIALIZER.getInstantiatorOf(clazz);
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisSerializer.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisSerializer.java
deleted file mode 100644
index b300c9d15..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisSerializer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis;
-
-import com.fr.third.springframework.aop.objenesis.strategy.SerializingInstantiatorStrategy;
-
-/**
- * Objenesis implementation using the {@link SerializingInstantiatorStrategy}.
- *
- * @author Henri Tremblay
- */
-public class ObjenesisSerializer extends ObjenesisBase {
-
- /**
- * Default constructor using the {@link com.fr.third.springframework.aop.objenesis.strategy.SerializingInstantiatorStrategy}
- */
- public ObjenesisSerializer() {
- super(new SerializingInstantiatorStrategy());
- }
-
- /**
- * Instance using the {@link com.fr.third.springframework.aop.objenesis.strategy.SerializingInstantiatorStrategy} with or without caching
- * {@link com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator}s
- *
- * @param useCache If {@link com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator}s should be cached
- */
- public ObjenesisSerializer(boolean useCache) {
- super(new SerializingInstantiatorStrategy(), useCache);
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisStd.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisStd.java
deleted file mode 100644
index e7c1d3493..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/ObjenesisStd.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis;
-
-import com.fr.third.springframework.aop.objenesis.strategy.StdInstantiatorStrategy;
-
-/**
- * Objenesis implementation using the {@link com.fr.third.springframework.aop.objenesis.strategy.StdInstantiatorStrategy}.
- *
- * @author Henri Tremblay
- */
-public class ObjenesisStd extends ObjenesisBase {
-
- /**
- * Default constructor using the {@link com.fr.third.springframework.aop.objenesis.strategy.StdInstantiatorStrategy}
- */
- public ObjenesisStd() {
- super(new StdInstantiatorStrategy());
- }
-
- /**
- * Instance using the {@link com.fr.third.springframework.aop.objenesis.strategy.StdInstantiatorStrategy} with or without
- * caching {@link com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator}s
- *
- * @param useCache If {@link com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator}s should be cached
- */
- public ObjenesisStd(boolean useCache) {
- super(new StdInstantiatorStrategy(), useCache);
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/ObjectInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/ObjectInstantiator.java
deleted file mode 100644
index c18b2fe1e..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/ObjectInstantiator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator;
-
-/**
- * Instantiates a new object.
- *
- * @author Leonardo Mesquita
- */
-public interface ObjectInstantiator {
-
- /**
- * Returns a new instance of an object. The returned object's class is defined by the
- * implementation.
- *
- * @return A new instance of an object.
- */
- T newInstance();
-
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/SerializationInstantiatorHelper.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/SerializationInstantiatorHelper.java
deleted file mode 100644
index 515b69cbe..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/SerializationInstantiatorHelper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator;
-
-import java.io.Serializable;
-
-/**
- * Helper for common serialization-compatible instantiation functions
- *
- * @author Leonardo Mesquita
- */
-public class SerializationInstantiatorHelper {
-
- /**
- * Returns the first non-serializable superclass of a given class. According to Java Object
- * Serialization Specification, objects read from a stream are initialized by calling an
- * accessible no-arg constructor from the first non-serializable superclass in the object's
- * hierarchy, allowing the state of non-serializable fields to be correctly initialized.
- *
- * @param Type to instantiate
- * @param type Serializable class for which the first non-serializable superclass is to be found
- * @return The first non-serializable superclass of 'type'.
- * @see Serializable
- */
- public static Class getNonSerializableSuperClass(Class type) {
- Class result = type;
- while(Serializable.class.isAssignableFrom(result)) {
- result = result.getSuperclass();
- if(result == null) {
- throw new Error("Bad class hierarchy: No non-serializable parents");
- }
- }
- return result;
-
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/Android10Instantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/Android10Instantiator.java
deleted file mode 100644
index 5795e702b..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/Android10Instantiator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.android;
-
-import java.io.ObjectInputStream;
-import java.lang.reflect.Method;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiator for Android API level 10 and lover which creates objects without driving their
- * constructors, using internal methods on the Dalvik implementation of
- * {@link ObjectInputStream}.
- *
- * @author Piotr 'Qertoip' Włodarek
- */
-@Instantiator(Typology.STANDARD)
-public class Android10Instantiator implements ObjectInstantiator {
- private final Class type;
- private final Method newStaticMethod;
-
- public Android10Instantiator(Class type) {
- this.type = type;
- newStaticMethod = getNewStaticMethod();
- }
-
- public T newInstance() {
- try {
- return type.cast(newStaticMethod.invoke(null, type, Object.class));
- }
- catch(Exception e) {
- throw new ObjenesisException(e);
- }
- }
-
- private static Method getNewStaticMethod() {
- try {
- Method newStaticMethod = ObjectInputStream.class.getDeclaredMethod(
- "newInstance", Class.class, Class.class);
- newStaticMethod.setAccessible(true);
- return newStaticMethod;
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- }
-
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/Android17Instantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/Android17Instantiator.java
deleted file mode 100644
index 36d9b8b0c..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/Android17Instantiator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.android;
-
-import java.io.ObjectStreamClass;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiator for Android API level 11 to 17 which creates objects without driving their
- * constructors, using internal methods on the Dalvik implementation of {@link ObjectStreamClass}.
- *
- * @author Ian Parkinson (Google Inc.)
- */
-@Instantiator(Typology.STANDARD)
-public class Android17Instantiator implements ObjectInstantiator {
- private final Class type;
- private final Method newInstanceMethod;
- private final Integer objectConstructorId;
-
- public Android17Instantiator(Class type) {
- this.type = type;
- newInstanceMethod = getNewInstanceMethod();
- objectConstructorId = findConstructorIdForJavaLangObjectConstructor();
- }
-
- public T newInstance() {
- try {
- return type.cast(newInstanceMethod.invoke(null, type, objectConstructorId));
- }
- catch(Exception e) {
- throw new ObjenesisException(e);
- }
- }
-
- private static Method getNewInstanceMethod() {
- try {
- Method newInstanceMethod = ObjectStreamClass.class.getDeclaredMethod(
- "newInstance", Class.class, Integer.TYPE);
- newInstanceMethod.setAccessible(true);
- return newInstanceMethod;
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- }
-
- private static Integer findConstructorIdForJavaLangObjectConstructor() {
- try {
- Method newInstanceMethod = ObjectStreamClass.class.getDeclaredMethod(
- "getConstructorId", Class.class);
- newInstanceMethod.setAccessible(true);
-
- return (Integer) newInstanceMethod.invoke(null, Object.class);
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- catch(IllegalAccessException e) {
- throw new ObjenesisException(e);
- }
- catch(InvocationTargetException e) {
- throw new ObjenesisException(e);
- }
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/Android18Instantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/Android18Instantiator.java
deleted file mode 100644
index 81957ace2..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/Android18Instantiator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.android;
-
-import java.io.ObjectStreamClass;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiator for Android API leve 18 and higher. Same as the version 17 but the
- * newInstance now takes a long in parameter
- *
- * @author Henri Tremblay
- */
-@Instantiator(Typology.STANDARD)
-public class Android18Instantiator implements ObjectInstantiator {
- private final Class type;
- private final Method newInstanceMethod;
- private final Long objectConstructorId;
-
- public Android18Instantiator(Class type) {
- this.type = type;
- newInstanceMethod = getNewInstanceMethod();
- objectConstructorId = findConstructorIdForJavaLangObjectConstructor();
- }
-
- public T newInstance() {
- try {
- return type.cast(newInstanceMethod.invoke(null, type, objectConstructorId));
- }
- catch(Exception e) {
- throw new ObjenesisException(e);
- }
- }
-
- private static Method getNewInstanceMethod() {
- try {
- Method newInstanceMethod = ObjectStreamClass.class.getDeclaredMethod("newInstance",
- Class.class, Long.TYPE);
- newInstanceMethod.setAccessible(true);
- return newInstanceMethod;
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- }
-
- private static Long findConstructorIdForJavaLangObjectConstructor() {
- try {
- Method newInstanceMethod = ObjectStreamClass.class.getDeclaredMethod("getConstructorId",
- Class.class);
- newInstanceMethod.setAccessible(true);
-
- return (Long) newInstanceMethod.invoke(null, Object.class);
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- catch(IllegalAccessException e) {
- throw new ObjenesisException(e);
- }
- catch(InvocationTargetException e) {
- throw new ObjenesisException(e);
- }
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/AndroidSerializationInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/AndroidSerializationInstantiator.java
deleted file mode 100644
index 6dd9a25d2..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/android/AndroidSerializationInstantiator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.android;
-
-import java.io.ObjectStreamClass;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * {@link ObjectInstantiator} for Android which creates objects using the constructor from the first
- * non-serializable parent class constructor, using internal methods on the Dalvik implementation of
- * {@link ObjectStreamClass}.
- *
- * @author Ian Parkinson (Google Inc.)
- */
-@Instantiator(Typology.SERIALIZATION)
-public class AndroidSerializationInstantiator implements ObjectInstantiator {
- private final Class type;
- private final ObjectStreamClass objectStreamClass;
- private final Method newInstanceMethod;
-
- public AndroidSerializationInstantiator(Class type) {
- this.type = type;
- newInstanceMethod = getNewInstanceMethod();
- Method m = null;
- try {
- m = ObjectStreamClass.class.getMethod("lookupAny", Class.class);
- } catch (NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- try {
- objectStreamClass = (ObjectStreamClass) m.invoke(null, type);
- } catch (IllegalAccessException e) {
- throw new ObjenesisException(e);
- } catch (InvocationTargetException e) {
- throw new ObjenesisException(e);
- }
- }
-
- public T newInstance() {
- try {
- return type.cast(newInstanceMethod.invoke(objectStreamClass, type));
- }
- catch(IllegalAccessException e) {
- throw new ObjenesisException(e);
- }
- catch(IllegalArgumentException e) {
- throw new ObjenesisException(e);
- }
- catch(InvocationTargetException e) {
- throw new ObjenesisException(e);
- }
- }
-
- private static Method getNewInstanceMethod() {
- try {
- Method newInstanceMethod = ObjectStreamClass.class.getDeclaredMethod(
- "newInstance", Class.class);
- newInstanceMethod.setAccessible(true);
- return newInstanceMethod;
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/annotations/Instantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/annotations/Instantiator.java
deleted file mode 100644
index de8a7c8b0..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/annotations/Instantiator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Denote that the class in an instantiator of a given type
- *
- * @author Henri Tremblay
- */
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Instantiator {
-
- /**
- * @return type of instantiator
- */
- Typology value();
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/annotations/Typology.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/annotations/Typology.java
deleted file mode 100644
index 2e2512768..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/annotations/Typology.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.annotations;
-
-/**
- * Possible types of instantiator
- * @author Henri Tremblay
- */
-public enum Typology {
- /**
- * Mark an instantiator used for standard instantiation (not calling a constructor).
- */
- STANDARD,
-
- /**
- * Mark an instantiator used for serialization.
- */
- SERIALIZATION,
-
- /**
- * Mark an instantiator that doesn't behave like a {@link #STANDARD} nor a {@link #SERIALIZATION} (e.g. calls a constructor, fails
- * all the time, etc.)
- */
- NOT_COMPLIANT,
-
- /**
- * No type specified on the instantiator class
- */
- UNKNOWN
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/AccessibleInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/AccessibleInstantiator.java
deleted file mode 100644
index 759538927..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/AccessibleInstantiator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.basic;
-
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiates a class by grabbing the no-args constructor, making it accessible and then calling
- * Constructor.newInstance(). Although this still requires no-arg constructors, it can call
- * non-public constructors (if the security manager allows it).
- *
- * @author Joe Walnes
- * @see com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator
- */
-@Instantiator(Typology.NOT_COMPLIANT)
-public class AccessibleInstantiator extends ConstructorInstantiator {
-
- public AccessibleInstantiator(Class type) {
- super(type);
- if(constructor != null) {
- constructor.setAccessible(true);
- }
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ConstructorInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ConstructorInstantiator.java
deleted file mode 100644
index 5a7fbb0dd..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ConstructorInstantiator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.basic;
-
-import java.lang.reflect.Constructor;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiates a class by grabbing the no args constructor and calling Constructor.newInstance().
- * This can deal with default public constructors, but that's about it.
- *
- * @author Joe Walnes
- * @param Type instantiated
- * @see ObjectInstantiator
- */
-@Instantiator(Typology.NOT_COMPLIANT)
-public class ConstructorInstantiator implements ObjectInstantiator {
-
- protected Constructor constructor;
-
- public ConstructorInstantiator(Class type) {
- try {
- constructor = type.getDeclaredConstructor((Class[]) null);
- }
- catch(Exception e) {
- throw new ObjenesisException(e);
- }
- }
-
- public T newInstance() {
- try {
- return constructor.newInstance((Object[]) null);
- }
- catch(Exception e) {
- throw new ObjenesisException(e);
- }
- }
-
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/FailingInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/FailingInstantiator.java
deleted file mode 100644
index 9807425ed..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/FailingInstantiator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.basic;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * The instantiator that always throws an exception. Mainly used for tests
- *
- * @author Henri Tremblay
- */
-@Instantiator(Typology.NOT_COMPLIANT)
-public class FailingInstantiator implements ObjectInstantiator {
-
- public FailingInstantiator(Class type) {
- }
-
- /**
- * @return Always throwing an exception
- */
- public T newInstance() {
- throw new ObjenesisException("Always failing");
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/NewInstanceInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/NewInstanceInstantiator.java
deleted file mode 100644
index d7e0c730d..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/NewInstanceInstantiator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.basic;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * The simplest instantiator - simply calls Class.newInstance(). This can deal with default public
- * constructors, but that's about it.
- *
- * @author Joe Walnes
- * @see ObjectInstantiator
- */
-@Instantiator(Typology.NOT_COMPLIANT)
-public class NewInstanceInstantiator implements ObjectInstantiator {
-
- private final Class type;
-
- public NewInstanceInstantiator(Class type) {
- this.type = type;
- }
-
- public T newInstance() {
- try {
- return type.newInstance();
- }
- catch(Exception e) {
- throw new ObjenesisException(e);
- }
- }
-
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/NullInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/NullInstantiator.java
deleted file mode 100644
index 24960ab3c..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/NullInstantiator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.basic;
-
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * The instantiator that always return a null instance
- *
- * @author Henri Tremblay
- */
-@Instantiator(Typology.NOT_COMPLIANT)
-public class NullInstantiator implements ObjectInstantiator {
-
- public NullInstantiator(Class type) {
- }
-
- /**
- * @return Always null
- */
- public T newInstance() {
- return null;
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ObjectInputStreamInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ObjectInputStreamInstantiator.java
deleted file mode 100644
index ee1aa4dc0..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ObjectInputStreamInstantiator.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.basic;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.NotSerializableException;
-import java.io.ObjectInputStream;
-import java.io.ObjectStreamClass;
-import java.io.ObjectStreamConstants;
-import java.io.Serializable;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiates a class by using a dummy input stream that always feeds data for an empty object of
- * the same kind. NOTE: This instantiator may not work properly if the class being instantiated
- * defines a "readResolve" method, since it may return objects that have been returned previously
- * (i.e., there's no guarantee that the returned object is a new one), or even objects from a
- * completely different class.
- *
- * @author Leonardo Mesquita
- * @see com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator
- */
-@Instantiator(Typology.SERIALIZATION)
-public class ObjectInputStreamInstantiator implements ObjectInstantiator {
- private static class MockStream extends InputStream {
-
- private int pointer;
- private byte[] data;
- private int sequence;
- private static final int[] NEXT = new int[] {1, 2, 2};
- private byte[][] buffers;
-
- private final byte[] FIRST_DATA;
- private static byte[] HEADER;
- private static byte[] REPEATING_DATA;
-
- static {
- initialize();
- }
-
- private static void initialize() {
- try {
- ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- DataOutputStream dout = new DataOutputStream(byteOut);
- dout.writeShort(ObjectStreamConstants.STREAM_MAGIC);
- dout.writeShort(ObjectStreamConstants.STREAM_VERSION);
- HEADER = byteOut.toByteArray();
-
- byteOut = new ByteArrayOutputStream();
- dout = new DataOutputStream(byteOut);
-
- dout.writeByte(ObjectStreamConstants.TC_OBJECT);
- dout.writeByte(ObjectStreamConstants.TC_REFERENCE);
- dout.writeInt(ObjectStreamConstants.baseWireHandle);
- REPEATING_DATA = byteOut.toByteArray();
- }
- catch(IOException e) {
- throw new Error("IOException: " + e.getMessage());
- }
-
- }
-
- public MockStream(Class clazz) {
- this.pointer = 0;
- this.sequence = 0;
- this.data = HEADER;
-
- // (byte) TC_OBJECT
- // (byte) TC_CLASSDESC
- // (short length)
- // (byte * className.length)
- // (long)serialVersionUID
- // (byte) SC_SERIALIZABLE
- // (short)0
- // TC_ENDBLOCKDATA
- // TC_NULL
- ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
- DataOutputStream dout = new DataOutputStream(byteOut);
- try {
- dout.writeByte(ObjectStreamConstants.TC_OBJECT);
- dout.writeByte(ObjectStreamConstants.TC_CLASSDESC);
- dout.writeUTF(clazz.getName());
- dout.writeLong(ObjectStreamClass.lookup(clazz).getSerialVersionUID());
- dout.writeByte(ObjectStreamConstants.SC_SERIALIZABLE);
- dout.writeShort((short) 0); // Zero fields
- dout.writeByte(ObjectStreamConstants.TC_ENDBLOCKDATA);
- dout.writeByte(ObjectStreamConstants.TC_NULL);
- }
- catch(IOException e) {
- throw new Error("IOException: " + e.getMessage());
- }
- this.FIRST_DATA = byteOut.toByteArray();
- buffers = new byte[][] {HEADER, FIRST_DATA, REPEATING_DATA};
- }
-
- private void advanceBuffer() {
- pointer = 0;
- sequence = NEXT[sequence];
- data = buffers[sequence];
- }
-
- @Override
- public int read() throws IOException {
- int result = data[pointer++];
- if(pointer >= data.length) {
- advanceBuffer();
- }
-
- return result;
- }
-
- @Override
- public int available() throws IOException {
- return Integer.MAX_VALUE;
- }
-
- @Override
- public int read(byte[] b, int off, int len) throws IOException {
- int left = len;
- int remaining = data.length - pointer;
-
- while(remaining <= left) {
- System.arraycopy(data, pointer, b, off, remaining);
- off += remaining;
- left -= remaining;
- advanceBuffer();
- remaining = data.length - pointer;
- }
- if(left > 0) {
- System.arraycopy(data, pointer, b, off, left);
- pointer += left;
- }
-
- return len;
- }
- }
-
- private ObjectInputStream inputStream;
-
- public ObjectInputStreamInstantiator(Class clazz) {
- if(Serializable.class.isAssignableFrom(clazz)) {
- try {
- this.inputStream = new ObjectInputStream(new MockStream(clazz));
- }
- catch(IOException e) {
- throw new Error("IOException: " + e.getMessage());
- }
- }
- else {
- throw new ObjenesisException(new NotSerializableException(clazz + " not serializable"));
- }
- }
-
- @SuppressWarnings("unchecked")
- public T newInstance() {
- try {
- return (T) inputStream.readObject();
- }
- catch(ClassNotFoundException e) {
- throw new Error("ClassNotFoundException: " + e.getMessage());
- }
- catch(Exception e) {
- throw new ObjenesisException(e);
- }
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ObjectStreamClassInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ObjectStreamClassInstantiator.java
deleted file mode 100644
index 74d11c8f4..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ObjectStreamClassInstantiator.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.basic;
-
-import java.io.ObjectStreamClass;
-import java.lang.reflect.Method;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiates a class by using reflection to make a call to private method
- * ObjectStreamClass.newInstance, present in many JVM implementations. This instantiator will create
- * classes in a way compatible with serialization, calling the first non-serializable superclass'
- * no-arg constructor.
- *
- * @author Leonardo Mesquita
- * @see ObjectInstantiator
- * @see java.io.Serializable
- */
-@Instantiator(Typology.SERIALIZATION)
-public class ObjectStreamClassInstantiator implements ObjectInstantiator {
-
- private static Method newInstanceMethod;
-
- private static void initialize() {
- if(newInstanceMethod == null) {
- try {
- newInstanceMethod = ObjectStreamClass.class.getDeclaredMethod("newInstance");
- newInstanceMethod.setAccessible(true);
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- }
- }
-
- private final ObjectStreamClass objStreamClass;
-
- public ObjectStreamClassInstantiator(Class type) {
- initialize();
- objStreamClass = ObjectStreamClass.lookup(type);
- }
-
- @SuppressWarnings("unchecked")
- public T newInstance() {
-
- try {
- return (T) newInstanceMethod.invoke(objStreamClass);
- }
- catch(Exception e) {
- throw new ObjenesisException(e);
- }
-
- }
-
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ProxyingInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ProxyingInstantiator.java
deleted file mode 100644
index 30f55ae59..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/basic/ProxyingInstantiator.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.basic;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-import com.fr.third.springframework.aop.objenesis.instantiator.util.ClassDefinitionUtils;
-
-import static com.fr.third.springframework.aop.objenesis.instantiator.util.ClassDefinitionUtils.*;
-
-/**
- * This instantiator creates a class by dynamically extending it. It will skip the call to the parent constructor
- * in the bytecode. So that the constructor is indeed not called but you however instantiate a child class, not
- * the actual class. The class loader will normally throw a {@code VerifyError} is you do that. However, using
- * {@code -Xverify:none} should make it work
- *
- * @author Henri Tremblay
- */
-@Instantiator(Typology.STANDARD)
-public class ProxyingInstantiator implements ObjectInstantiator {
-
- private static final int INDEX_CLASS_THIS = 1;
- private static final int INDEX_CLASS_SUPERCLASS = 2;
- private static final int INDEX_UTF8_CONSTRUCTOR_NAME = 3;
- private static final int INDEX_UTF8_CONSTRUCTOR_DESC = 4;
- private static final int INDEX_UTF8_CODE_ATTRIBUTE = 5;
- private static final int INDEX_UTF8_CLASS = 7;
- private static final int INDEX_UTF8_SUPERCLASS = 8;
-
- private static int CONSTANT_POOL_COUNT = 9;
-
- private static final byte[] CODE = { OPS_aload_0, OPS_return};
- private static final int CODE_ATTRIBUTE_LENGTH = 12 + CODE.length;
-
- private static final String SUFFIX = "$$$Objenesis";
-
- private static final String CONSTRUCTOR_NAME = "";
- private static final String CONSTRUCTOR_DESC = "()V";
-
- private final Class newType;
-
- public ProxyingInstantiator(Class type) {
-
- byte[] classBytes = writeExtendingClass(type, SUFFIX);
-
- try {
- newType = ClassDefinitionUtils.defineClass(type.getName() + SUFFIX, classBytes, type.getClassLoader());
- } catch (Exception e) {
- throw new ObjenesisException(e);
- }
- }
-
- @SuppressWarnings("unchecked")
- public T newInstance() {
- try {
- return (T) newType.newInstance();
- } catch (InstantiationException e) {
- throw new ObjenesisException(e);
- } catch (IllegalAccessException e) {
- throw new ObjenesisException(e);
- }
- }
-
- /**
- * Will generate the bytes for a class extending the type passed in parameter. This class will
- * only have an empty default constructor
- *
- * @param type type to extend
- * @param suffix the suffix appended to the class name to create the next extending class name
- * @return the byte for the class
- * @throws ObjenesisException is something goes wrong
- */
- private static byte[] writeExtendingClass(Class type, String suffix) {
- String parentClazz = classNameToInternalClassName(type.getName());
- String clazz = parentClazz + suffix;
-
- DataOutputStream in = null;
- ByteArrayOutputStream bIn = new ByteArrayOutputStream(1000); // 1000 should be large enough to fit the entire class
- try {
- in = new DataOutputStream(bIn);
-
- in.write(MAGIC);
- in.write(VERSION);
- in.writeShort(CONSTANT_POOL_COUNT);
-
- // set all the constant pool here
-
- // 1. class
- in.writeByte(CONSTANT_Class);
- in.writeShort(INDEX_UTF8_CLASS);
-
- // 2. super class
- in.writeByte(CONSTANT_Class);
- in.writeShort(INDEX_UTF8_SUPERCLASS);
-
- // 3. default constructor name
- in.writeByte(CONSTANT_Utf8);
- in.writeUTF(CONSTRUCTOR_NAME);
-
- // 4. default constructor description
- in.writeByte(CONSTANT_Utf8);
- in.writeUTF(CONSTRUCTOR_DESC);
-
- // 5. Code
- in.writeByte(CONSTANT_Utf8);
- in.writeUTF("Code");
-
- // 6. Class name
- in.writeByte(CONSTANT_Utf8);
- in.writeUTF("L" + clazz + ";");
-
- // 7. Class name (again)
- in.writeByte(CONSTANT_Utf8);
- in.writeUTF(clazz);
-
- // 8. Superclass name
- in.writeByte(CONSTANT_Utf8);
- in.writeUTF(parentClazz);
-
- // end of constant pool
-
- // access flags: We want public, ACC_SUPER is always there
- in.writeShort(ACC_PUBLIC | ACC_SUPER);
-
- // this class index in the constant pool
- in.writeShort(INDEX_CLASS_THIS);
-
- // super class index in the constant pool
- in.writeShort(INDEX_CLASS_SUPERCLASS);
-
- // interfaces implemented count (we have none)
- in.writeShort(0);
-
- // fields count (we have none)
- in.writeShort(0);
-
- // methods count (we have one: the default constructor)
- in.writeShort(1);
-
- // default constructor method_info
- in.writeShort(ACC_PUBLIC);
- in.writeShort(INDEX_UTF8_CONSTRUCTOR_NAME); // index of the method name ()
- in.writeShort(INDEX_UTF8_CONSTRUCTOR_DESC); // index of the description
- in.writeShort(1); // number of attributes: only one, the code
-
- // code attribute of the default constructor
- in.writeShort(INDEX_UTF8_CODE_ATTRIBUTE);
- in.writeInt(CODE_ATTRIBUTE_LENGTH); // attribute length
- in.writeShort(1); // max_stack
- in.writeShort(1); // max_locals
- in.writeInt(CODE.length); // code length
- in.write(CODE);
- in.writeShort(0); // exception_table_length = 0
- in.writeShort(0); // attributes count = 0, no need to have LineNumberTable and LocalVariableTable
-
- // class attributes
- in.writeShort(0); // none. No need to have a source file attribute
-
-
- } catch (IOException e) {
- throw new ObjenesisException(e);
- } finally {
- if(in != null) {
- try {
- in.close();
- } catch (IOException e) {
- throw new ObjenesisException(e);
- }
- }
- }
-
- return bIn.toByteArray();
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/gcj/GCJInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/gcj/GCJInstantiator.java
deleted file mode 100644
index 9a35db494..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/gcj/GCJInstantiator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.gcj;
-
-import java.lang.reflect.InvocationTargetException;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiates a class by making a call to internal GCJ private methods. It is only supposed to
- * work on GCJ JVMs. This instantiator will not call any constructors.
- *
- * @author Leonardo Mesquita
- * @see com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator
- */
-@Instantiator(Typology.STANDARD)
-public class GCJInstantiator extends GCJInstantiatorBase {
- public GCJInstantiator(Class type) {
- super(type);
- }
-
- @Override
- public T newInstance() {
- try {
- return type.cast(newObjectMethod.invoke(dummyStream, type, Object.class));
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(IllegalAccessException e) {
- throw new ObjenesisException(e);
- }
- catch(InvocationTargetException e) {
- throw new ObjenesisException(e);
- }
- }
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/gcj/GCJInstantiatorBase.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/gcj/GCJInstantiatorBase.java
deleted file mode 100644
index 2390266f1..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/gcj/GCJInstantiatorBase.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.gcj;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.lang.reflect.Method;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-
-/**
- * Base class for GCJ-based instantiators. It initializes reflection access to method
- * ObjectInputStream.newObject, as well as creating a dummy ObjectInputStream to be used as the
- * "this" argument for the method.
- *
- * @author Leonardo Mesquita
- */
-public abstract class GCJInstantiatorBase implements ObjectInstantiator {
- static Method newObjectMethod = null;
- static ObjectInputStream dummyStream;
-
- private static class DummyStream extends ObjectInputStream {
- public DummyStream() throws IOException {
- }
- }
-
- private static void initialize() {
- if(newObjectMethod == null) {
- try {
- newObjectMethod = ObjectInputStream.class.getDeclaredMethod("newObject", new Class[] {
- Class.class, Class.class});
- newObjectMethod.setAccessible(true);
- dummyStream = new DummyStream();
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- catch(IOException e) {
- throw new ObjenesisException(e);
- }
- }
- }
-
- protected final Class type;
-
- public GCJInstantiatorBase(Class type) {
- this.type = type;
- initialize();
- }
-
- public abstract T newInstance();
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/gcj/GCJSerializationInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/gcj/GCJSerializationInstantiator.java
deleted file mode 100644
index 16a4d70ad..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/gcj/GCJSerializationInstantiator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.gcj;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.SerializationInstantiatorHelper;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiates a class by making a call to internal GCJ private methods. It is only supposed to
- * work on GCJ JVMs. This instantiator will create classes in a way compatible with serialization,
- * calling the first non-serializable superclass' no-arg constructor.
- *
- * @author Leonardo Mesquita
- * @see com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator
- */
-@Instantiator(Typology.SERIALIZATION)
-public class GCJSerializationInstantiator extends GCJInstantiatorBase {
- private Class superType;
-
- public GCJSerializationInstantiator(Class type) {
- super(type);
- this.superType = SerializationInstantiatorHelper.getNonSerializableSuperClass(type);
- }
-
- @Override
- public T newInstance() {
- try {
- return type.cast(newObjectMethod.invoke(dummyStream, type, superType));
- }
- catch(Exception e) {
- throw new ObjenesisException(e);
- }
- }
-
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/perc/PercInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/perc/PercInstantiator.java
deleted file mode 100644
index 894193b6a..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/perc/PercInstantiator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.perc;
-
-import java.io.ObjectInputStream;
-import java.lang.reflect.Method;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiates a class by making a call to internal Perc private methods. It is only supposed to
- * work on Perc JVMs. This instantiator will not call any constructors. The code was provided by
- * Aonix Perc support team.
- *
- * @author Henri Tremblay
- * @see com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator
- */
-@Instantiator(Typology.STANDARD)
-public class PercInstantiator implements ObjectInstantiator {
-
- private final Method newInstanceMethod;
-
- private final Object[] typeArgs = new Object[] { null, Boolean.FALSE };
-
- public PercInstantiator(Class type) {
-
- typeArgs[0] = type;
-
- try {
- newInstanceMethod = ObjectInputStream.class.getDeclaredMethod("newInstance", Class.class,
- Boolean.TYPE);
- newInstanceMethod.setAccessible(true);
- }
- catch(RuntimeException e) {
- throw new ObjenesisException(e);
- }
- catch(NoSuchMethodException e) {
- throw new ObjenesisException(e);
- }
- }
-
- @SuppressWarnings("unchecked")
- public T newInstance() {
- try {
- return (T) newInstanceMethod.invoke(null, typeArgs);
- } catch (Exception e) {
- throw new ObjenesisException(e);
- }
- }
-
-}
diff --git a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/perc/PercSerializationInstantiator.java b/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/perc/PercSerializationInstantiator.java
deleted file mode 100644
index ea9ab3acd..000000000
--- a/fine-spring/src/com/fr/third/springframework/aop/objenesis/instantiator/perc/PercSerializationInstantiator.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/**
- * Copyright 2006-2017 the original author or authors.
- *
- * 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 com.fr.third.springframework.aop.objenesis.instantiator.perc;
-
-import java.io.ObjectInputStream;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import com.fr.third.springframework.aop.objenesis.ObjenesisException;
-import com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Instantiator;
-import com.fr.third.springframework.aop.objenesis.instantiator.annotations.Typology;
-
-/**
- * Instantiates a class by making a call to internal Perc private methods. It is only supposed to
- * work on Perc JVMs. This instantiator will create classes in a way compatible with serialization,
- * calling the first non-serializable superclass' no-arg constructor.
- *
- * Based on code provided by Aonix but doesn't work right now
- *
- * @author Henri Tremblay
- * @see com.fr.third.springframework.aop.objenesis.instantiator.ObjectInstantiator
- */
-@Instantiator(Typology.SERIALIZATION)
-public class PercSerializationInstantiator implements ObjectInstantiator {
-
- private Object[] typeArgs;
-
- private final Method newInstanceMethod;
-
- public PercSerializationInstantiator(Class type) {
-
- // Find the first unserializable parent class
- Class unserializableType = type;
-
- while(Serializable.class.isAssignableFrom(unserializableType)) {
- unserializableType = unserializableType.getSuperclass();
- }
-
- try {
- // Get the special Perc method to call
- Class percMethodClass = Class.forName("COM.newmonics.PercClassLoader.Method");
-
- newInstanceMethod = ObjectInputStream.class.getDeclaredMethod("noArgConstruct",
- new Class[] {Class.class, Object.class, percMethodClass});
- newInstanceMethod.setAccessible(true);
-
- // Create invoke params
- Class percClassClass = Class.forName("COM.newmonics.PercClassLoader.PercClass");
- Method getPercClassMethod = percClassClass.getDeclaredMethod("getPercClass", Class.class);
- Object someObject = getPercClassMethod.invoke(null, unserializableType);
- Method findMethodMethod = someObject.getClass().getDeclaredMethod("findMethod",
- new Class[] {String.class});
- Object percMethod = findMethodMethod.invoke(someObject, "