Package renamed: javax -> jakarta

Signed-off-by: Tomas Kraus <Tomas.Kraus@oracle.com>

Author: Tomas-Kraus

api/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -23,12 +23,12 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.5</version>
+        <version>1.0.6-SNAPSHOT</version>
     </parent>
 
     <groupId>jakarta.json.bind</groupId>
     <artifactId>jakarta.json.bind-api</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>JSON-B API</name>
@@ -90,7 +90,7 @@
         <non.final>false</non.final>
         <skip.release.tests>false</skip.release.tests>
         <spec.version>1.1</spec.version>
-        <jakarta.json.version>1.1.5</jakarta.json.version>
+        <jakarta.json.version>2.0-SNAPSHOT</jakarta.json.version>
         <api_package>jakarta.json.bind</api_package>
         <legal.doc.source>${project.basedir}/..</legal.doc.source>
         <vendor.name>Oracle Corporation</vendor.name>

api/src/main/java/javax/json/bind/Jsonb.java renamed to api/src/main/java/jakarta/json/bind/Jsonb.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.bind;
+package jakarta.json.bind;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -30,7 +30,7 @@
  * <li>{@code toJson}: serialize Java objects content tree to JSON input
  * </ul>
  *
- * <p>Instance of this class is created using {@link javax.json.bind.JsonbBuilder JsonbBuilder}
+ * <p>Instance of this class is created using {@link jakarta.json.bind.JsonbBuilder JsonbBuilder}
  * builder methods:</p>
  * <pre>{@code
  * // Example 1 - Creating Jsonb using default JsonbBuilder instance provided by default JsonbProvider
@@ -76,14 +76,14 @@
  * <p><b>Encoding</b></p>
  * <blockquote>
  * In deserialization operations ({@code fromJson}), encoding of JSON data is detected automatically.
- * Use the {@link javax.json.bind.JsonbConfig JsonbConfig} API to configure expected
+ * Use the {@link jakarta.json.bind.JsonbConfig JsonbConfig} API to configure expected
  * input encoding used within deserialization operations. Client applications are
  * expected to supply a valid character encoding as defined in the
  * <a href="http://tools.ietf.org/html/rfc7159">RFC 7159</a> and supported by Java Platform.
  *
  * In serialization operations ({@code toJson}), UTF-8 encoding is used by default
  * for writing JSON data.
- * Use the {@link javax.json.bind.JsonbConfig JsonbConfig} API to configure the
+ * Use the {@link jakarta.json.bind.JsonbConfig JsonbConfig} API to configure the
  * output encoding used within serialization operations. Client applications are
  * expected to supply a valid character encoding as defined in the
  * <a href="http://tools.ietf.org/html/rfc7159">RFC 7159</a> and supported by Java Platform.

api/src/main/java/javax/json/bind/JsonbBuilder.java renamed to api/src/main/java/jakarta/json/bind/JsonbBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,14 +14,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.bind;
+package jakarta.json.bind;
 
-import javax.json.bind.spi.JsonbProvider;
-import javax.json.spi.JsonProvider;
+import jakarta.json.bind.spi.JsonbProvider;
+
+import jakarta.json.spi.JsonProvider;
 
 /**
  * JsonbBuilder class provides the client's entry point to the JSON Binding
- * API. It builds {@link javax.json.bind.Jsonb Jsonb} instances based on all
+ * API. It builds {@link jakarta.json.bind.Jsonb Jsonb} instances based on all
  * parameters and configuration provided before calling {@code build()} method.
  *
  * For most use-cases, only one instance of JsonbBuilder is required within the
@@ -35,10 +36,10 @@ public interface JsonbBuilder {
 
     /**
      * Set configuration which will be set to the newly created
-     * {@link javax.json.bind.Jsonb Jsonb} instance.
+     * {@link jakarta.json.bind.Jsonb Jsonb} instance.
      *
      * @param config
-     *      Configuration for {@link javax.json.bind.Jsonb Jsonb} instance.
+     *      Configuration for {@link jakarta.json.bind.Jsonb Jsonb} instance.
      *
      * @return This {@code JsonbBuilder} instance.
      */
@@ -49,60 +50,60 @@ public interface JsonbBuilder {
      * to be used for all <a href="https://projects.eclipse.org/projects/ee4j.jsonp/">JSON-P</a> related operations.
      *
      * @param jsonpProvider
-     *      {@link javax.json.spi.JsonProvider JsonProvider} instance
+     *      {@link jakarta.json.spi.JsonProvider JsonProvider} instance
      *      to be used by Jsonb to lookup JSON-P implementation.
      *
      * @return This {@code JsonbBuilder} instance.
      */
     JsonbBuilder withProvider(JsonProvider jsonpProvider);
 
     /**
-     * Returns a new instance of {@link javax.json.bind.Jsonb Jsonb} based on the
+     * Returns a new instance of {@link jakarta.json.bind.Jsonb Jsonb} based on the
      * parameters and configuration specified previously in this builder.
      *
-     * @return Jsonb A new instance of {@link javax.json.bind.Jsonb Jsonb} class.
+     * @return Jsonb A new instance of {@link jakarta.json.bind.Jsonb Jsonb} class.
      * Always a non-null valid object.
      *
-     * @throws javax.json.bind.JsonbException If an error was encountered while
+     * @throws jakarta.json.bind.JsonbException If an error was encountered while
      * creating the Jsonb instance, such as (but not limited to) no JSON
      * Binding provider found, or classes provide conflicting annotations.
      *
      * @throws IllegalArgumentException If there's an error processing the set
      * parameters, such as the non-null parameter is assigned null value, or
      * unrecognized property is set in
-     * {@link javax.json.bind.JsonbConfig JsonbConfig}.
+     * {@link jakarta.json.bind.JsonbConfig JsonbConfig}.
      */
     Jsonb build();
 
     /**
-     * Create a new {@link javax.json.bind.Jsonb} instance using the default
+     * Create a new {@link jakarta.json.bind.Jsonb} instance using the default
      * {@code JsonbBuilder} implementation provided as returned from
-     * {@link javax.json.bind.spi.JsonbProvider#provider()} method.
+     * {@link jakarta.json.bind.spi.JsonbProvider#provider()} method.
      *
-     * @return new {@link javax.json.bind.Jsonb Jsonb} instance.
+     * @return new {@link jakarta.json.bind.Jsonb Jsonb} instance.
      */
     static Jsonb create() {
         return JsonbProvider.provider().create().build();
     }
 
     /**
-     * Create a new {@link javax.json.bind.Jsonb} instance using the default
+     * Create a new {@link jakarta.json.bind.Jsonb} instance using the default
      * {@code JsonbBuilder} implementation provided as returned from
-     * {@link javax.json.bind.spi.JsonbProvider#provider()} method, configured
+     * {@link jakarta.json.bind.spi.JsonbProvider#provider()} method, configured
      * with provided configuration.
      *
      * @param config
-     *      Provided configuration for {@link javax.json.bind.Jsonb} instance.
+     *      Provided configuration for {@link jakarta.json.bind.Jsonb} instance.
      *
-     * @return new {@link javax.json.bind.Jsonb Jsonb} instance.
+     * @return new {@link jakarta.json.bind.Jsonb Jsonb} instance.
      */
     static Jsonb create(JsonbConfig config) {
         return JsonbProvider.provider().create().withConfig(config).build();
     }
 
     /**
      * Create a new {@code JsonbBuilder} instance as returned by the default
-     * {@link javax.json.bind.spi.JsonbProvider#provider()} method.
+     * {@link jakarta.json.bind.spi.JsonbProvider#provider()} method.
      *
      * @return new {@code JsonbBuilder} instance.
      */
@@ -112,7 +113,7 @@ static JsonbBuilder newBuilder() {
 
     /**
      * Create a new {@code JsonbBuilder} instance as returned by
-     * {@link javax.json.bind.spi.JsonbProvider#provider(String)}
+     * {@link jakarta.json.bind.spi.JsonbProvider#provider(String)}
      * method.
      *
      * @param providerName
@@ -129,7 +130,7 @@ static JsonbBuilder newBuilder(final String providerName) {
      * {@code provider#create} call.
      *
      * @param provider
-     *      {@link javax.json.spi.JsonProvider JsonProvider} instance
+     *      {@link jakarta.json.spi.JsonProvider JsonProvider} instance
      *      used for creating {@code JsonBuilder instances}.
      *
      * @return new {@code JsonbBuilder} instance.

api/src/main/java/javax/json/bind/JsonbConfig.java renamed to api/src/main/java/jakarta/json/bind/JsonbConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,13 +14,16 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.bind;
+package jakarta.json.bind;
+
+import jakarta.json.bind.adapter.JsonbAdapter;
+
+import jakarta.json.bind.config.PropertyNamingStrategy;
+import jakarta.json.bind.config.PropertyVisibilityStrategy;
+
+import jakarta.json.bind.serializer.JsonbDeserializer;
+import jakarta.json.bind.serializer.JsonbSerializer;
 
-import javax.json.bind.adapter.JsonbAdapter;
-import javax.json.bind.config.PropertyNamingStrategy;
-import javax.json.bind.config.PropertyVisibilityStrategy;
-import javax.json.bind.serializer.JsonbDeserializer;
-import javax.json.bind.serializer.JsonbSerializer;
 import java.lang.reflect.Array;
 import java.util.Collections;
 import java.util.HashMap;
@@ -38,21 +41,21 @@
  * Some providers may support additional properties.
  * <dl>
  *   <dt><code>jsonb.to.json.formatted</code> - java.lang.Boolean
- *   <dd>Controls whether or not the {@link javax.json.bind.Jsonb Jsonb} {@code toJson()}
+ *   <dd>Controls whether or not the {@link jakarta.json.bind.Jsonb Jsonb} {@code toJson()}
  *       methods will format the resulting JSON data with line breaks and indentation. A
  *       true value for this property indicates human readable indented
  *       data, while a false value indicates unformatted data.
  *       Default value is false (unformatted) if this property is not specified.
  * </dl>
  * <dl>
  *   <dt><code>jsonb.to.json.encoding</code> - java.lang.String
- *   <dd>The {@link javax.json.bind.Jsonb Jsonb} serialization {@code toJson()} methods
+ *   <dd>The {@link jakarta.json.bind.Jsonb Jsonb} serialization {@code toJson()} methods
  *       will default to this property for encoding of output JSON data. Default
  *       value is 'UTF-8' if this property is not specified.
  * </dl>
  * <dl>
  *   <dt><code>jsonb.from.json.encoding</code> - java.lang.String
- *   <dd>The {@link javax.json.bind.Jsonb Jsonb} deserialization {@code fromJson()}
+ *   <dd>The {@link jakarta.json.bind.Jsonb Jsonb} deserialization {@code fromJson()}
  *       methods will default to this property encoding of input JSON data if the
  *       encoding cannot be detected.
  * </dl>

api/src/main/java/javax/json/bind/JsonbException.java renamed to api/src/main/java/jakarta/json/bind/JsonbException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.bind;
+package jakarta.json.bind;
 
 /**
  * Root class for all JSON Binding exceptions.

api/src/main/java/javax/json/bind/adapter/JsonbAdapter.java renamed to api/src/main/java/jakarta/json/bind/adapter/JsonbAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.bind.adapter;
+package jakarta.json.bind.adapter;
 
 /**
  * <p>Allows to define custom mapping for given java type. The target type could be string or some
@@ -26,8 +26,8 @@
  * <p>On deserialization it works the reverse way: JSON data are deserialized into "Adapted" type which is converted
  * to "Original" type after that.</p>
  *
- * <p>Adapters are registered using {@link javax.json.bind.JsonbConfig#withAdapters(JsonbAdapter[])} method
- * or using {@link javax.json.bind.annotation.JsonbTypeAdapter} annotation on class field.</p>
+ * <p>Adapters are registered using {@link jakarta.json.bind.JsonbConfig#withAdapters(JsonbAdapter[])} method
+ * or using {@link jakarta.json.bind.annotation.JsonbTypeAdapter} annotation on class field.</p>
  *
  * @param <Original> The type that JSONB doesn't know how to handle
  * @param <Adapted> The type that JSONB knows how to handle out of the box
@@ -60,8 +60,8 @@
  * }
  * </pre>
  *
- * @see javax.json.bind.JsonbConfig
- * @see javax.json.bind.annotation.JsonbTypeAdapter
+ * @see jakarta.json.bind.JsonbConfig
+ * @see jakarta.json.bind.annotation.JsonbTypeAdapter
  * @since JSON Binding 1.0
  */
 public interface JsonbAdapter<Original, Adapted> {

api/src/main/java/javax/json/bind/adapter/package-info.java renamed to api/src/main/java/jakarta/json/bind/adapter/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -21,4 +21,4 @@
  *
  * @since JSON Binding 1.0
  */
-package javax.json.bind.adapter;
+package jakarta.json.bind.adapter;

api/src/main/java/javax/json/bind/annotation/JsonbAnnotation.java renamed to api/src/main/java/jakarta/json/bind/annotation/JsonbAnnotation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.bind.annotation;
+package jakarta.json.bind.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;

api/src/main/java/javax/json/bind/annotation/JsonbCreator.java renamed to api/src/main/java/jakarta/json/bind/annotation/JsonbCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.bind.annotation;
+package jakarta.json.bind.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

api/src/main/java/javax/json/bind/annotation/JsonbDateFormat.java renamed to api/src/main/java/jakarta/json/bind/annotation/JsonbDateFormat.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package javax.json.bind.annotation;
+package jakarta.json.bind.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;