diff --git a/.classpath b/.classpath index a5a31ab..7a44b32 100644 --- a/.classpath +++ b/.classpath @@ -5,22 +5,22 @@ - + + - + + - + - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 5abefee..cd7ae0f 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 diff --git a/pom.xml b/pom.xml index fb00270..9c16163 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ io.openslice io.openslice.main - 1.1.0-SNAPSHOT + 1.2.0-SNAPSHOT ../io.openslice.main @@ -34,13 +34,12 @@ ${spring.boot-version} pom import - - - org.springframework.cloud - spring-cloud-consul-dependencies - ${spring.cloud-consul-version} - pom - import + + + commons-logging + commons-logging + + @@ -56,8 +55,8 @@ - javax.persistence - javax.persistence-api + jakarta.persistence + jakarta.persistence-api @@ -69,12 +68,7 @@ shiro-core ${shiro.version} - - - commons-logging - commons-logging - - + @@ -85,8 +79,8 @@ org.apache.maven.plugins maven-compiler-plugin - 11 - 11 + ${java.version} + ${java.version} diff --git a/src/main/java/io/openslice/model/Category.java b/src/main/java/io/openslice/model/Category.java index b4743f9..c14e92b 100644 --- a/src/main/java/io/openslice/model/Category.java +++ b/src/main/java/io/openslice/model/Category.java @@ -1,139 +1,141 @@ -/*- - * ========================LICENSE_START================================= - * io.openslice.model - * %% - * Copyright (C) 2019 openslice.io - * %% - * 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. - * =========================LICENSE_END================================== - */ - -package io.openslice.model; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@Entity(name = "Category") -@JsonIgnoreProperties(value = { "products" }, ignoreUnknown = true ) -public class Category { - - private static final transient Log logger = LogFactory.getLog(Category.class.getName()); - - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private long id = 0; - - @Basic() - private String name=null; - - - - @ManyToMany(cascade = { CascadeType.ALL }) - @JoinTable( - name = "CATEGORY_PRODUCTS", - joinColumns = { @JoinColumn(name = "CAT_ID") }, - inverseJoinColumns = { @JoinColumn(name = "PROD_ID") } - ) - private Set products = new HashSet(); - - - - public Set getProducts() { - return products; - } - - public void setProducts(Set products) { - this.products = products; - } - - - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - - public void addProduct(Product product) { - if (!products.contains(product)) { - logger.info("ACTUALLY add into category "+ this.getName()+" product "+product.getId()); - products.add(product); - //product.addCategory(this); - } - } - - - public void removeProduct(Product p) { - if (products.contains(p)) { - products.remove(p); - //p.removeCategory(this); - } - } - - public int getAppscount() { - int c = 0; - for (Product p : products) { - if ( p instanceof ExperimentMetadata) - c++; - } - return c; - } - - public int getVxFscount() { - int c = 0; - for (Product p : products) { - if ( p instanceof VxFMetadata) - c++; - } - - return c; - } - - - - public int getProductsCount() { - return products.size(); - } - - -} +/*- + * ========================LICENSE_START================================= + * io.openslice.model + * %% + * Copyright (C) 2019 openslice.io + * %% + * 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. + * =========================LICENSE_END================================== + */ + +package io.openslice.model; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@Entity(name = "Category") +@JsonIgnoreProperties(value = { "products" }, ignoreUnknown = true ) +public class Category { + + private static final transient Logger logger = LoggerFactory.getLogger(Category.class.getName()); + + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private long id = 0; + + @Basic() + private String name=null; + + + + @ManyToMany(cascade = { CascadeType.ALL }) + @JoinTable( + name = "CATEGORY_PRODUCTS", + joinColumns = { @JoinColumn(name = "CAT_ID") }, + inverseJoinColumns = { @JoinColumn(name = "PROD_ID") } + ) + private Set products = new HashSet(); + + + + public Set getProducts() { + return products; + } + + public void setProducts(Set products) { + this.products = products; + } + + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + + public void addProduct(Product product) { + if (!products.contains(product)) { + logger.info("ACTUALLY add into category "+ this.getName()+" product "+product.getId()); + products.add(product); + //product.addCategory(this); + } + } + + + public void removeProduct(Product p) { + if (products.contains(p)) { + products.remove(p); + //p.removeCategory(this); + } + } + + @JsonIgnore + public int getAppscount() { + int c = 0; + for (Product p : products) { + if ( p instanceof ExperimentMetadata) + c++; + } + return c; + } + @JsonIgnore + public int getVxFscount() { + int c = 0; + for (Product p : products) { + if ( p instanceof VxFMetadata) + c++; + } + + return c; + } + + + @JsonIgnore + public int getProductsCount() { + return products.size(); + } + + +} diff --git a/src/main/java/io/openslice/model/ConstituentVxF.java b/src/main/java/io/openslice/model/ConstituentVxF.java index 26efb4b..0d43f21 100644 --- a/src/main/java/io/openslice/model/ConstituentVxF.java +++ b/src/main/java/io/openslice/model/ConstituentVxF.java @@ -19,15 +19,16 @@ */ package io.openslice.model; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -40,20 +41,20 @@ public class ConstituentVxF { private long id = 0; @Basic() - private int membervnfIndex; + private String membervnfIndex; @Basic() private String vnfdidRef; - @OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH } ) + @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH } ) @JoinColumn(name = "vxf_id") private VxFMetadata vxfref; - public int getMembervnfIndex() { + public String getMembervnfIndex() { return membervnfIndex; } - public void setMembervnfIndex(int membervnfIndex) { + public void setMembervnfIndex(String membervnfIndex) { this.membervnfIndex = membervnfIndex; } diff --git a/src/main/java/io/openslice/model/DeployArtifact.java b/src/main/java/io/openslice/model/DeployArtifact.java index 2884939..b91d0cb 100644 --- a/src/main/java/io/openslice/model/DeployArtifact.java +++ b/src/main/java/io/openslice/model/DeployArtifact.java @@ -24,15 +24,15 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; @Entity(name = "DeployArtifact") diff --git a/src/main/java/io/openslice/model/DeploymentDescriptor.java b/src/main/java/io/openslice/model/DeploymentDescriptor.java index 2689d18..9dd566a 100644 --- a/src/main/java/io/openslice/model/DeploymentDescriptor.java +++ b/src/main/java/io/openslice/model/DeploymentDescriptor.java @@ -28,21 +28,21 @@ import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ConstraintMode; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ConstraintMode; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; @@ -136,7 +136,7 @@ public void setNsLcmOpOccId(String nsLcmOpOccId) { // USE THE FOLLOWING DISABLE FOREIGN KEY RESTRICTION // @ManyToOne(optional=true) -// @JoinColumn(name="experiment_id", foreignKey = @javax.persistence.ForeignKey(value = ConstraintMode.NO_CONSTRAINT)) +// @JoinColumn(name="experiment_id", foreignKey = @jakarta.persistence.ForeignKey(value = ConstraintMode.NO_CONSTRAINT)) // private ExperimentMetadata experiment = null; diff --git a/src/main/java/io/openslice/model/DeploymentDescriptorVxFInstanceInfo.java b/src/main/java/io/openslice/model/DeploymentDescriptorVxFInstanceInfo.java index bb35a58..75bbf0f 100644 --- a/src/main/java/io/openslice/model/DeploymentDescriptorVxFInstanceInfo.java +++ b/src/main/java/io/openslice/model/DeploymentDescriptorVxFInstanceInfo.java @@ -2,16 +2,16 @@ import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/io/openslice/model/DeploymentDescriptorVxFPlacement.java b/src/main/java/io/openslice/model/DeploymentDescriptorVxFPlacement.java index 055d0dc..d9ce9dc 100644 --- a/src/main/java/io/openslice/model/DeploymentDescriptorVxFPlacement.java +++ b/src/main/java/io/openslice/model/DeploymentDescriptorVxFPlacement.java @@ -23,19 +23,19 @@ import java.io.Serializable; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; -import javax.persistence.OneToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonProcessingException; @@ -60,12 +60,12 @@ public class DeploymentDescriptorVxFPlacement implements Serializable{ private long id = 0; - @OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH }, orphanRemoval = true ) + @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH } ) @JoinColumn(name = "constituent_vxf_id") private ConstituentVxF constituentVxF = null; - @OneToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH } ) + @ManyToOne(cascade = { CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH, CascadeType.DETACH } ) @JoinColumn(name = "infrastructure_id") private Infrastructure infrastructure = null; diff --git a/src/main/java/io/openslice/model/ExperimentMetadata.java b/src/main/java/io/openslice/model/ExperimentMetadata.java index a26e0b4..8c4141f 100644 --- a/src/main/java/io/openslice/model/ExperimentMetadata.java +++ b/src/main/java/io/openslice/model/ExperimentMetadata.java @@ -26,13 +26,13 @@ import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -89,7 +89,7 @@ public void setPackagingFormat(PackagingFormat packagingFormat) { * USE THE FOLLOWING TO DISABLE FOREIGN KEY RESTRICTION ALONG WITH THE RELATED CAHNGE TO DeploymentDescriptor CLASS */ // @OneToMany(cascade=CascadeType.ALL, orphanRemoval=true) - // @JoinColumn(name = "experiment", foreignKey = @javax.persistence.ForeignKey(name = "none")) + // @JoinColumn(name = "experiment", foreignKey = @jakarta.persistence.ForeignKey(name = "none")) // private Set DeploymentDescriptors = new HashSet(); // // public Set getDeploymentDescriptors() { diff --git a/src/main/java/io/openslice/model/ExperimentOnBoardDescriptor.java b/src/main/java/io/openslice/model/ExperimentOnBoardDescriptor.java index b713aea..0c5da1d 100644 --- a/src/main/java/io/openslice/model/ExperimentOnBoardDescriptor.java +++ b/src/main/java/io/openslice/model/ExperimentOnBoardDescriptor.java @@ -21,12 +21,12 @@ package io.openslice.model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/io/openslice/model/Infrastructure.java b/src/main/java/io/openslice/model/Infrastructure.java index 3dcb437..948ee3b 100644 --- a/src/main/java/io/openslice/model/Infrastructure.java +++ b/src/main/java/io/openslice/model/Infrastructure.java @@ -21,20 +21,20 @@ package io.openslice.model; import java.util.ArrayList; +import java.util.Date; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude.Include; @@ -60,6 +60,11 @@ public class Infrastructure { private String name = null; @Basic() private String email = null; + @Basic() + private InfrastructureStatus infrastructureStatus = InfrastructureStatus.UNKNOWN; + + @Basic() + private Date dateCreated; @Basic() private String datacentername = null; @@ -80,6 +85,14 @@ public class Infrastructure { private List refSupportedImages = new ArrayList<>(); + public void setDateCreated(Date dateCreated) { + this.dateCreated = dateCreated; + } + + public Date getDateCreated() { + return dateCreated; + } + public String getDatacentername() { return datacentername; } @@ -222,6 +235,13 @@ public void setName(String name) { } + public InfrastructureStatus getInfrastructureStatus() { + return infrastructureStatus; + } + + public void setInfrastructureStatus(InfrastructureStatus infrastructureStatus) { + this.infrastructureStatus = infrastructureStatus; + } /** * @param l diff --git a/src/main/java/io/openslice/model/InfrastructureStatus.java b/src/main/java/io/openslice/model/InfrastructureStatus.java new file mode 100644 index 0000000..5e8a4f5 --- /dev/null +++ b/src/main/java/io/openslice/model/InfrastructureStatus.java @@ -0,0 +1,32 @@ +/*- + * ========================LICENSE_START================================= + * io.openslice.model + * %% + * Copyright (C) 2019 openslice.io + * %% + * 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. + * =========================LICENSE_END================================== + */ + + +package io.openslice.model; + +/** + * @author ichatzis + * + */ +public enum InfrastructureStatus { + UNKNOWN, + OSM_PRESENT, + OSM_MISSING +} diff --git a/src/main/java/io/openslice/model/InstalledVxF.java b/src/main/java/io/openslice/model/InstalledVxF.java index b74b6f5..f0d3317 100644 --- a/src/main/java/io/openslice/model/InstalledVxF.java +++ b/src/main/java/io/openslice/model/InstalledVxF.java @@ -21,11 +21,11 @@ package io.openslice.model; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** diff --git a/src/main/java/io/openslice/model/MANOplatform.java b/src/main/java/io/openslice/model/MANOplatform.java index 6be404d..8448809 100644 --- a/src/main/java/io/openslice/model/MANOplatform.java +++ b/src/main/java/io/openslice/model/MANOplatform.java @@ -21,12 +21,12 @@ package io.openslice.model; -import javax.persistence.Basic; -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Embeddable; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * @author ctranoris diff --git a/src/main/java/io/openslice/model/MANOprovider.java b/src/main/java/io/openslice/model/MANOprovider.java index 0e5f46c..bf4497b 100644 --- a/src/main/java/io/openslice/model/MANOprovider.java +++ b/src/main/java/io/openslice/model/MANOprovider.java @@ -24,16 +24,16 @@ import java.util.ArrayList; import java.util.List; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import com.fasterxml.jackson.annotation.JsonProperty; /** diff --git a/src/main/java/io/openslice/model/NetworkServiceDescriptor.java b/src/main/java/io/openslice/model/NetworkServiceDescriptor.java index 00e444f..276a6b7 100644 --- a/src/main/java/io/openslice/model/NetworkServiceDescriptor.java +++ b/src/main/java/io/openslice/model/NetworkServiceDescriptor.java @@ -19,7 +19,7 @@ */ package io.openslice.model; -import javax.persistence.Entity; +import jakarta.persistence.Entity; /** * @author ctranoris diff --git a/src/main/java/io/openslice/model/OnBoardDescriptor.java b/src/main/java/io/openslice/model/OnBoardDescriptor.java index 0c5bf35..c48cc63 100644 --- a/src/main/java/io/openslice/model/OnBoardDescriptor.java +++ b/src/main/java/io/openslice/model/OnBoardDescriptor.java @@ -23,18 +23,18 @@ import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.Lob; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/io/openslice/model/OnBoardingStatus.java b/src/main/java/io/openslice/model/OnBoardingStatus.java index 664f4e9..758ed54 100644 --- a/src/main/java/io/openslice/model/OnBoardingStatus.java +++ b/src/main/java/io/openslice/model/OnBoardingStatus.java @@ -31,5 +31,6 @@ public enum OnBoardingStatus { ONBOARDED, OFFBOARDED, OFFBOARDING, - ONBOARDING + ONBOARDING, + OSM_MISSING } diff --git a/src/main/java/io/openslice/model/PackagingFormat.java b/src/main/java/io/openslice/model/PackagingFormat.java index f2f1a44..26e5d66 100644 --- a/src/main/java/io/openslice/model/PackagingFormat.java +++ b/src/main/java/io/openslice/model/PackagingFormat.java @@ -33,5 +33,7 @@ public enum PackagingFormat { GenericSOL005, OSMvEIGHT, OSMvNINE, - OSMvTEN + OSMvTEN, + OSMvELEVEN, + OSMvTHIRTEEN } diff --git a/src/main/java/io/openslice/model/PortalProperty.java b/src/main/java/io/openslice/model/PortalProperty.java index 3a4dbf3..5810cfc 100644 --- a/src/main/java/io/openslice/model/PortalProperty.java +++ b/src/main/java/io/openslice/model/PortalProperty.java @@ -21,11 +21,11 @@ package io.openslice.model; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * @author ctranoris diff --git a/src/main/java/io/openslice/model/PortalUser.java b/src/main/java/io/openslice/model/PortalUser.java index 26713ef..b636c07 100644 --- a/src/main/java/io/openslice/model/PortalUser.java +++ b/src/main/java/io/openslice/model/PortalUser.java @@ -28,20 +28,20 @@ import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.ElementCollection; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinTable; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinTable; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/io/openslice/model/Product.java b/src/main/java/io/openslice/model/Product.java index 94918a7..26fe199 100644 --- a/src/main/java/io/openslice/model/Product.java +++ b/src/main/java/io/openslice/model/Product.java @@ -26,28 +26,28 @@ import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.DiscriminatorColumn; -import javax.persistence.DiscriminatorType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.DiscriminatorType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; /** * @author ctranoris @@ -58,7 +58,7 @@ @DiscriminatorColumn(name = "app_type", discriminatorType = DiscriminatorType.STRING) public class Product { - private static final transient Log logger = LogFactory.getLog(Product.class.getName()); + private static final transient Logger logger = LoggerFactory.getLogger(Product.class.getName()); @Id diff --git a/src/main/java/io/openslice/model/ProductExtensionItem.java b/src/main/java/io/openslice/model/ProductExtensionItem.java index 2d8629c..f0a2cac 100644 --- a/src/main/java/io/openslice/model/ProductExtensionItem.java +++ b/src/main/java/io/openslice/model/ProductExtensionItem.java @@ -21,11 +21,11 @@ package io.openslice.model; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * @author ctranoris diff --git a/src/main/java/io/openslice/model/SubscribedResource.java b/src/main/java/io/openslice/model/SubscribedResource.java index 01a8c71..999857e 100644 --- a/src/main/java/io/openslice/model/SubscribedResource.java +++ b/src/main/java/io/openslice/model/SubscribedResource.java @@ -23,16 +23,16 @@ import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToOne; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; /** diff --git a/src/main/java/io/openslice/model/VFImage.java b/src/main/java/io/openslice/model/VFImage.java index 66c252b..d36fa3d 100644 --- a/src/main/java/io/openslice/model/VFImage.java +++ b/src/main/java/io/openslice/model/VFImage.java @@ -26,22 +26,22 @@ import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.JoinTable; -import javax.persistence.Lob; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; -import javax.persistence.OneToMany; -import javax.persistence.Transient; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.JoinTable; +import jakarta.persistence.Lob; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Transient; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/io/openslice/model/ValidationJob.java b/src/main/java/io/openslice/model/ValidationJob.java index 6f53c43..25d4a98 100644 --- a/src/main/java/io/openslice/model/ValidationJob.java +++ b/src/main/java/io/openslice/model/ValidationJob.java @@ -23,11 +23,11 @@ import java.util.Date; -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; +import jakarta.persistence.Basic; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; /** * @author ctranoris diff --git a/src/main/java/io/openslice/model/VxFMetadata.java b/src/main/java/io/openslice/model/VxFMetadata.java index 2f8cd30..f285a17 100644 --- a/src/main/java/io/openslice/model/VxFMetadata.java +++ b/src/main/java/io/openslice/model/VxFMetadata.java @@ -26,14 +26,14 @@ import java.util.List; import java.util.Set; -import javax.persistence.Basic; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; +import jakarta.persistence.Basic; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinTable; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; /** diff --git a/src/main/java/io/openslice/model/VxFOnBoardedDescriptor.java b/src/main/java/io/openslice/model/VxFOnBoardedDescriptor.java index f47d796..d8323ca 100644 --- a/src/main/java/io/openslice/model/VxFOnBoardedDescriptor.java +++ b/src/main/java/io/openslice/model/VxFOnBoardedDescriptor.java @@ -21,13 +21,13 @@ package io.openslice.model; -import javax.persistence.CascadeType; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.JoinColumn; -import javax.persistence.JoinColumns; -import javax.persistence.ManyToMany; -import javax.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToMany; +import jakarta.persistence.ManyToOne; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;