Merge pull request #192 from scottkurz/module-info

Add jakarta.batch API module-info

api/src/main/java/jakarta/batch/runtime/BatchRuntime.java

@@ -21,8 +21,8 @@
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ServiceLoader;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.lang.System.Logger;
+import java.lang.System.Logger.Level;
 
 import jakarta.batch.operations.JobOperator;
 
@@ -34,7 +34,7 @@
 public class BatchRuntime {
 
     private final static String sourceClass = BatchRuntime.class.getName();
-    private final static Logger logger = Logger.getLogger(sourceClass);
+    private final static Logger logger = System.getLogger(sourceClass);
 
 	/**
 	* The getJobOperator factory method returns
@@ -46,8 +46,8 @@ public static JobOperator getJobOperator() {
 		JobOperator operator = null;
 		if (System.getSecurityManager() == null) {
 			for (JobOperator provider : ServiceLoader.load(JobOperator.class)) {
-				if (logger.isLoggable(Level.FINE)) {
-					logger.fine("Loaded JobOperator with class: " + provider.getClass().getCanonicalName());
+				if (logger.isLoggable(Level.DEBUG)) {
+					logger.log(Level.DEBUG, "Loaded JobOperator with class: " + provider.getClass().getCanonicalName());
 				}
 				operator = provider;
 				break;
@@ -59,8 +59,8 @@ public JobOperator run() {
 					ServiceLoader<JobOperator> loader = ServiceLoader.load(JobOperator.class);
 					JobOperator returnVal = null;
 					for (JobOperator provider : loader) {
-						if (logger.isLoggable(Level.FINE)) {
-							logger.fine("Loaded JobOperator with class: " + provider.getClass().getCanonicalName());
+						if (logger.isLoggable(Level.DEBUG)) {
+							logger.log(Level.DEBUG, "Loaded JobOperator with class: " + provider.getClass().getCanonicalName());
 						}
 						// Use first one
 						returnVal = provider;
@@ -74,7 +74,7 @@ public JobOperator run() {
 
 		if (operator == null) {
 			if (logger.isLoggable(Level.WARNING)) {
-				logger.warning("The ServiceLoader was unable to find an implementation for JobOperator. Check classpath for META-INF/services/jakarta.batch.operations.JobOperator file.");
+				logger.log(Level.WARNING, "The ServiceLoader was unable to find an implementation for JobOperator. Check classpath for META-INF/services/jakarta.batch.operations.JobOperator file.");
 			}
 		}
 		return operator;

api/src/main/java/module-info.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2022 International Business Machines Corp. and others
+ * 
+ * See the NOTICE file distributed with this work for additional information
+ * regarding copyright ownership. 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+module jakarta.batch {
+
+    requires static jakarta.cdi;
+    requires transitive static jakarta.inject;
+
+    exports jakarta.batch.api;
+    exports jakarta.batch.api.chunk;
+    exports jakarta.batch.api.chunk.listener;
+    exports jakarta.batch.api.listener;
+    exports jakarta.batch.api.partition;
+    exports jakarta.batch.operations;
+    exports jakarta.batch.runtime;
+    exports jakarta.batch.runtime.context;
+
+    uses jakarta.batch.operations.JobOperator;
+}

api/src/main/resources/jakarta/xml/batch/jobXML_2_0.xsd

@@ -34,7 +34,7 @@
         <xs:documentation>
 
             Defines a decimal type used for versioning documents
-            defined via this scheam.  Intended to be identical
+            defined via this schema.  Intended to be identical
             to the "dewey-versionType" dewey decimal restriction
             type defined in
             https://jakarta.ee/xml/ns/jakartaee/jakartaee_9.xsd

pom.xml

@@ -126,7 +126,7 @@
         <version.java>11</version.java>
 
         <!-- Dependencies -->
-        <version.jakarta.enterprise.jakarta.enterprise.cdi-api>3.0.0</version.jakarta.enterprise.jakarta.enterprise.cdi-api>
+        <version.jakarta.enterprise.jakarta.enterprise.cdi-api>4.0.0.Beta3</version.jakarta.enterprise.jakarta.enterprise.cdi-api>
         <version.jakarta.inject.jakarta.inject-api>2.0.1</version.jakarta.inject.jakarta.inject-api>
 
         <version.org.sonatype.plugins.nexus-staging-maven-plugin>1.6.6</version.org.sonatype.plugins.nexus-staging-maven-plugin>

spec/src/main/asciidoc/batch_programming_model.adoc

@@ -1547,9 +1547,9 @@ enable finer control over parallel processing:
 number of partitions and unique properties for each.
 .. PartitionReducer provides a unit of work demarcation around
 partition processing.
-.. PartitionCollector provides a means for merging interrim results
+.. PartitionCollector provides a means for merging interim results
 from individual partitions.
-.. PartitionAnalyzer provides a means to gather interrim and final
+.. PartitionAnalyzer provides a means to gather interim and final
 results from individual partitions for single point of control
 processing and decision making.