Skip to content

update models to be compatible with jackson 2.x and 3.x #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mluckam wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

update models to be compatible with jackson 2.x and 3.x #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ subprojects {
implementation 'com.fasterxml.jackson.core:jackson-core:2.19.1'
implementation 'com.fasterxml.jackson.core:jackson-databind:2.19.1'
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.19.1'
implementation 'tools.jackson.core:jackson-databind:3.0.4'
api 'org.jfrog.filespecs:file-specs-java:1.1.2'
}

Expand Down
3 changes: 2 additions & 1 deletion services/src/main/java/org/jfrog/artifactory/client/model/impl/AllBuildsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.jfrog.artifactory.client.model.impl;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.jfrog.artifactory.client.model.AllBuilds;
import org.jfrog.artifactory.client.model.Build;
import tools.jackson.databind.annotation.JsonDeserialize;

import java.util.List;

Expand All @@ -27,6 +27,7 @@ public List<Build> getBuilds() {
return builds;
}

@com.fasterxml.jackson.databind.annotation.JsonDeserialize(contentAs = BuildImpl.class)
@JsonDeserialize(contentAs = BuildImpl.class)
public void setBuilds(List<Build> builds) {
this.builds = builds;
Expand Down
3 changes: 2 additions & 1 deletion services/src/main/java/org/jfrog/artifactory/client/model/impl/BuildRunsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.jfrog.artifactory.client.model.impl;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.jfrog.artifactory.client.model.BuildNumber;
import org.jfrog.artifactory.client.model.BuildRuns;
import tools.jackson.databind.annotation.JsonDeserialize;

import java.util.List;

Expand All @@ -27,6 +27,7 @@ public List<BuildNumber> getBuildsNumbers() {
return buildsNumbers;
}

@com.fasterxml.jackson.databind.annotation.JsonDeserialize(contentAs = BuildNumberImpl.class)
@JsonDeserialize(contentAs = BuildNumberImpl.class)
public void setBuildsNumbers(List<BuildNumber> buildsNumbers) {
this.buildsNumbers = buildsNumbers;
Expand Down
5 changes: 4 additions & 1 deletion services/src/main/java/org/jfrog/artifactory/client/model/impl/ContentSyncImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
package org.jfrog.artifactory.client.model.impl;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;

import org.jfrog.artifactory.client.model.ContentSync;
import tools.jackson.databind.annotation.JsonDeserialize;

public class ContentSyncImpl implements ContentSync {

private boolean enabled;

@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = EnabledHolderImpl.class)
@JsonDeserialize(as = EnabledHolderImpl.class)
private EnabledHolder statistics;

@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = EnabledHolderImpl.class)
@JsonDeserialize(as = EnabledHolderImpl.class)
private EnabledHolder properties;

@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = OriginAbsenceDetectionHolderImpl.class)
@JsonDeserialize(as = OriginAbsenceDetectionHolderImpl.class)
private OriginAbsenceDetectionHolder source;

Expand Down
3 changes: 2 additions & 1 deletion services/src/main/java/org/jfrog/artifactory/client/model/impl/FolderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.jfrog.artifactory.client.model.impl;

import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.jfrog.artifactory.client.model.Folder;
import org.jfrog.artifactory.client.model.Item;
import tools.jackson.databind.annotation.JsonDeserialize;

import java.util.Date;
import java.util.List;
Expand Down Expand Up @@ -38,6 +38,7 @@ public List<Item> getChildren() {
return children;
}

@com.fasterxml.jackson.databind.annotation.JsonDeserialize(contentAs = ItemImpl.class)
@JsonDeserialize(contentAs = ItemImpl.class)
private void setChildren(List<Item> children) {
this.children = children;
Expand Down
3 changes: 2 additions & 1 deletion ...ices/src/main/java/org/jfrog/artifactory/client/model/impl/LightweightRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.jfrog.artifactory.client.model.impl;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.jfrog.artifactory.client.model.LightweightRepository;
import org.jfrog.artifactory.client.model.RepositoryType;
import tools.jackson.databind.annotation.JsonDeserialize;

/**
* @author jbaruch
Expand Down Expand Up @@ -52,6 +52,7 @@ public RepositoryType getType() {
return type;
}

@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = RepositoryTypeImpl.class)
@JsonDeserialize(as = RepositoryTypeImpl.class)
private void setType(RepositoryType type) {
this.type = type;
Expand Down
3 changes: 2 additions & 1 deletion services/src/main/java/org/jfrog/artifactory/client/model/impl/PermissionTargetImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.jfrog.artifactory.client.model.impl;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.jfrog.artifactory.client.model.PermissionTarget;
import org.jfrog.artifactory.client.model.Principals;
import tools.jackson.databind.annotation.JsonDeserialize;

import java.util.List;

Expand All @@ -18,6 +18,7 @@ public class PermissionTargetImpl implements PermissionTarget {
private String excludesPattern;
private List<String> repositories;
@JsonProperty("principals")
@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = PrincipalsImpl.class)
@JsonDeserialize(as = PrincipalsImpl.class)
private Principals principals;

Expand Down
3 changes: 2 additions & 1 deletion services/src/main/java/org/jfrog/artifactory/client/model/impl/RemoteRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
import java.util.Map;

import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.jfrog.artifactory.client.model.ContentSync;
import org.jfrog.artifactory.client.model.RemoteRepository;
import org.jfrog.artifactory.client.model.RepositoryType;
import org.jfrog.artifactory.client.model.repository.settings.RepositorySettings;
import org.jfrog.artifactory.client.model.repository.settings.XraySettings;
import tools.jackson.databind.annotation.JsonDeserialize;

/**
* @author jbaruch
Expand Down Expand Up @@ -38,6 +38,7 @@ public class RemoteRepositoryImpl extends NonVirtualRepositoryBase implements Re
private boolean synchronizeProperties;
private long assumedOfflinePeriodSecs;
private boolean listRemoteFolderItems;
@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as=ContentSyncImpl.class)
@JsonDeserialize(as=ContentSyncImpl.class)
@JsonProperty("contentSynchronisation")
private ContentSync contentSync;
Expand Down
4 changes: 3 additions & 1 deletion services/src/main/java/org/jfrog/artifactory/client/model/impl/StorageInfoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.jfrog.artifactory.client.model.impl;

import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.jfrog.artifactory.client.model.BinariesSummary;
import org.jfrog.artifactory.client.model.FileStorageSummary;
import org.jfrog.artifactory.client.model.RepositorySummary;
import org.jfrog.artifactory.client.model.StorageInfo;
import org.jfrog.artifactory.client.model.impl.storageinfo.BinariesSummaryImpl;
import org.jfrog.artifactory.client.model.impl.storageinfo.FileStorageSummaryImpl;
import tools.jackson.databind.annotation.JsonDeserialize;

import java.util.List;

Expand All @@ -23,6 +23,7 @@ public BinariesSummary getBinariesSummary() {
return binariesSummary;
}

@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = BinariesSummaryImpl.class)
@JsonDeserialize(as = BinariesSummaryImpl.class)
public void setBinariesSummary(BinariesSummary binariesSummary) {
this.binariesSummary = binariesSummary;
Expand All @@ -32,6 +33,7 @@ public FileStorageSummary getFileStoreSummary() {
return fileStoreSummary;
}

@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = FileStorageSummaryImpl.class)
@JsonDeserialize(as = FileStorageSummaryImpl.class)
public void setFileStoreSummary(FileStorageSummary fileStoreSummary) {
this.fileStoreSummary = fileStoreSummary;
Expand Down