[JBERET-248] NullPointerException when using artifacts with default-p…

…ackage (#79)

* Fixed nullpointer exception when using artifacts with default-package.

* revert parts other than the part of the cause of NPE

jberet-core/src/main/java/org/jberet/creation/AbstractArtifactFactory.java

@@ -54,7 +54,7 @@ protected void doInjection(final Object obj, Class<?> cls,
                              final StepContextImpl stepContext,
                              final Properties batchProps) throws Exception {
         final boolean hasBatchProps = batchProps != null && batchProps.size() > 0;
-        while (cls != null && cls != Object.class && !cls.getPackage().getName().startsWith("javax.batch")) {
+        while (cls != null && cls != Object.class && cls.getPackage() != null && !cls.getPackage().getName().startsWith("javax.batch")) {
             for (final Field f : cls.getDeclaredFields()) {
                 if (!f.isSynthetic()) {
                     Object fieldVal = null;
@@ -96,7 +96,7 @@ protected void doInjection(final Object obj, Class<?> cls,
 
     protected void invokeAnnotatedLifecycleMethod(final Object obj, Class<?> cls, final Class<? extends Annotation> annCls) throws Exception{
         final List<Method> lifecycleMethods = new ArrayList<Method>();
-        while (cls != null && cls != Object.class && !cls.getPackage().getName().startsWith("javax.batch")) {
+        while (cls != null && cls != Object.class && cls.getPackage() != null && !cls.getPackage().getName().startsWith("javax.batch")) {
             final Method[] methods = cls.getDeclaredMethods();
             for (final Method m : methods) {
                 if (m.getAnnotation(annCls) != null) {  //the lifecyle annotation is present

jberet-core/src/test/java/NoPackageBatchlet.java

@@ -0,0 +1,8 @@
+import javax.batch.api.AbstractBatchlet;
+
+public class NoPackageBatchlet extends AbstractBatchlet {
+    @Override
+    public String process() throws Exception {
+        return null;
+    }
+}

jberet-core/src/test/java/org/jberet/creation/AbstractArtifactFactoryTest.java

@@ -0,0 +1,38 @@
+package org.jberet.creation;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class AbstractArtifactFactoryTest {
+
+    private AbstractArtifactFactory factory = new AbstractArtifactFactory() {
+        @Override
+        public Object create(String ref, Class<?> cls, ClassLoader classLoader) throws Exception {
+            return null;
+        }
+
+        @Override
+        public Class<?> getArtifactClass(String ref, ClassLoader classLoader) {
+            return null;
+        }
+    };
+
+    private Class noPackageBatchletClass;
+    private Object noPackageBatchlet;
+
+    @Before
+    public void setup() throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+        noPackageBatchletClass = Class.forName("NoPackageBatchlet");
+        noPackageBatchlet = noPackageBatchletClass.newInstance();
+    }
+
+    @Test
+    public void testDestroyShouldNotFailForDefaultPackage()  {
+        factory.destroy(noPackageBatchlet);
+    }
+
+    @Test
+    public void testDoInjectionShouldNotFailForDefaultPackage() throws Exception {
+        factory.doInjection(noPackageBatchlet, noPackageBatchletClass, null, null, null, null);
+    }
+}