Remove JayceProcessor class

Change-Id: I3e1d1018a5cef2665299f55ef87d9a50942fbbc5

3 files changed, 32 insertions, 58 deletions

diff --git a/jack/src/com/android/jack/jayce/JayceProcessor.java b/jack/src/com/android/jack/jayce/JayceProcessor.java
deleted file mode 100644
index 2e532cf..0000000
--- a/jack/src/com/android/jack/jayce/JayceProcessor.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * 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.android.jack.jayce;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-
-import javax.annotation.Nonnull;
-
-/**
- * Jayce processor.
- */
-public class JayceProcessor {
-
-  @Nonnull
-  protected static Object instantiateConstructorWithParameters(@Nonnull String className,
-      @Nonnull Class<?>[] parameterTypes, @Nonnull Object[] parameterInstances,
-      @Nonnull String version)
-      throws JayceVersionException {
-    Object constructorInstance = null;
-    try {
-      Class<?> jayceReaderClass = Class.forName(className);
-      Constructor<?> constructor = jayceReaderClass.getConstructor(parameterTypes);
-      constructorInstance = constructor.newInstance(parameterInstances);
-    } catch (SecurityException e) {
-      throw new AssertionError("Security issue with Jayce stream");
-    } catch (IllegalArgumentException e) {
-      throw new AssertionError("Illegal argument for Jayce processor for version " + version);
-    } catch (ClassNotFoundException e) {
-      throw new JayceVersionException("Jayce version " + version + " not supported");
-    } catch (NoSuchMethodException e) {
-      throw new AssertionError("Jayce processing method not found for version " + version);
-    } catch (InstantiationException e) {
-      throw new AssertionError("Problem instantiating Jayce processor for version " + version);
-    } catch (IllegalAccessException e) {
-      throw new AssertionError("Problem accessing Jayce processor for version " + version);
-    } catch (InvocationTargetException e) {
-      throw new RuntimeException(e.getCause());
-    }
-    return constructorInstance;
-  }
-}
diff --git a/jack/src/com/android/jack/jayce/JayceReaderFactory.java b/jack/src/com/android/jack/jayce/JayceReaderFactory.java
index 6976e77..43e11a9 100644
--- a/jack/src/com/android/jack/jayce/JayceReaderFactory.java
+++ b/jack/src/com/android/jack/jayce/JayceReaderFactory.java
@@ -28,6 +28,8 @@ import com.android.sched.util.log.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -36,7 +38,7 @@ import javax.annotation.Nonnull;
 /**
  * A factory of {@link JayceInternalReader}.
  */
-public abstract class JayceReaderFactory extends JayceProcessor {
+public abstract class JayceReaderFactory {
 
   @Nonnull
   private static Logger logger = LoggerFactory.getLogger();
@@ -111,4 +113,32 @@ public abstract class JayceReaderFactory extends JayceProcessor {
     }
     return jayceReader;
   }
+
+  @Nonnull
+  private static Object instantiateConstructorWithParameters(@Nonnull String className,
+      @Nonnull Class<?>[] parameterTypes, @Nonnull Object[] parameterInstances,
+      @Nonnull String version)
+      throws JayceVersionException {
+    Object constructorInstance = null;
+    try {
+      Class<?> jayceReaderClass = Class.forName(className);
+      Constructor<?> constructor = jayceReaderClass.getConstructor(parameterTypes);
+      constructorInstance = constructor.newInstance(parameterInstances);
+    } catch (SecurityException e) {
+      throw new AssertionError("Security issue with Jayce stream");
+    } catch (IllegalArgumentException e) {
+      throw new AssertionError("Illegal argument for Jayce processor for version " + version);
+    } catch (ClassNotFoundException e) {
+      throw new JayceVersionException("Jayce version " + version + " not supported");
+    } catch (NoSuchMethodException e) {
+      throw new AssertionError("Jayce processing method not found for version " + version);
+    } catch (InstantiationException e) {
+      throw new AssertionError("Problem instantiating Jayce processor for version " + version);
+    } catch (IllegalAccessException e) {
+      throw new AssertionError("Problem accessing Jayce processor for version " + version);
+    } catch (InvocationTargetException e) {
+      throw new RuntimeException(e.getCause());
+    }
+    return constructorInstance;
+  }
 }
diff --git a/jack/src/com/android/jack/jayce/JayceWriterFactory.java b/jack/src/com/android/jack/jayce/JayceWriterFactory.java
index da4e35c..f4f2c8e 100644
--- a/jack/src/com/android/jack/jayce/JayceWriterFactory.java
+++ b/jack/src/com/android/jack/jayce/JayceWriterFactory.java
@@ -26,7 +26,7 @@ import javax.annotation.Nonnull;
 /**
  * {@link JayceInternalWriter} Factory.
  */
-public abstract class JayceWriterFactory extends JayceProcessor {
+public abstract class JayceWriterFactory {
 
   public static final int DEFAULT_MAJOR_VERSION = 2;