Cannot mock some models with mockito (#1891)

- move ComponentDataModelSerializer to an exported package as it is used by the Component interface fixes #1834
adobe · Nov 16, 2021 · 5f29cc8 · 5f29cc8
1 parent 86eea6a
commit 5f29cc8
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 6 deletions.
diff --git a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/Component.java b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/Component.java
@@ -20,7 +20,7 @@
 import org.osgi.annotation.versioning.ConsumerType;
 
 import com.adobe.cq.export.json.ComponentExporter;
-import com.adobe.cq.wcm.core.components.internal.jackson.ComponentDataModelSerializer;
+import com.adobe.cq.wcm.core.components.models.datalayer.jackson.ComponentDataModelSerializer;
 import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

diff --git a/...e/src/main/java/com/adobe/cq/wcm/core/components/models/contentfragment/package-info.java b/...e/src/main/java/com/adobe/cq/wcm/core/components/models/contentfragment/package-info.java
@@ -13,7 +13,7 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-@Version("1.5.0")
+@Version("1.5.1")
 package com.adobe.cq.wcm.core.components.models.contentfragment;
 
 import org.osgi.annotation.versioning.Version;
diff --git a/...jackson/ComponentDataModelSerializer.java → ...jackson/ComponentDataModelSerializer.java b/...jackson/ComponentDataModelSerializer.java → ...jackson/ComponentDataModelSerializer.java
@@ -13,7 +13,7 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-package com.adobe.cq.wcm.core.components.internal.jackson;
+package com.adobe.cq.wcm.core.components.models.datalayer.jackson;
 
 import java.io.IOException;
 

diff --git a/...src/main/java/com/adobe/cq/wcm/core/components/models/datalayer/jackson/package-info.java b/...src/main/java/com/adobe/cq/wcm/core/components/models/datalayer/jackson/package-info.java
@@ -0,0 +1,23 @@
+/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ Copyright 2021 Adobe
+ ~
+ ~ 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.
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
+/**
+ * This packages provides a jackson specific serializer for component data which is used by the
+ * <a href="https://github.com/adobe/adobe-client-data-layer">Adobe Client Data Layer</a>.
+ */
+@Version("1.0.0")
+package com.adobe.cq.wcm.core.components.models.datalayer.jackson;
+
+import org.osgi.annotation.versioning.Version;
diff --git a/...les/core/src/main/java/com/adobe/cq/wcm/core/components/models/embeddable/Embeddable.java b/...les/core/src/main/java/com/adobe/cq/wcm/core/components/models/embeddable/Embeddable.java
@@ -18,7 +18,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.osgi.annotation.versioning.ConsumerType;
 
-import com.adobe.cq.wcm.core.components.internal.jackson.ComponentDataModelSerializer;
+import com.adobe.cq.wcm.core.components.models.datalayer.jackson.ComponentDataModelSerializer;
 import com.adobe.cq.wcm.core.components.models.datalayer.ComponentData;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

diff --git a/...s/core/src/main/java/com/adobe/cq/wcm/core/components/models/embeddable/package-info.java b/...s/core/src/main/java/com/adobe/cq/wcm/core/components/models/embeddable/package-info.java
@@ -13,7 +13,7 @@
  ~ See the License for the specific language governing permissions and
  ~ limitations under the License.
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-@Version("1.1.0")
+@Version("1.1.1")
 package com.adobe.cq.wcm.core.components.models.embeddable;
 
 import org.osgi.annotation.versioning.Version;
diff --git a/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/package-info.java b/bundles/core/src/main/java/com/adobe/cq/wcm/core/components/models/package-info.java
@@ -34,7 +34,7 @@
  *      version, is bound to this proxy component resource type.
  * </p>
  */
-@Version("12.23.0")
+@Version("12.23.1")
 package com.adobe.cq.wcm.core.components.models;
 
 import org.osgi.annotation.versioning.Version;