- * The implementation of the view provides access to EDM entity types for the - * given JPA EDM model. The view acts as a container for consistent list of EDM - * entity types. An EDM entity type is said to be consistent only if it has at - * least one consistent EDM property and at least one consistent EDM key. - * - * + * The implementation of the view provides access to EDM entity types for the given JPA EDM model. + * The view acts as a container for consistent list of EDM entity types. An EDM entity type is said + * to be consistent only if it has at least one consistent EDM property and at least one consistent + * EDM key. + * + * *
+ * * @org.apache.olingo.odata2.DoNotImplement * @see org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmPropertyView * @see org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmKeyView * @see org.apache.olingo.odata2.jpa.processor.api.model.JPAEdmNavigationPropertyView - * + * */ public interface JPAEdmEntityTypeView extends JPAEdmBaseView { - /** - * The method returns an EDM entity currently being processed. - * - * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntityType} - */ - public EntityType getEdmEntityType(); + /** + * The method returns an EDM entity currently being processed. + * + * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntityType} + */ + EntityType getEdmEntityType(); - /** - * The method returns java persistence Entity type currently being - * processed. - * - * @return an instance of type {@link javax.persistence.metamodel.EntityType} - */ - public javax.persistence.metamodel.EntityType getJPAEntityType(); + /** + * The method returns java persistence Entity type currently being processed. + * + * @return an instance of type {@link javax.persistence.metamodel.EntityType} + */ + jakarta.persistence.metamodel.EntityType getJPAEntityType(); - /** - * The method returns a consistent list of EDM entity types for a given java - * persistence meta model. - * - * @return a list of {@link org.apache.olingo.odata2.api.edm.provider.EntityType} - */ - public List getConsistentEdmEntityTypes(); + /** + * The method returns a consistent list of EDM entity types for a given java persistence meta model. + * + * @return a list of {@link org.apache.olingo.odata2.api.edm.provider.EntityType} + */ + List getConsistentEdmEntityTypes(); - /** - * The method searches in the consistent list of EDM entity types for the - * given EDM entity type's name. - * - * @param jpaEntityTypeName - * is the name of EDM entity type - * @return a reference to EDM entity type if found else null - */ - public EntityType searchEdmEntityType(String jpaEntityTypeName); + /** + * The method searches in the consistent list of EDM entity types for the given EDM entity type's + * name. + * + * @param jpaEntityTypeName is the name of EDM entity type + * @return a reference to EDM entity type if found else null + */ + EntityType searchEdmEntityType(String jpaEntityTypeName); } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java index 3ce66d648..1eca444e3 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/JPAEdmPropertyView.java @@ -20,7 +20,7 @@ import java.util.List; -import javax.persistence.metamodel.Attribute; +import jakarta.persistence.metamodel.Attribute; import org.apache.olingo.odata2.api.edm.provider.Property; import org.apache.olingo.odata2.api.edm.provider.SimpleProperty; @@ -74,16 +74,16 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView { /** * The method returns a JPA Attribute for the given JPA entity type. * - * @return an instance of type {@link javax.persistence.metamodel.Attribute + * @return an instance of type {@link jakarta.persistence.metamodel.Attribute * } */ Attribute getJPAAttribute(); /** - * The method returns a JPA Attribute referenced by a JPA Attribute in the {@link javax.persistence.JoinColumn} + * The method returns a JPA Attribute referenced by a JPA Attribute in the {@link jakarta.persistence.JoinColumn} * annotation for the given JPA entity type . * - * @return an instance of type {@link javax.persistence.metamodel.Attribute + * @return an instance of type {@link jakarta.persistence.metamodel.Attribute * } */ Attribute getJPAReferencedAttribute(); diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java index e7bcbe97b..cb899a42a 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAAttributeMapType.java @@ -1,45 +1,40 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** - * - * The default name for EDM - * property is derived from JPA attribute name. This can be overriden - * using + * + * The default name for EDM property is derived from JPA attribute name. This can be overriden using * JPAAttributeMapType. - * - * - * Java class for JPAAttributeMapType complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * + * + * + * + * Java class for JPAAttributeMapType complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAAttributeMapType"> * <complexContent> @@ -60,143 +55,139 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAAttributeMapType", propOrder = { "jpaAttribute" }) +@XmlType(name = "JPAAttributeMapType", propOrder = {"jpaAttribute"}) public class JPAAttributeMapType { - @XmlElement(name = "JPAAttribute") - protected List jpaAttribute; - - /** - * Gets the value of the jpaAttribute property. - * - * - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the jpaAttribute property. - * - * - * For example, to add a new item, do as follows: - * - * getJPAAttribute().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPAAttributeMapType.JPAAttribute } - * - * - */ - public List getJPAAttribute() { - if (jpaAttribute == null) { - jpaAttribute = new ArrayList(); - } - return jpaAttribute; - } - - /** - * Java class for anonymous complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPAAttribute { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; + @XmlElement(name = "JPAAttribute") + protected List jpaAttribute; /** - * Gets the value of the value property. + * Gets the value of the jpaAttribute property. * - * @return - * possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaAttribute property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: + * + * + * getJPAAttribute().add(newItem); + * * - * @param value - * allowed object is {@link String } * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. + * + * Objects of the following type(s) are allowed in the list + * {@link JPAAttributeMapType.JPAAttribute } * - * @return - * possible object is {@link String } * */ - public String getName() { - return name; + public List getJPAAttribute() { + if (jpaAttribute == null) { + jpaAttribute = new ArrayList(); + } + return jpaAttribute; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. * - * @param value - * allowed object is {@link String } + * + * The following schema fragment specifies the expected content contained within this class. * - */ - public void setName(final String value) { - name = value; - } - - /** - * Gets the value of the exclude property. + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @return - * possible object is {@link Boolean } * */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; - } - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPAAttribute { - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; + } + + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java index a4175d481..b2b255cbe 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java @@ -1,37 +1,32 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for anonymous complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType> * <complexContent> @@ -44,36 +39,35 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { "persistenceUnit" }) +@XmlType(name = "", propOrder = {"persistenceUnit"}) @XmlRootElement(name = "JPAEDMMappingModel") public class JPAEdmMappingModel { - @XmlElement(name = "PersistenceUnit", required = true) - protected JPAPersistenceUnitMapType persistenceUnit; + @XmlElement(name = "PersistenceUnit", required = true) + protected JPAPersistenceUnitMapType persistenceUnit; - /** - * Gets the value of the persistenceUnit property. - * - * @return possible object is {@link JPAPersistenceUnitMapType } - * - */ - public JPAPersistenceUnitMapType getPersistenceUnit() { - return persistenceUnit; - } + /** + * Gets the value of the persistenceUnit property. + * + * @return possible object is {@link JPAPersistenceUnitMapType } + * + */ + public JPAPersistenceUnitMapType getPersistenceUnit() { + return persistenceUnit; + } - /** - * Sets the value of the persistenceUnit property. - * - * @param value - * allowed object is {@link JPAPersistenceUnitMapType } - * - */ - public void setPersistenceUnit(final JPAPersistenceUnitMapType value) { - persistenceUnit = value; - } + /** + * Sets the value of the persistenceUnit property. + * + * @param value allowed object is {@link JPAPersistenceUnitMapType } + * + */ + public void setPersistenceUnit(final JPAPersistenceUnitMapType value) { + persistenceUnit = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java index 84f8b282b..5ab4991bc 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java @@ -1,85 +1,83 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** - * This object contains factory methods for each Java content interface and Java - * element interface generated in the - * org.apache.olingo.odata2.processor.api.jpa.model.mapping package. + * This object contains factory methods for each Java content interface and Java element interface + * generated in the org.apache.olingo.odata2.processor.api.jpa.model.mapping package. * - * An ObjectFactory allows you to programatically construct new instances of the - * Java representation for XML content. The Java representation of XML content - * can consist of schema derived interfaces and classes representing the binding - * of schema type definitions, element declarations and model groups. Factory - * methods for each of these are provided in this class. - * + * An ObjectFactory allows you to programatically construct new instances of the Java representation + * for XML content. The Java representation of XML content can consist of schema derived interfaces + * and classes representing the binding of schema type definitions, element declarations and model + * groups. Factory methods for each of these are provided in this class. + * */ @XmlRegistry public class JPAEdmMappingModelFactory { - /** - * Create a new ObjectFactory that can be used to create new instances of - * schema derived classes for package: - * org.apache.olingo.odata2.processor.api.jpa.model.mapping - * - */ - public JPAEdmMappingModelFactory() {} + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for + * package: org.apache.olingo.odata2.processor.api.jpa.model.mapping + * + */ + public JPAEdmMappingModelFactory() {} - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType } - * - */ - public JPARelationshipMapType createJPARelationshipMapType() { - return new JPARelationshipMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType } + * + */ + public JPARelationshipMapType createJPARelationshipMapType() { + return new JPARelationshipMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType } - * - */ - public JPAAttributeMapType createJPAAttributeMapType() { - return new JPAAttributeMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType } + * + */ + public JPAAttributeMapType createJPAAttributeMapType() { + return new JPAAttributeMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel } - * - */ - public JPAEdmMappingModel createJPAEDMMappingModel() { - return new JPAEdmMappingModel(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel } + * + */ + public JPAEdmMappingModel createJPAEDMMappingModel() { + return new JPAEdmMappingModel(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType } - * - */ - public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() { - return new JPAPersistenceUnitMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType } + * + */ + public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() { + return new JPAPersistenceUnitMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType } - * - */ - public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() { - return new JPAEmbeddableTypeMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType } + * + */ + public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() { + return new JPAEmbeddableTypeMapType(); + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java index e64067387..47803af26 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java @@ -1,40 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * The default name for EDM - * complex type is derived from JPA Embeddable type name. This can be + * + * The default name for EDM complex type is derived from JPA Embeddable type name. This can be * overriden using JPAEmbeddableTypeMapType. - * - * - * Java class for JPAEmbeddableTypeMapType complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * + * + * + * + * Java class for JPAEmbeddableTypeMapType complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEmbeddableTypeMapType"> * <complexContent> @@ -50,112 +47,103 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = { "edmComplexType", "jpaAttributes" }) +@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = {"edmComplexType", "jpaAttributes"}) public class JPAEmbeddableTypeMapType { - @XmlElement(name = "EDMComplexType") - protected String edmComplexType; - @XmlElement(name = "JPAAttributes", required = true) - protected JPAAttributeMapType jpaAttributes; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; + @XmlElement(name = "EDMComplexType") + protected String edmComplexType; + @XmlElement(name = "JPAAttributes", required = true) + protected JPAAttributeMapType jpaAttributes; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; - /** - * Gets the value of the edmComplexType property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMComplexType() { - return edmComplexType; - } + /** + * Gets the value of the edmComplexType property. + * + * @return possible object is {@link String } + * + */ + public String getEDMComplexType() { + return edmComplexType; + } - /** - * Sets the value of the edmComplexType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMComplexType(final String value) { - edmComplexType = value; - } + /** + * Sets the value of the edmComplexType property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMComplexType(final String value) { + edmComplexType = value; + } - /** - * Gets the value of the jpaAttributes property. - * - * @return - * possible object is {@link JPAAttributeMapType } - * - */ - public JPAAttributeMapType getJPAAttributes() { - return jpaAttributes; - } + /** + * Gets the value of the jpaAttributes property. + * + * @return possible object is {@link JPAAttributeMapType } + * + */ + public JPAAttributeMapType getJPAAttributes() { + return jpaAttributes; + } - /** - * Sets the value of the jpaAttributes property. - * - * @param value - * allowed object is {@link JPAAttributeMapType } - * - */ - public void setJPAAttributes(final JPAAttributeMapType value) { - jpaAttributes = value; - } + /** + * Sets the value of the jpaAttributes property. + * + * @param value allowed object is {@link JPAAttributeMapType } + * + */ + public void setJPAAttributes(final JPAAttributeMapType value) { + jpaAttributes = value; + } - /** - * Gets the value of the name property. - * - * @return - * possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } - /** - * Gets the value of the exclude property. - * - * @return - * possible object is {@link Boolean } - * - */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; } - } - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java index 629312444..6bec5a120 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java @@ -1,39 +1,33 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for JPAEmbeddableTypesMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEmbeddableTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEmbeddableTypesMapType", propOrder = { "jpaEmbeddableType" }) +@XmlType(name = "JPAEmbeddableTypesMapType", propOrder = {"jpaEmbeddableType"}) public class JPAEmbeddableTypesMapType { - @XmlElement(name = "JPAEmbeddableType") - protected List jpaEmbeddableType; + @XmlElement(name = "JPAEmbeddableType") + protected List jpaEmbeddableType; - /** - * Gets the value of the jpaEmbeddableType property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEmbeddableType property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPAEmbeddableType().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType } - * - * - */ - public List getJPAEmbeddableType() { - if (jpaEmbeddableType == null) { - jpaEmbeddableType = new ArrayList(); + /** + * Gets the value of the jpaEmbeddableType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEmbeddableType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEmbeddableType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType } + * + * + */ + public List getJPAEmbeddableType() { + if (jpaEmbeddableType == null) { + jpaEmbeddableType = new ArrayList(); + } + return jpaEmbeddableType; } - return jpaEmbeddableType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java index 22e181922..8c989234d 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java @@ -1,40 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * The default name for EDM - * entity type is derived from JPA entity type name. This can be - * overriden using JPAEntityTypeMapType. - * - * - * Java class for JPAEntityTypeMapType complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * + * + * The default name for EDM entity type is derived from JPA entity type name. This can be overriden + * using JPAEntityTypeMapType. + * + * + * + * Java class for JPAEntityTypeMapType complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypeMapType"> * <complexContent> @@ -53,161 +50,147 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypeMapType", propOrder = { "edmEntityType", "edmEntitySet", "jpaAttributes", - "jpaRelationships" }) +@XmlType(name = "JPAEntityTypeMapType", propOrder = {"edmEntityType", "edmEntitySet", "jpaAttributes", "jpaRelationships"}) public class JPAEntityTypeMapType { - @XmlElement(name = "EDMEntityType") - protected String edmEntityType; - @XmlElement(name = "EDMEntitySet") - protected String edmEntitySet; - @XmlElement(name = "JPAAttributes", required = true) - protected JPAAttributeMapType jpaAttributes; - @XmlElement(name = "JPARelationships", required = true) - protected JPARelationshipMapType jpaRelationships; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; - - /** - * Gets the value of the edmEntityType property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntityType() { - return edmEntityType; - } - - /** - * Sets the value of the edmEntityType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntityType(final String value) { - edmEntityType = value; - } - - /** - * Gets the value of the edmEntitySet property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntitySet() { - return edmEntitySet; - } - - /** - * Sets the value of the edmEntitySet property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntitySet(final String value) { - edmEntitySet = value; - } - - /** - * Gets the value of the jpaAttributes property. - * - * @return - * possible object is {@link JPAAttributeMapType } - * - */ - public JPAAttributeMapType getJPAAttributes() { - return jpaAttributes; - } - - /** - * Sets the value of the jpaAttributes property. - * - * @param value - * allowed object is {@link JPAAttributeMapType } - * - */ - public void setJPAAttributes(final JPAAttributeMapType value) { - jpaAttributes = value; - } - - /** - * Gets the value of the jpaRelationships property. - * - * @return - * possible object is {@link JPARelationshipMapType } - * - */ - public JPARelationshipMapType getJPARelationships() { - return jpaRelationships; - } - - /** - * Sets the value of the jpaRelationships property. - * - * @param value - * allowed object is {@link JPARelationshipMapType } - * - */ - public void setJPARelationships(final JPARelationshipMapType value) { - jpaRelationships = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } - - /** - * Gets the value of the exclude property. - * - * @return - * possible object is {@link Boolean } - * - */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; + @XmlElement(name = "EDMEntityType") + protected String edmEntityType; + @XmlElement(name = "EDMEntitySet") + protected String edmEntitySet; + @XmlElement(name = "JPAAttributes", required = true) + protected JPAAttributeMapType jpaAttributes; + @XmlElement(name = "JPARelationships", required = true) + protected JPARelationshipMapType jpaRelationships; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; + + /** + * Gets the value of the edmEntityType property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntityType() { + return edmEntityType; + } + + /** + * Sets the value of the edmEntityType property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntityType(final String value) { + edmEntityType = value; + } + + /** + * Gets the value of the edmEntitySet property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntitySet() { + return edmEntitySet; + } + + /** + * Sets the value of the edmEntitySet property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntitySet(final String value) { + edmEntitySet = value; + } + + /** + * Gets the value of the jpaAttributes property. + * + * @return possible object is {@link JPAAttributeMapType } + * + */ + public JPAAttributeMapType getJPAAttributes() { + return jpaAttributes; + } + + /** + * Sets the value of the jpaAttributes property. + * + * @param value allowed object is {@link JPAAttributeMapType } + * + */ + public void setJPAAttributes(final JPAAttributeMapType value) { + jpaAttributes = value; + } + + /** + * Gets the value of the jpaRelationships property. + * + * @return possible object is {@link JPARelationshipMapType } + * + */ + public JPARelationshipMapType getJPARelationships() { + return jpaRelationships; + } + + /** + * Sets the value of the jpaRelationships property. + * + * @param value allowed object is {@link JPARelationshipMapType } + * + */ + public void setJPARelationships(final JPARelationshipMapType value) { + jpaRelationships = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; + } + + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; } - } - - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java index 7a72e0848..afacaceca 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java @@ -1,39 +1,33 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for JPAEntityTypesMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypesMapType", propOrder = { "jpaEntityType" }) +@XmlType(name = "JPAEntityTypesMapType", propOrder = {"jpaEntityType"}) public class JPAEntityTypesMapType { - @XmlElement(name = "JPAEntityType") - protected List jpaEntityType; + @XmlElement(name = "JPAEntityType") + protected List jpaEntityType; - /** - * Gets the value of the jpaEntityType property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEntityType property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPAEntityType().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } - * - * - */ - public List getJPAEntityType() { - if (jpaEntityType == null) { - jpaEntityType = new ArrayList(); + /** + * Gets the value of the jpaEntityType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEntityType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEntityType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } + * + * + */ + public List getJPAEntityType() { + if (jpaEntityType == null) { + jpaEntityType = new ArrayList(); + } + return jpaEntityType; } - return jpaEntityType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java index 22260eac1..7ce8c0aa0 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java @@ -1,42 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * By default Java Persistence Unit name is taken as EDM schema name. This can - * be overriden using JPAPersistenceUnitMapType. - * - * + * + * By default Java Persistence Unit name is taken as EDM schema name. This can be overriden using + * JPAPersistenceUnitMapType. + * + * * * Java class for JPAPersistenceUnitMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAPersistenceUnitMapType"> * <complexContent> @@ -53,105 +48,100 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAPersistenceUnitMapType", - propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" }) +@XmlType(name = "JPAPersistenceUnitMapType", propOrder = {"edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes"}) public class JPAPersistenceUnitMapType { - @XmlElement(name = "EDMSchemaNamespace") - protected String edmSchemaNamespace; - @XmlElement(name = "JPAEntityTypes", required = true) - protected JPAEntityTypesMapType jpaEntityTypes; - @XmlElement(name = "JPAEmbeddableTypes", required = true) - protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "EDMSchemaNamespace") + protected String edmSchemaNamespace; + @XmlElement(name = "JPAEntityTypes", required = true) + protected JPAEntityTypesMapType jpaEntityTypes; + @XmlElement(name = "JPAEmbeddableTypes", required = true) + protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; + @XmlAttribute(name = "name", required = true) + protected String name; - /** - * Gets the value of the edmSchemaNamespace property. - * - * @return possible object is {@link String } - * - */ - public String getEDMSchemaNamespace() { - return edmSchemaNamespace; - } + /** + * Gets the value of the edmSchemaNamespace property. + * + * @return possible object is {@link String } + * + */ + public String getEDMSchemaNamespace() { + return edmSchemaNamespace; + } - /** - * Sets the value of the edmSchemaNamespace property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMSchemaNamespace(final String value) { - edmSchemaNamespace = value; - } + /** + * Sets the value of the edmSchemaNamespace property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMSchemaNamespace(final String value) { + edmSchemaNamespace = value; + } - /** - * Gets the value of the jpaEntityTypes property. - * - * @return possible object is {@link JPAEntityTypesMapType } - * - */ - public JPAEntityTypesMapType getJPAEntityTypes() { - return jpaEntityTypes; - } + /** + * Gets the value of the jpaEntityTypes property. + * + * @return possible object is {@link JPAEntityTypesMapType } + * + */ + public JPAEntityTypesMapType getJPAEntityTypes() { + return jpaEntityTypes; + } - /** - * Sets the value of the jpaEntityTypes property. - * - * @param value - * allowed object is {@link JPAEntityTypesMapType } - * - */ - public void setJPAEntityTypes(final JPAEntityTypesMapType value) { - jpaEntityTypes = value; - } + /** + * Sets the value of the jpaEntityTypes property. + * + * @param value allowed object is {@link JPAEntityTypesMapType } + * + */ + public void setJPAEntityTypes(final JPAEntityTypesMapType value) { + jpaEntityTypes = value; + } - /** - * Gets the value of the jpaEmbeddableTypes property. - * - * @return possible object is {@link JPAEmbeddableTypesMapType } - * - */ - public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { - return jpaEmbeddableTypes; - } + /** + * Gets the value of the jpaEmbeddableTypes property. + * + * @return possible object is {@link JPAEmbeddableTypesMapType } + * + */ + public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { + return jpaEmbeddableTypes; + } - /** - * Sets the value of the jpaEmbeddableTypes property. - * - * @param value - * allowed object is {@link JPAEmbeddableTypesMapType } - * - */ - public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { - jpaEmbeddableTypes = value; - } + /** + * Sets the value of the jpaEmbeddableTypes property. + * + * @param value allowed object is {@link JPAEmbeddableTypesMapType } + * + */ + public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { + jpaEmbeddableTypes = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java index 25a2f9569..50970877e 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java @@ -1,46 +1,40 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** - * - * The default name for EDM navigation property is derived from JPA relationship - * name. This can be overriden using JPARelationshipMapType. - * - * + * + * The default name for EDM navigation property is derived from JPA relationship name. This can be + * overriden using JPARelationshipMapType. + * + * * * Java class for JPARelationshipMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPARelationshipMapType"> * <complexContent> @@ -60,116 +54,113 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPARelationshipMapType", propOrder = { "jpaRelationship" }) +@XmlType(name = "JPARelationshipMapType", propOrder = {"jpaRelationship"}) public class JPARelationshipMapType { - @XmlElement(name = "JPARelationship") - protected List jpaRelationship; - - /** - * Gets the value of the jpaRelationship property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaRelationship property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPARelationship().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship } - * - * - */ - public List getJPARelationship() { - if (jpaRelationship == null) { - jpaRelationship = new ArrayList(); - } - return jpaRelationship; - } - - /** - * - * Java class for anonymous complex type. - * - * - * The following schema fragment specifies the expected content contained - * within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPARelationship { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "JPARelationship") + protected List jpaRelationship; /** - * Gets the value of the value property. + * Gets the value of the jpaRelationship property. * - * @return possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaRelationship property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: * - * @param value - * allowed object is {@link String } + * + * getJPARelationship().add(newItem); + * * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. * - * @return possible object is {@link String } + * + * Objects of the following type(s) are allowed in the list + * {@link JPARelationshipMapType.JPARelationship } + * * */ - public String getName() { - return name; + public List getJPARelationship() { + if (jpaRelationship == null) { + jpaRelationship = new ArrayList(); + } + return jpaRelationship; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @param value - * allowed object is {@link String } * */ - public void setName(final String value) { - name = value; - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPARelationship { + + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java index 45a7c3f9b..ed06d3832 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java @@ -1,28 +1,24 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ /** - * OData JPA Processor API Library - Mapping Model - * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes. - * - * + * OData JPA Processor API Library - Mapping Model The JPA EDM Mapping model (XML document) + * is represented as JAXB annotated Java Classes. + * + * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.olingo.odata2.jpa.processor.api.model.mapping; diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index c8eb662a5..2c09c1faa 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ org.apache.olingo olingo-odata2-jpa-processor - 2.0.13 + 3.0.0-SNAPSHOT ../ @@ -68,10 +68,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.6 - 1.6 + 17 + 17 @@ -88,9 +87,8 @@ - org.eclipse.persistence - javax.persistence - ${version.javax.persistence} + jakarta.persistence + jakarta.persistence-api @@ -122,14 +120,13 @@ junit junit - 4.9 test - org.easymock - easymock - 3.1 - test + org.easymock + easymock + 5.2.0 + test @@ -138,7 +135,6 @@ org.slf4j slf4j-api - 1.7.2 test
Java class for JPAAttributeMapType complex type. - * - *
The following schema fragment specifies the expected content contained within this class. - * + * + * + *
+ * Java class for JPAAttributeMapType complex type. + * + *
+ * The following schema fragment specifies the expected content contained within this class. + * *
* <complexType name="JPAAttributeMapType"> * <complexContent> @@ -60,143 +55,139 @@ * </complexContent> * </complexType> *
- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the jpaAttribute property. - * - *
set
- * For example, to add a new item, do as follows: - *
- * getJPAAttribute().add(newItem); - *
- * Objects of the following type(s) are allowed in the list {@link JPAAttributeMapType.JPAAttribute } - * - * - */ - public List getJPAAttribute() { - if (jpaAttribute == null) { - jpaAttribute = new ArrayList(); - } - return jpaAttribute; - } - - /** - * Java class for anonymous complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPAAttribute { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; + @XmlElement(name = "JPAAttribute") + protected List jpaAttribute; /** - * Gets the value of the value property. + * Gets the value of the jpaAttribute property. * - * @return - * possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaAttribute property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: + * + * + * getJPAAttribute().add(newItem); + * * - * @param value - * allowed object is {@link String } * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. + * + * Objects of the following type(s) are allowed in the list + * {@link JPAAttributeMapType.JPAAttribute } * - * @return - * possible object is {@link String } * */ - public String getName() { - return name; + public List getJPAAttribute() { + if (jpaAttribute == null) { + jpaAttribute = new ArrayList(); + } + return jpaAttribute; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. * - * @param value - * allowed object is {@link String } + * + * The following schema fragment specifies the expected content contained within this class. * - */ - public void setName(final String value) { - name = value; - } - - /** - * Gets the value of the exclude property. + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @return - * possible object is {@link Boolean } * */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; - } - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPAAttribute { - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; + } + + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java index a4175d481..b2b255cbe 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java @@ -1,37 +1,32 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for anonymous complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType> * <complexContent> @@ -44,36 +39,35 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { "persistenceUnit" }) +@XmlType(name = "", propOrder = {"persistenceUnit"}) @XmlRootElement(name = "JPAEDMMappingModel") public class JPAEdmMappingModel { - @XmlElement(name = "PersistenceUnit", required = true) - protected JPAPersistenceUnitMapType persistenceUnit; + @XmlElement(name = "PersistenceUnit", required = true) + protected JPAPersistenceUnitMapType persistenceUnit; - /** - * Gets the value of the persistenceUnit property. - * - * @return possible object is {@link JPAPersistenceUnitMapType } - * - */ - public JPAPersistenceUnitMapType getPersistenceUnit() { - return persistenceUnit; - } + /** + * Gets the value of the persistenceUnit property. + * + * @return possible object is {@link JPAPersistenceUnitMapType } + * + */ + public JPAPersistenceUnitMapType getPersistenceUnit() { + return persistenceUnit; + } - /** - * Sets the value of the persistenceUnit property. - * - * @param value - * allowed object is {@link JPAPersistenceUnitMapType } - * - */ - public void setPersistenceUnit(final JPAPersistenceUnitMapType value) { - persistenceUnit = value; - } + /** + * Sets the value of the persistenceUnit property. + * + * @param value allowed object is {@link JPAPersistenceUnitMapType } + * + */ + public void setPersistenceUnit(final JPAPersistenceUnitMapType value) { + persistenceUnit = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java index 84f8b282b..5ab4991bc 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java @@ -1,85 +1,83 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** - * This object contains factory methods for each Java content interface and Java - * element interface generated in the - * org.apache.olingo.odata2.processor.api.jpa.model.mapping package. + * This object contains factory methods for each Java content interface and Java element interface + * generated in the org.apache.olingo.odata2.processor.api.jpa.model.mapping package. * - * An ObjectFactory allows you to programatically construct new instances of the - * Java representation for XML content. The Java representation of XML content - * can consist of schema derived interfaces and classes representing the binding - * of schema type definitions, element declarations and model groups. Factory - * methods for each of these are provided in this class. - * + * An ObjectFactory allows you to programatically construct new instances of the Java representation + * for XML content. The Java representation of XML content can consist of schema derived interfaces + * and classes representing the binding of schema type definitions, element declarations and model + * groups. Factory methods for each of these are provided in this class. + * */ @XmlRegistry public class JPAEdmMappingModelFactory { - /** - * Create a new ObjectFactory that can be used to create new instances of - * schema derived classes for package: - * org.apache.olingo.odata2.processor.api.jpa.model.mapping - * - */ - public JPAEdmMappingModelFactory() {} + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for + * package: org.apache.olingo.odata2.processor.api.jpa.model.mapping + * + */ + public JPAEdmMappingModelFactory() {} - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType } - * - */ - public JPARelationshipMapType createJPARelationshipMapType() { - return new JPARelationshipMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType } + * + */ + public JPARelationshipMapType createJPARelationshipMapType() { + return new JPARelationshipMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType } - * - */ - public JPAAttributeMapType createJPAAttributeMapType() { - return new JPAAttributeMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType } + * + */ + public JPAAttributeMapType createJPAAttributeMapType() { + return new JPAAttributeMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel } - * - */ - public JPAEdmMappingModel createJPAEDMMappingModel() { - return new JPAEdmMappingModel(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel } + * + */ + public JPAEdmMappingModel createJPAEDMMappingModel() { + return new JPAEdmMappingModel(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType } - * - */ - public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() { - return new JPAPersistenceUnitMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType } + * + */ + public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() { + return new JPAPersistenceUnitMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType } - * - */ - public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() { - return new JPAEmbeddableTypeMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType } + * + */ + public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() { + return new JPAEmbeddableTypeMapType(); + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java index e64067387..47803af26 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java @@ -1,40 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * The default name for EDM - * complex type is derived from JPA Embeddable type name. This can be + * + * The default name for EDM complex type is derived from JPA Embeddable type name. This can be * overriden using JPAEmbeddableTypeMapType. - * - * - * Java class for JPAEmbeddableTypeMapType complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * + * + * + * + * Java class for JPAEmbeddableTypeMapType complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEmbeddableTypeMapType"> * <complexContent> @@ -50,112 +47,103 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = { "edmComplexType", "jpaAttributes" }) +@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = {"edmComplexType", "jpaAttributes"}) public class JPAEmbeddableTypeMapType { - @XmlElement(name = "EDMComplexType") - protected String edmComplexType; - @XmlElement(name = "JPAAttributes", required = true) - protected JPAAttributeMapType jpaAttributes; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; + @XmlElement(name = "EDMComplexType") + protected String edmComplexType; + @XmlElement(name = "JPAAttributes", required = true) + protected JPAAttributeMapType jpaAttributes; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; - /** - * Gets the value of the edmComplexType property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMComplexType() { - return edmComplexType; - } + /** + * Gets the value of the edmComplexType property. + * + * @return possible object is {@link String } + * + */ + public String getEDMComplexType() { + return edmComplexType; + } - /** - * Sets the value of the edmComplexType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMComplexType(final String value) { - edmComplexType = value; - } + /** + * Sets the value of the edmComplexType property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMComplexType(final String value) { + edmComplexType = value; + } - /** - * Gets the value of the jpaAttributes property. - * - * @return - * possible object is {@link JPAAttributeMapType } - * - */ - public JPAAttributeMapType getJPAAttributes() { - return jpaAttributes; - } + /** + * Gets the value of the jpaAttributes property. + * + * @return possible object is {@link JPAAttributeMapType } + * + */ + public JPAAttributeMapType getJPAAttributes() { + return jpaAttributes; + } - /** - * Sets the value of the jpaAttributes property. - * - * @param value - * allowed object is {@link JPAAttributeMapType } - * - */ - public void setJPAAttributes(final JPAAttributeMapType value) { - jpaAttributes = value; - } + /** + * Sets the value of the jpaAttributes property. + * + * @param value allowed object is {@link JPAAttributeMapType } + * + */ + public void setJPAAttributes(final JPAAttributeMapType value) { + jpaAttributes = value; + } - /** - * Gets the value of the name property. - * - * @return - * possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } - /** - * Gets the value of the exclude property. - * - * @return - * possible object is {@link Boolean } - * - */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; } - } - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java index 629312444..6bec5a120 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java @@ -1,39 +1,33 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for JPAEmbeddableTypesMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEmbeddableTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEmbeddableTypesMapType", propOrder = { "jpaEmbeddableType" }) +@XmlType(name = "JPAEmbeddableTypesMapType", propOrder = {"jpaEmbeddableType"}) public class JPAEmbeddableTypesMapType { - @XmlElement(name = "JPAEmbeddableType") - protected List jpaEmbeddableType; + @XmlElement(name = "JPAEmbeddableType") + protected List jpaEmbeddableType; - /** - * Gets the value of the jpaEmbeddableType property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEmbeddableType property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPAEmbeddableType().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType } - * - * - */ - public List getJPAEmbeddableType() { - if (jpaEmbeddableType == null) { - jpaEmbeddableType = new ArrayList(); + /** + * Gets the value of the jpaEmbeddableType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEmbeddableType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEmbeddableType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType } + * + * + */ + public List getJPAEmbeddableType() { + if (jpaEmbeddableType == null) { + jpaEmbeddableType = new ArrayList(); + } + return jpaEmbeddableType; } - return jpaEmbeddableType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java index 22e181922..8c989234d 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java @@ -1,40 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * The default name for EDM - * entity type is derived from JPA entity type name. This can be - * overriden using JPAEntityTypeMapType. - * - * - * Java class for JPAEntityTypeMapType complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * + * + * The default name for EDM entity type is derived from JPA entity type name. This can be overriden + * using JPAEntityTypeMapType. + * + * + * + * Java class for JPAEntityTypeMapType complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypeMapType"> * <complexContent> @@ -53,161 +50,147 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypeMapType", propOrder = { "edmEntityType", "edmEntitySet", "jpaAttributes", - "jpaRelationships" }) +@XmlType(name = "JPAEntityTypeMapType", propOrder = {"edmEntityType", "edmEntitySet", "jpaAttributes", "jpaRelationships"}) public class JPAEntityTypeMapType { - @XmlElement(name = "EDMEntityType") - protected String edmEntityType; - @XmlElement(name = "EDMEntitySet") - protected String edmEntitySet; - @XmlElement(name = "JPAAttributes", required = true) - protected JPAAttributeMapType jpaAttributes; - @XmlElement(name = "JPARelationships", required = true) - protected JPARelationshipMapType jpaRelationships; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; - - /** - * Gets the value of the edmEntityType property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntityType() { - return edmEntityType; - } - - /** - * Sets the value of the edmEntityType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntityType(final String value) { - edmEntityType = value; - } - - /** - * Gets the value of the edmEntitySet property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntitySet() { - return edmEntitySet; - } - - /** - * Sets the value of the edmEntitySet property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntitySet(final String value) { - edmEntitySet = value; - } - - /** - * Gets the value of the jpaAttributes property. - * - * @return - * possible object is {@link JPAAttributeMapType } - * - */ - public JPAAttributeMapType getJPAAttributes() { - return jpaAttributes; - } - - /** - * Sets the value of the jpaAttributes property. - * - * @param value - * allowed object is {@link JPAAttributeMapType } - * - */ - public void setJPAAttributes(final JPAAttributeMapType value) { - jpaAttributes = value; - } - - /** - * Gets the value of the jpaRelationships property. - * - * @return - * possible object is {@link JPARelationshipMapType } - * - */ - public JPARelationshipMapType getJPARelationships() { - return jpaRelationships; - } - - /** - * Sets the value of the jpaRelationships property. - * - * @param value - * allowed object is {@link JPARelationshipMapType } - * - */ - public void setJPARelationships(final JPARelationshipMapType value) { - jpaRelationships = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } - - /** - * Gets the value of the exclude property. - * - * @return - * possible object is {@link Boolean } - * - */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; + @XmlElement(name = "EDMEntityType") + protected String edmEntityType; + @XmlElement(name = "EDMEntitySet") + protected String edmEntitySet; + @XmlElement(name = "JPAAttributes", required = true) + protected JPAAttributeMapType jpaAttributes; + @XmlElement(name = "JPARelationships", required = true) + protected JPARelationshipMapType jpaRelationships; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; + + /** + * Gets the value of the edmEntityType property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntityType() { + return edmEntityType; + } + + /** + * Sets the value of the edmEntityType property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntityType(final String value) { + edmEntityType = value; + } + + /** + * Gets the value of the edmEntitySet property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntitySet() { + return edmEntitySet; + } + + /** + * Sets the value of the edmEntitySet property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntitySet(final String value) { + edmEntitySet = value; + } + + /** + * Gets the value of the jpaAttributes property. + * + * @return possible object is {@link JPAAttributeMapType } + * + */ + public JPAAttributeMapType getJPAAttributes() { + return jpaAttributes; + } + + /** + * Sets the value of the jpaAttributes property. + * + * @param value allowed object is {@link JPAAttributeMapType } + * + */ + public void setJPAAttributes(final JPAAttributeMapType value) { + jpaAttributes = value; + } + + /** + * Gets the value of the jpaRelationships property. + * + * @return possible object is {@link JPARelationshipMapType } + * + */ + public JPARelationshipMapType getJPARelationships() { + return jpaRelationships; + } + + /** + * Sets the value of the jpaRelationships property. + * + * @param value allowed object is {@link JPARelationshipMapType } + * + */ + public void setJPARelationships(final JPARelationshipMapType value) { + jpaRelationships = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; + } + + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; } - } - - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java index 7a72e0848..afacaceca 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java @@ -1,39 +1,33 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for JPAEntityTypesMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypesMapType", propOrder = { "jpaEntityType" }) +@XmlType(name = "JPAEntityTypesMapType", propOrder = {"jpaEntityType"}) public class JPAEntityTypesMapType { - @XmlElement(name = "JPAEntityType") - protected List jpaEntityType; + @XmlElement(name = "JPAEntityType") + protected List jpaEntityType; - /** - * Gets the value of the jpaEntityType property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEntityType property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPAEntityType().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } - * - * - */ - public List getJPAEntityType() { - if (jpaEntityType == null) { - jpaEntityType = new ArrayList(); + /** + * Gets the value of the jpaEntityType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEntityType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEntityType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } + * + * + */ + public List getJPAEntityType() { + if (jpaEntityType == null) { + jpaEntityType = new ArrayList(); + } + return jpaEntityType; } - return jpaEntityType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java index 22260eac1..7ce8c0aa0 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java @@ -1,42 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * By default Java Persistence Unit name is taken as EDM schema name. This can - * be overriden using JPAPersistenceUnitMapType. - * - * + * + * By default Java Persistence Unit name is taken as EDM schema name. This can be overriden using + * JPAPersistenceUnitMapType. + * + * * * Java class for JPAPersistenceUnitMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAPersistenceUnitMapType"> * <complexContent> @@ -53,105 +48,100 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAPersistenceUnitMapType", - propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" }) +@XmlType(name = "JPAPersistenceUnitMapType", propOrder = {"edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes"}) public class JPAPersistenceUnitMapType { - @XmlElement(name = "EDMSchemaNamespace") - protected String edmSchemaNamespace; - @XmlElement(name = "JPAEntityTypes", required = true) - protected JPAEntityTypesMapType jpaEntityTypes; - @XmlElement(name = "JPAEmbeddableTypes", required = true) - protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "EDMSchemaNamespace") + protected String edmSchemaNamespace; + @XmlElement(name = "JPAEntityTypes", required = true) + protected JPAEntityTypesMapType jpaEntityTypes; + @XmlElement(name = "JPAEmbeddableTypes", required = true) + protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; + @XmlAttribute(name = "name", required = true) + protected String name; - /** - * Gets the value of the edmSchemaNamespace property. - * - * @return possible object is {@link String } - * - */ - public String getEDMSchemaNamespace() { - return edmSchemaNamespace; - } + /** + * Gets the value of the edmSchemaNamespace property. + * + * @return possible object is {@link String } + * + */ + public String getEDMSchemaNamespace() { + return edmSchemaNamespace; + } - /** - * Sets the value of the edmSchemaNamespace property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMSchemaNamespace(final String value) { - edmSchemaNamespace = value; - } + /** + * Sets the value of the edmSchemaNamespace property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMSchemaNamespace(final String value) { + edmSchemaNamespace = value; + } - /** - * Gets the value of the jpaEntityTypes property. - * - * @return possible object is {@link JPAEntityTypesMapType } - * - */ - public JPAEntityTypesMapType getJPAEntityTypes() { - return jpaEntityTypes; - } + /** + * Gets the value of the jpaEntityTypes property. + * + * @return possible object is {@link JPAEntityTypesMapType } + * + */ + public JPAEntityTypesMapType getJPAEntityTypes() { + return jpaEntityTypes; + } - /** - * Sets the value of the jpaEntityTypes property. - * - * @param value - * allowed object is {@link JPAEntityTypesMapType } - * - */ - public void setJPAEntityTypes(final JPAEntityTypesMapType value) { - jpaEntityTypes = value; - } + /** + * Sets the value of the jpaEntityTypes property. + * + * @param value allowed object is {@link JPAEntityTypesMapType } + * + */ + public void setJPAEntityTypes(final JPAEntityTypesMapType value) { + jpaEntityTypes = value; + } - /** - * Gets the value of the jpaEmbeddableTypes property. - * - * @return possible object is {@link JPAEmbeddableTypesMapType } - * - */ - public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { - return jpaEmbeddableTypes; - } + /** + * Gets the value of the jpaEmbeddableTypes property. + * + * @return possible object is {@link JPAEmbeddableTypesMapType } + * + */ + public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { + return jpaEmbeddableTypes; + } - /** - * Sets the value of the jpaEmbeddableTypes property. - * - * @param value - * allowed object is {@link JPAEmbeddableTypesMapType } - * - */ - public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { - jpaEmbeddableTypes = value; - } + /** + * Sets the value of the jpaEmbeddableTypes property. + * + * @param value allowed object is {@link JPAEmbeddableTypesMapType } + * + */ + public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { + jpaEmbeddableTypes = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java index 25a2f9569..50970877e 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java @@ -1,46 +1,40 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** - * - * The default name for EDM navigation property is derived from JPA relationship - * name. This can be overriden using JPARelationshipMapType. - * - * + * + * The default name for EDM navigation property is derived from JPA relationship name. This can be + * overriden using JPARelationshipMapType. + * + * * * Java class for JPARelationshipMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPARelationshipMapType"> * <complexContent> @@ -60,116 +54,113 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPARelationshipMapType", propOrder = { "jpaRelationship" }) +@XmlType(name = "JPARelationshipMapType", propOrder = {"jpaRelationship"}) public class JPARelationshipMapType { - @XmlElement(name = "JPARelationship") - protected List jpaRelationship; - - /** - * Gets the value of the jpaRelationship property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaRelationship property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPARelationship().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship } - * - * - */ - public List getJPARelationship() { - if (jpaRelationship == null) { - jpaRelationship = new ArrayList(); - } - return jpaRelationship; - } - - /** - * - * Java class for anonymous complex type. - * - * - * The following schema fragment specifies the expected content contained - * within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPARelationship { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "JPARelationship") + protected List jpaRelationship; /** - * Gets the value of the value property. + * Gets the value of the jpaRelationship property. * - * @return possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaRelationship property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: * - * @param value - * allowed object is {@link String } + * + * getJPARelationship().add(newItem); + * * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. * - * @return possible object is {@link String } + * + * Objects of the following type(s) are allowed in the list + * {@link JPARelationshipMapType.JPARelationship } + * * */ - public String getName() { - return name; + public List getJPARelationship() { + if (jpaRelationship == null) { + jpaRelationship = new ArrayList(); + } + return jpaRelationship; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @param value - * allowed object is {@link String } * */ - public void setName(final String value) { - name = value; - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPARelationship { + + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java index 45a7c3f9b..ed06d3832 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java @@ -1,28 +1,24 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ /** - * OData JPA Processor API Library - Mapping Model - * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes. - * - * + * OData JPA Processor API Library - Mapping Model The JPA EDM Mapping model (XML document) + * is represented as JAXB annotated Java Classes. + * + * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.olingo.odata2.jpa.processor.api.model.mapping; diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index c8eb662a5..2c09c1faa 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ org.apache.olingo olingo-odata2-jpa-processor - 2.0.13 + 3.0.0-SNAPSHOT ../ @@ -68,10 +68,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.6 - 1.6 + 17 + 17 @@ -88,9 +87,8 @@ - org.eclipse.persistence - javax.persistence - ${version.javax.persistence} + jakarta.persistence + jakarta.persistence-api @@ -122,14 +120,13 @@ junit junit - 4.9 test - org.easymock - easymock - 3.1 - test + org.easymock + easymock + 5.2.0 + test @@ -138,7 +135,6 @@ org.slf4j slf4j-api - 1.7.2 test
Java class for anonymous complex type. - * - *
The following schema fragment specifies the expected content contained within this class. - * - *
- * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> - * </extension> - * </simpleContent> - * </complexType> - *
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaAttribute property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + *
+ * For example, to add a new item, do as follows: + * + *
+ * getJPAAttribute().add(newItem); + *
+ * Objects of the following type(s) are allowed in the list + * {@link JPAAttributeMapType.JPAAttribute } * - * @return - * possible object is {@link String } * */ - public String getName() { - return name; + public List getJPAAttribute() { + if (jpaAttribute == null) { + jpaAttribute = new ArrayList(); + } + return jpaAttribute; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. * - * @param value - * allowed object is {@link String } + * + * The following schema fragment specifies the expected content contained within this class. * - */ - public void setName(final String value) { - name = value; - } - - /** - * Gets the value of the exclude property. + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @return - * possible object is {@link Boolean } * */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; - } - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPAAttribute { - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; + } + + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java index a4175d481..b2b255cbe 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModel.java @@ -1,37 +1,32 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for anonymous complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType> * <complexContent> @@ -44,36 +39,35 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "", propOrder = { "persistenceUnit" }) +@XmlType(name = "", propOrder = {"persistenceUnit"}) @XmlRootElement(name = "JPAEDMMappingModel") public class JPAEdmMappingModel { - @XmlElement(name = "PersistenceUnit", required = true) - protected JPAPersistenceUnitMapType persistenceUnit; + @XmlElement(name = "PersistenceUnit", required = true) + protected JPAPersistenceUnitMapType persistenceUnit; - /** - * Gets the value of the persistenceUnit property. - * - * @return possible object is {@link JPAPersistenceUnitMapType } - * - */ - public JPAPersistenceUnitMapType getPersistenceUnit() { - return persistenceUnit; - } + /** + * Gets the value of the persistenceUnit property. + * + * @return possible object is {@link JPAPersistenceUnitMapType } + * + */ + public JPAPersistenceUnitMapType getPersistenceUnit() { + return persistenceUnit; + } - /** - * Sets the value of the persistenceUnit property. - * - * @param value - * allowed object is {@link JPAPersistenceUnitMapType } - * - */ - public void setPersistenceUnit(final JPAPersistenceUnitMapType value) { - persistenceUnit = value; - } + /** + * Sets the value of the persistenceUnit property. + * + * @param value allowed object is {@link JPAPersistenceUnitMapType } + * + */ + public void setPersistenceUnit(final JPAPersistenceUnitMapType value) { + persistenceUnit = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java index 84f8b282b..5ab4991bc 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEdmMappingModelFactory.java @@ -1,85 +1,83 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** - * This object contains factory methods for each Java content interface and Java - * element interface generated in the - * org.apache.olingo.odata2.processor.api.jpa.model.mapping package. + * This object contains factory methods for each Java content interface and Java element interface + * generated in the org.apache.olingo.odata2.processor.api.jpa.model.mapping package. * - * An ObjectFactory allows you to programatically construct new instances of the - * Java representation for XML content. The Java representation of XML content - * can consist of schema derived interfaces and classes representing the binding - * of schema type definitions, element declarations and model groups. Factory - * methods for each of these are provided in this class. - * + * An ObjectFactory allows you to programatically construct new instances of the Java representation + * for XML content. The Java representation of XML content can consist of schema derived interfaces + * and classes representing the binding of schema type definitions, element declarations and model + * groups. Factory methods for each of these are provided in this class. + * */ @XmlRegistry public class JPAEdmMappingModelFactory { - /** - * Create a new ObjectFactory that can be used to create new instances of - * schema derived classes for package: - * org.apache.olingo.odata2.processor.api.jpa.model.mapping - * - */ - public JPAEdmMappingModelFactory() {} + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for + * package: org.apache.olingo.odata2.processor.api.jpa.model.mapping + * + */ + public JPAEdmMappingModelFactory() {} - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType } - * - */ - public JPARelationshipMapType createJPARelationshipMapType() { - return new JPARelationshipMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType } + * + */ + public JPARelationshipMapType createJPARelationshipMapType() { + return new JPARelationshipMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType } - * - */ - public JPAAttributeMapType createJPAAttributeMapType() { - return new JPAAttributeMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType } + * + */ + public JPAAttributeMapType createJPAAttributeMapType() { + return new JPAAttributeMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel } - * - */ - public JPAEdmMappingModel createJPAEDMMappingModel() { - return new JPAEdmMappingModel(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel } + * + */ + public JPAEdmMappingModel createJPAEDMMappingModel() { + return new JPAEdmMappingModel(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType } - * - */ - public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() { - return new JPAPersistenceUnitMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType } + * + */ + public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() { + return new JPAPersistenceUnitMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType } - * - */ - public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() { - return new JPAEmbeddableTypeMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType } + * + */ + public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() { + return new JPAEmbeddableTypeMapType(); + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java index e64067387..47803af26 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java @@ -1,40 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * The default name for EDM - * complex type is derived from JPA Embeddable type name. This can be + * + * The default name for EDM complex type is derived from JPA Embeddable type name. This can be * overriden using JPAEmbeddableTypeMapType. - * - * - * Java class for JPAEmbeddableTypeMapType complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * + * + * + * + * Java class for JPAEmbeddableTypeMapType complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEmbeddableTypeMapType"> * <complexContent> @@ -50,112 +47,103 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = { "edmComplexType", "jpaAttributes" }) +@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = {"edmComplexType", "jpaAttributes"}) public class JPAEmbeddableTypeMapType { - @XmlElement(name = "EDMComplexType") - protected String edmComplexType; - @XmlElement(name = "JPAAttributes", required = true) - protected JPAAttributeMapType jpaAttributes; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; + @XmlElement(name = "EDMComplexType") + protected String edmComplexType; + @XmlElement(name = "JPAAttributes", required = true) + protected JPAAttributeMapType jpaAttributes; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; - /** - * Gets the value of the edmComplexType property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMComplexType() { - return edmComplexType; - } + /** + * Gets the value of the edmComplexType property. + * + * @return possible object is {@link String } + * + */ + public String getEDMComplexType() { + return edmComplexType; + } - /** - * Sets the value of the edmComplexType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMComplexType(final String value) { - edmComplexType = value; - } + /** + * Sets the value of the edmComplexType property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMComplexType(final String value) { + edmComplexType = value; + } - /** - * Gets the value of the jpaAttributes property. - * - * @return - * possible object is {@link JPAAttributeMapType } - * - */ - public JPAAttributeMapType getJPAAttributes() { - return jpaAttributes; - } + /** + * Gets the value of the jpaAttributes property. + * + * @return possible object is {@link JPAAttributeMapType } + * + */ + public JPAAttributeMapType getJPAAttributes() { + return jpaAttributes; + } - /** - * Sets the value of the jpaAttributes property. - * - * @param value - * allowed object is {@link JPAAttributeMapType } - * - */ - public void setJPAAttributes(final JPAAttributeMapType value) { - jpaAttributes = value; - } + /** + * Sets the value of the jpaAttributes property. + * + * @param value allowed object is {@link JPAAttributeMapType } + * + */ + public void setJPAAttributes(final JPAAttributeMapType value) { + jpaAttributes = value; + } - /** - * Gets the value of the name property. - * - * @return - * possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } - /** - * Gets the value of the exclude property. - * - * @return - * possible object is {@link Boolean } - * - */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; } - } - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java index 629312444..6bec5a120 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypesMapType.java @@ -1,39 +1,33 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for JPAEmbeddableTypesMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEmbeddableTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEmbeddableTypesMapType", propOrder = { "jpaEmbeddableType" }) +@XmlType(name = "JPAEmbeddableTypesMapType", propOrder = {"jpaEmbeddableType"}) public class JPAEmbeddableTypesMapType { - @XmlElement(name = "JPAEmbeddableType") - protected List jpaEmbeddableType; + @XmlElement(name = "JPAEmbeddableType") + protected List jpaEmbeddableType; - /** - * Gets the value of the jpaEmbeddableType property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEmbeddableType property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPAEmbeddableType().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType } - * - * - */ - public List getJPAEmbeddableType() { - if (jpaEmbeddableType == null) { - jpaEmbeddableType = new ArrayList(); + /** + * Gets the value of the jpaEmbeddableType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEmbeddableType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEmbeddableType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType } + * + * + */ + public List getJPAEmbeddableType() { + if (jpaEmbeddableType == null) { + jpaEmbeddableType = new ArrayList(); + } + return jpaEmbeddableType; } - return jpaEmbeddableType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java index 22e181922..8c989234d 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java @@ -1,40 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * The default name for EDM - * entity type is derived from JPA entity type name. This can be - * overriden using JPAEntityTypeMapType. - * - * - * Java class for JPAEntityTypeMapType complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * + * + * The default name for EDM entity type is derived from JPA entity type name. This can be overriden + * using JPAEntityTypeMapType. + * + * + * + * Java class for JPAEntityTypeMapType complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypeMapType"> * <complexContent> @@ -53,161 +50,147 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypeMapType", propOrder = { "edmEntityType", "edmEntitySet", "jpaAttributes", - "jpaRelationships" }) +@XmlType(name = "JPAEntityTypeMapType", propOrder = {"edmEntityType", "edmEntitySet", "jpaAttributes", "jpaRelationships"}) public class JPAEntityTypeMapType { - @XmlElement(name = "EDMEntityType") - protected String edmEntityType; - @XmlElement(name = "EDMEntitySet") - protected String edmEntitySet; - @XmlElement(name = "JPAAttributes", required = true) - protected JPAAttributeMapType jpaAttributes; - @XmlElement(name = "JPARelationships", required = true) - protected JPARelationshipMapType jpaRelationships; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; - - /** - * Gets the value of the edmEntityType property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntityType() { - return edmEntityType; - } - - /** - * Sets the value of the edmEntityType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntityType(final String value) { - edmEntityType = value; - } - - /** - * Gets the value of the edmEntitySet property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntitySet() { - return edmEntitySet; - } - - /** - * Sets the value of the edmEntitySet property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntitySet(final String value) { - edmEntitySet = value; - } - - /** - * Gets the value of the jpaAttributes property. - * - * @return - * possible object is {@link JPAAttributeMapType } - * - */ - public JPAAttributeMapType getJPAAttributes() { - return jpaAttributes; - } - - /** - * Sets the value of the jpaAttributes property. - * - * @param value - * allowed object is {@link JPAAttributeMapType } - * - */ - public void setJPAAttributes(final JPAAttributeMapType value) { - jpaAttributes = value; - } - - /** - * Gets the value of the jpaRelationships property. - * - * @return - * possible object is {@link JPARelationshipMapType } - * - */ - public JPARelationshipMapType getJPARelationships() { - return jpaRelationships; - } - - /** - * Sets the value of the jpaRelationships property. - * - * @param value - * allowed object is {@link JPARelationshipMapType } - * - */ - public void setJPARelationships(final JPARelationshipMapType value) { - jpaRelationships = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } - - /** - * Gets the value of the exclude property. - * - * @return - * possible object is {@link Boolean } - * - */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; + @XmlElement(name = "EDMEntityType") + protected String edmEntityType; + @XmlElement(name = "EDMEntitySet") + protected String edmEntitySet; + @XmlElement(name = "JPAAttributes", required = true) + protected JPAAttributeMapType jpaAttributes; + @XmlElement(name = "JPARelationships", required = true) + protected JPARelationshipMapType jpaRelationships; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; + + /** + * Gets the value of the edmEntityType property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntityType() { + return edmEntityType; + } + + /** + * Sets the value of the edmEntityType property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntityType(final String value) { + edmEntityType = value; + } + + /** + * Gets the value of the edmEntitySet property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntitySet() { + return edmEntitySet; + } + + /** + * Sets the value of the edmEntitySet property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntitySet(final String value) { + edmEntitySet = value; + } + + /** + * Gets the value of the jpaAttributes property. + * + * @return possible object is {@link JPAAttributeMapType } + * + */ + public JPAAttributeMapType getJPAAttributes() { + return jpaAttributes; + } + + /** + * Sets the value of the jpaAttributes property. + * + * @param value allowed object is {@link JPAAttributeMapType } + * + */ + public void setJPAAttributes(final JPAAttributeMapType value) { + jpaAttributes = value; + } + + /** + * Gets the value of the jpaRelationships property. + * + * @return possible object is {@link JPARelationshipMapType } + * + */ + public JPARelationshipMapType getJPARelationships() { + return jpaRelationships; + } + + /** + * Sets the value of the jpaRelationships property. + * + * @param value allowed object is {@link JPARelationshipMapType } + * + */ + public void setJPARelationships(final JPARelationshipMapType value) { + jpaRelationships = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; + } + + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; } - } - - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java index 7a72e0848..afacaceca 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java @@ -1,39 +1,33 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for JPAEntityTypesMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypesMapType", propOrder = { "jpaEntityType" }) +@XmlType(name = "JPAEntityTypesMapType", propOrder = {"jpaEntityType"}) public class JPAEntityTypesMapType { - @XmlElement(name = "JPAEntityType") - protected List jpaEntityType; + @XmlElement(name = "JPAEntityType") + protected List jpaEntityType; - /** - * Gets the value of the jpaEntityType property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEntityType property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPAEntityType().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } - * - * - */ - public List getJPAEntityType() { - if (jpaEntityType == null) { - jpaEntityType = new ArrayList(); + /** + * Gets the value of the jpaEntityType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEntityType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEntityType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } + * + * + */ + public List getJPAEntityType() { + if (jpaEntityType == null) { + jpaEntityType = new ArrayList(); + } + return jpaEntityType; } - return jpaEntityType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java index 22260eac1..7ce8c0aa0 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java @@ -1,42 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * By default Java Persistence Unit name is taken as EDM schema name. This can - * be overriden using JPAPersistenceUnitMapType. - * - * + * + * By default Java Persistence Unit name is taken as EDM schema name. This can be overriden using + * JPAPersistenceUnitMapType. + * + * * * Java class for JPAPersistenceUnitMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAPersistenceUnitMapType"> * <complexContent> @@ -53,105 +48,100 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAPersistenceUnitMapType", - propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" }) +@XmlType(name = "JPAPersistenceUnitMapType", propOrder = {"edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes"}) public class JPAPersistenceUnitMapType { - @XmlElement(name = "EDMSchemaNamespace") - protected String edmSchemaNamespace; - @XmlElement(name = "JPAEntityTypes", required = true) - protected JPAEntityTypesMapType jpaEntityTypes; - @XmlElement(name = "JPAEmbeddableTypes", required = true) - protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "EDMSchemaNamespace") + protected String edmSchemaNamespace; + @XmlElement(name = "JPAEntityTypes", required = true) + protected JPAEntityTypesMapType jpaEntityTypes; + @XmlElement(name = "JPAEmbeddableTypes", required = true) + protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; + @XmlAttribute(name = "name", required = true) + protected String name; - /** - * Gets the value of the edmSchemaNamespace property. - * - * @return possible object is {@link String } - * - */ - public String getEDMSchemaNamespace() { - return edmSchemaNamespace; - } + /** + * Gets the value of the edmSchemaNamespace property. + * + * @return possible object is {@link String } + * + */ + public String getEDMSchemaNamespace() { + return edmSchemaNamespace; + } - /** - * Sets the value of the edmSchemaNamespace property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMSchemaNamespace(final String value) { - edmSchemaNamespace = value; - } + /** + * Sets the value of the edmSchemaNamespace property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMSchemaNamespace(final String value) { + edmSchemaNamespace = value; + } - /** - * Gets the value of the jpaEntityTypes property. - * - * @return possible object is {@link JPAEntityTypesMapType } - * - */ - public JPAEntityTypesMapType getJPAEntityTypes() { - return jpaEntityTypes; - } + /** + * Gets the value of the jpaEntityTypes property. + * + * @return possible object is {@link JPAEntityTypesMapType } + * + */ + public JPAEntityTypesMapType getJPAEntityTypes() { + return jpaEntityTypes; + } - /** - * Sets the value of the jpaEntityTypes property. - * - * @param value - * allowed object is {@link JPAEntityTypesMapType } - * - */ - public void setJPAEntityTypes(final JPAEntityTypesMapType value) { - jpaEntityTypes = value; - } + /** + * Sets the value of the jpaEntityTypes property. + * + * @param value allowed object is {@link JPAEntityTypesMapType } + * + */ + public void setJPAEntityTypes(final JPAEntityTypesMapType value) { + jpaEntityTypes = value; + } - /** - * Gets the value of the jpaEmbeddableTypes property. - * - * @return possible object is {@link JPAEmbeddableTypesMapType } - * - */ - public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { - return jpaEmbeddableTypes; - } + /** + * Gets the value of the jpaEmbeddableTypes property. + * + * @return possible object is {@link JPAEmbeddableTypesMapType } + * + */ + public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { + return jpaEmbeddableTypes; + } - /** - * Sets the value of the jpaEmbeddableTypes property. - * - * @param value - * allowed object is {@link JPAEmbeddableTypesMapType } - * - */ - public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { - jpaEmbeddableTypes = value; - } + /** + * Sets the value of the jpaEmbeddableTypes property. + * + * @param value allowed object is {@link JPAEmbeddableTypesMapType } + * + */ + public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { + jpaEmbeddableTypes = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java index 25a2f9569..50970877e 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java @@ -1,46 +1,40 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** - * - * The default name for EDM navigation property is derived from JPA relationship - * name. This can be overriden using JPARelationshipMapType. - * - * + * + * The default name for EDM navigation property is derived from JPA relationship name. This can be + * overriden using JPARelationshipMapType. + * + * * * Java class for JPARelationshipMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPARelationshipMapType"> * <complexContent> @@ -60,116 +54,113 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPARelationshipMapType", propOrder = { "jpaRelationship" }) +@XmlType(name = "JPARelationshipMapType", propOrder = {"jpaRelationship"}) public class JPARelationshipMapType { - @XmlElement(name = "JPARelationship") - protected List jpaRelationship; - - /** - * Gets the value of the jpaRelationship property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaRelationship property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPARelationship().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship } - * - * - */ - public List getJPARelationship() { - if (jpaRelationship == null) { - jpaRelationship = new ArrayList(); - } - return jpaRelationship; - } - - /** - * - * Java class for anonymous complex type. - * - * - * The following schema fragment specifies the expected content contained - * within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPARelationship { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "JPARelationship") + protected List jpaRelationship; /** - * Gets the value of the value property. + * Gets the value of the jpaRelationship property. * - * @return possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaRelationship property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: * - * @param value - * allowed object is {@link String } + * + * getJPARelationship().add(newItem); + * * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. * - * @return possible object is {@link String } + * + * Objects of the following type(s) are allowed in the list + * {@link JPARelationshipMapType.JPARelationship } + * * */ - public String getName() { - return name; + public List getJPARelationship() { + if (jpaRelationship == null) { + jpaRelationship = new ArrayList(); + } + return jpaRelationship; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @param value - * allowed object is {@link String } * */ - public void setName(final String value) { - name = value; - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPARelationship { + + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java index 45a7c3f9b..ed06d3832 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java @@ -1,28 +1,24 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ /** - * OData JPA Processor API Library - Mapping Model - * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes. - * - * + * OData JPA Processor API Library - Mapping Model The JPA EDM Mapping model (XML document) + * is represented as JAXB annotated Java Classes. + * + * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.olingo.odata2.jpa.processor.api.model.mapping; diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index c8eb662a5..2c09c1faa 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ org.apache.olingo olingo-odata2-jpa-processor - 2.0.13 + 3.0.0-SNAPSHOT ../ @@ -68,10 +68,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.6 - 1.6 + 17 + 17 @@ -88,9 +87,8 @@ - org.eclipse.persistence - javax.persistence - ${version.javax.persistence} + jakarta.persistence + jakarta.persistence-api @@ -122,14 +120,13 @@ junit junit - 4.9 test - org.easymock - easymock - 3.1 - test + org.easymock + easymock + 5.2.0 + test @@ -138,7 +135,6 @@ org.slf4j slf4j-api - 1.7.2 test
+ * Java class for anonymous complex type. * - * @param value - * allowed object is {@link String } + *
+ * The following schema fragment specifies the expected content contained within this class. * - */ - public void setName(final String value) { - name = value; - } - - /** - * Gets the value of the exclude property. + *
+ * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * </extension> + * </simpleContent> + * </complexType> + *
* Java class for anonymous complex type. - * + * *
- * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * *
* <complexType> * <complexContent> @@ -44,36 +39,35 @@ * </complexContent> * </complexType> *
- * An ObjectFactory allows you to programatically construct new instances of the - * Java representation for XML content. The Java representation of XML content - * can consist of schema derived interfaces and classes representing the binding - * of schema type definitions, element declarations and model groups. Factory - * methods for each of these are provided in this class. - * + * An ObjectFactory allows you to programatically construct new instances of the Java representation + * for XML content. The Java representation of XML content can consist of schema derived interfaces + * and classes representing the binding of schema type definitions, element declarations and model + * groups. Factory methods for each of these are provided in this class. + * */ @XmlRegistry public class JPAEdmMappingModelFactory { - /** - * Create a new ObjectFactory that can be used to create new instances of - * schema derived classes for package: - * org.apache.olingo.odata2.processor.api.jpa.model.mapping - * - */ - public JPAEdmMappingModelFactory() {} + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for + * package: org.apache.olingo.odata2.processor.api.jpa.model.mapping + * + */ + public JPAEdmMappingModelFactory() {} - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType } - * - */ - public JPARelationshipMapType createJPARelationshipMapType() { - return new JPARelationshipMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPARelationshipMapType } + * + */ + public JPARelationshipMapType createJPARelationshipMapType() { + return new JPARelationshipMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType } - * - */ - public JPAAttributeMapType createJPAAttributeMapType() { - return new JPAAttributeMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAAttributeMapType } + * + */ + public JPAAttributeMapType createJPAAttributeMapType() { + return new JPAAttributeMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel } - * - */ - public JPAEdmMappingModel createJPAEDMMappingModel() { - return new JPAEdmMappingModel(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEdmMappingModel } + * + */ + public JPAEdmMappingModel createJPAEDMMappingModel() { + return new JPAEdmMappingModel(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType } - * - */ - public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() { - return new JPAPersistenceUnitMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAPersistenceUnitMapType } + * + */ + public JPAPersistenceUnitMapType createJPAPersistenceUnitMapType() { + return new JPAPersistenceUnitMapType(); + } - /** - * Create an instance of {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType } - * - */ - public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() { - return new JPAEmbeddableTypeMapType(); - } + /** + * Create an instance of + * {@link org.apache.olingo.odata2.jpa.processor.api.model.mapping.JPAEmbeddableTypeMapType } + * + */ + public JPAEmbeddableTypeMapType createJPAEmbeddableTypeMapType() { + return new JPAEmbeddableTypeMapType(); + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java index e64067387..47803af26 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEmbeddableTypeMapType.java @@ -1,40 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * The default name for EDM - * complex type is derived from JPA Embeddable type name. This can be + * + * The default name for EDM complex type is derived from JPA Embeddable type name. This can be * overriden using JPAEmbeddableTypeMapType. - * - * - *
Java class for JPAEmbeddableTypeMapType complex type. - * - *
+ * Java class for JPAEmbeddableTypeMapType complex type. + * + *
* <complexType name="JPAEmbeddableTypeMapType"> * <complexContent> @@ -50,112 +47,103 @@ * </complexContent> * </complexType> *
* Java class for JPAEmbeddableTypesMapType complex type. - * + * *
* <complexType name="JPAEmbeddableTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> *
- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEmbeddableType property. - * - *
- * For example, to add a new item, do as follows: - * - *
- * getJPAEmbeddableType().add(newItem); - *
- * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType } - * - * - */ - public List getJPAEmbeddableType() { - if (jpaEmbeddableType == null) { - jpaEmbeddableType = new ArrayList(); + /** + * Gets the value of the jpaEmbeddableType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEmbeddableType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEmbeddableType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType } + * + * + */ + public List getJPAEmbeddableType() { + if (jpaEmbeddableType == null) { + jpaEmbeddableType = new ArrayList(); + } + return jpaEmbeddableType; } - return jpaEmbeddableType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java index 22e181922..8c989234d 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java @@ -1,40 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * The default name for EDM - * entity type is derived from JPA entity type name. This can be - * overriden using JPAEntityTypeMapType. - * - * - * Java class for JPAEntityTypeMapType complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * + * + * The default name for EDM entity type is derived from JPA entity type name. This can be overriden + * using JPAEntityTypeMapType. + * + * + * + * Java class for JPAEntityTypeMapType complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypeMapType"> * <complexContent> @@ -53,161 +50,147 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypeMapType", propOrder = { "edmEntityType", "edmEntitySet", "jpaAttributes", - "jpaRelationships" }) +@XmlType(name = "JPAEntityTypeMapType", propOrder = {"edmEntityType", "edmEntitySet", "jpaAttributes", "jpaRelationships"}) public class JPAEntityTypeMapType { - @XmlElement(name = "EDMEntityType") - protected String edmEntityType; - @XmlElement(name = "EDMEntitySet") - protected String edmEntitySet; - @XmlElement(name = "JPAAttributes", required = true) - protected JPAAttributeMapType jpaAttributes; - @XmlElement(name = "JPARelationships", required = true) - protected JPARelationshipMapType jpaRelationships; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; - - /** - * Gets the value of the edmEntityType property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntityType() { - return edmEntityType; - } - - /** - * Sets the value of the edmEntityType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntityType(final String value) { - edmEntityType = value; - } - - /** - * Gets the value of the edmEntitySet property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntitySet() { - return edmEntitySet; - } - - /** - * Sets the value of the edmEntitySet property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntitySet(final String value) { - edmEntitySet = value; - } - - /** - * Gets the value of the jpaAttributes property. - * - * @return - * possible object is {@link JPAAttributeMapType } - * - */ - public JPAAttributeMapType getJPAAttributes() { - return jpaAttributes; - } - - /** - * Sets the value of the jpaAttributes property. - * - * @param value - * allowed object is {@link JPAAttributeMapType } - * - */ - public void setJPAAttributes(final JPAAttributeMapType value) { - jpaAttributes = value; - } - - /** - * Gets the value of the jpaRelationships property. - * - * @return - * possible object is {@link JPARelationshipMapType } - * - */ - public JPARelationshipMapType getJPARelationships() { - return jpaRelationships; - } - - /** - * Sets the value of the jpaRelationships property. - * - * @param value - * allowed object is {@link JPARelationshipMapType } - * - */ - public void setJPARelationships(final JPARelationshipMapType value) { - jpaRelationships = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } - - /** - * Gets the value of the exclude property. - * - * @return - * possible object is {@link Boolean } - * - */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; + @XmlElement(name = "EDMEntityType") + protected String edmEntityType; + @XmlElement(name = "EDMEntitySet") + protected String edmEntitySet; + @XmlElement(name = "JPAAttributes", required = true) + protected JPAAttributeMapType jpaAttributes; + @XmlElement(name = "JPARelationships", required = true) + protected JPARelationshipMapType jpaRelationships; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; + + /** + * Gets the value of the edmEntityType property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntityType() { + return edmEntityType; + } + + /** + * Sets the value of the edmEntityType property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntityType(final String value) { + edmEntityType = value; + } + + /** + * Gets the value of the edmEntitySet property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntitySet() { + return edmEntitySet; + } + + /** + * Sets the value of the edmEntitySet property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntitySet(final String value) { + edmEntitySet = value; + } + + /** + * Gets the value of the jpaAttributes property. + * + * @return possible object is {@link JPAAttributeMapType } + * + */ + public JPAAttributeMapType getJPAAttributes() { + return jpaAttributes; + } + + /** + * Sets the value of the jpaAttributes property. + * + * @param value allowed object is {@link JPAAttributeMapType } + * + */ + public void setJPAAttributes(final JPAAttributeMapType value) { + jpaAttributes = value; + } + + /** + * Gets the value of the jpaRelationships property. + * + * @return possible object is {@link JPARelationshipMapType } + * + */ + public JPARelationshipMapType getJPARelationships() { + return jpaRelationships; + } + + /** + * Sets the value of the jpaRelationships property. + * + * @param value allowed object is {@link JPARelationshipMapType } + * + */ + public void setJPARelationships(final JPARelationshipMapType value) { + jpaRelationships = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; + } + + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; } - } - - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java index 7a72e0848..afacaceca 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java @@ -1,39 +1,33 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for JPAEntityTypesMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypesMapType", propOrder = { "jpaEntityType" }) +@XmlType(name = "JPAEntityTypesMapType", propOrder = {"jpaEntityType"}) public class JPAEntityTypesMapType { - @XmlElement(name = "JPAEntityType") - protected List jpaEntityType; + @XmlElement(name = "JPAEntityType") + protected List jpaEntityType; - /** - * Gets the value of the jpaEntityType property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEntityType property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPAEntityType().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } - * - * - */ - public List getJPAEntityType() { - if (jpaEntityType == null) { - jpaEntityType = new ArrayList(); + /** + * Gets the value of the jpaEntityType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEntityType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEntityType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } + * + * + */ + public List getJPAEntityType() { + if (jpaEntityType == null) { + jpaEntityType = new ArrayList(); + } + return jpaEntityType; } - return jpaEntityType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java index 22260eac1..7ce8c0aa0 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java @@ -1,42 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * By default Java Persistence Unit name is taken as EDM schema name. This can - * be overriden using JPAPersistenceUnitMapType. - * - * + * + * By default Java Persistence Unit name is taken as EDM schema name. This can be overriden using + * JPAPersistenceUnitMapType. + * + * * * Java class for JPAPersistenceUnitMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAPersistenceUnitMapType"> * <complexContent> @@ -53,105 +48,100 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAPersistenceUnitMapType", - propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" }) +@XmlType(name = "JPAPersistenceUnitMapType", propOrder = {"edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes"}) public class JPAPersistenceUnitMapType { - @XmlElement(name = "EDMSchemaNamespace") - protected String edmSchemaNamespace; - @XmlElement(name = "JPAEntityTypes", required = true) - protected JPAEntityTypesMapType jpaEntityTypes; - @XmlElement(name = "JPAEmbeddableTypes", required = true) - protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "EDMSchemaNamespace") + protected String edmSchemaNamespace; + @XmlElement(name = "JPAEntityTypes", required = true) + protected JPAEntityTypesMapType jpaEntityTypes; + @XmlElement(name = "JPAEmbeddableTypes", required = true) + protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; + @XmlAttribute(name = "name", required = true) + protected String name; - /** - * Gets the value of the edmSchemaNamespace property. - * - * @return possible object is {@link String } - * - */ - public String getEDMSchemaNamespace() { - return edmSchemaNamespace; - } + /** + * Gets the value of the edmSchemaNamespace property. + * + * @return possible object is {@link String } + * + */ + public String getEDMSchemaNamespace() { + return edmSchemaNamespace; + } - /** - * Sets the value of the edmSchemaNamespace property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMSchemaNamespace(final String value) { - edmSchemaNamespace = value; - } + /** + * Sets the value of the edmSchemaNamespace property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMSchemaNamespace(final String value) { + edmSchemaNamespace = value; + } - /** - * Gets the value of the jpaEntityTypes property. - * - * @return possible object is {@link JPAEntityTypesMapType } - * - */ - public JPAEntityTypesMapType getJPAEntityTypes() { - return jpaEntityTypes; - } + /** + * Gets the value of the jpaEntityTypes property. + * + * @return possible object is {@link JPAEntityTypesMapType } + * + */ + public JPAEntityTypesMapType getJPAEntityTypes() { + return jpaEntityTypes; + } - /** - * Sets the value of the jpaEntityTypes property. - * - * @param value - * allowed object is {@link JPAEntityTypesMapType } - * - */ - public void setJPAEntityTypes(final JPAEntityTypesMapType value) { - jpaEntityTypes = value; - } + /** + * Sets the value of the jpaEntityTypes property. + * + * @param value allowed object is {@link JPAEntityTypesMapType } + * + */ + public void setJPAEntityTypes(final JPAEntityTypesMapType value) { + jpaEntityTypes = value; + } - /** - * Gets the value of the jpaEmbeddableTypes property. - * - * @return possible object is {@link JPAEmbeddableTypesMapType } - * - */ - public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { - return jpaEmbeddableTypes; - } + /** + * Gets the value of the jpaEmbeddableTypes property. + * + * @return possible object is {@link JPAEmbeddableTypesMapType } + * + */ + public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { + return jpaEmbeddableTypes; + } - /** - * Sets the value of the jpaEmbeddableTypes property. - * - * @param value - * allowed object is {@link JPAEmbeddableTypesMapType } - * - */ - public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { - jpaEmbeddableTypes = value; - } + /** + * Sets the value of the jpaEmbeddableTypes property. + * + * @param value allowed object is {@link JPAEmbeddableTypesMapType } + * + */ + public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { + jpaEmbeddableTypes = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java index 25a2f9569..50970877e 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java @@ -1,46 +1,40 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** - * - * The default name for EDM navigation property is derived from JPA relationship - * name. This can be overriden using JPARelationshipMapType. - * - * + * + * The default name for EDM navigation property is derived from JPA relationship name. This can be + * overriden using JPARelationshipMapType. + * + * * * Java class for JPARelationshipMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPARelationshipMapType"> * <complexContent> @@ -60,116 +54,113 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPARelationshipMapType", propOrder = { "jpaRelationship" }) +@XmlType(name = "JPARelationshipMapType", propOrder = {"jpaRelationship"}) public class JPARelationshipMapType { - @XmlElement(name = "JPARelationship") - protected List jpaRelationship; - - /** - * Gets the value of the jpaRelationship property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaRelationship property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPARelationship().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship } - * - * - */ - public List getJPARelationship() { - if (jpaRelationship == null) { - jpaRelationship = new ArrayList(); - } - return jpaRelationship; - } - - /** - * - * Java class for anonymous complex type. - * - * - * The following schema fragment specifies the expected content contained - * within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPARelationship { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "JPARelationship") + protected List jpaRelationship; /** - * Gets the value of the value property. + * Gets the value of the jpaRelationship property. * - * @return possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaRelationship property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: * - * @param value - * allowed object is {@link String } + * + * getJPARelationship().add(newItem); + * * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. * - * @return possible object is {@link String } + * + * Objects of the following type(s) are allowed in the list + * {@link JPARelationshipMapType.JPARelationship } + * * */ - public String getName() { - return name; + public List getJPARelationship() { + if (jpaRelationship == null) { + jpaRelationship = new ArrayList(); + } + return jpaRelationship; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @param value - * allowed object is {@link String } * */ - public void setName(final String value) { - name = value; - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPARelationship { + + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java index 45a7c3f9b..ed06d3832 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java @@ -1,28 +1,24 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ /** - * OData JPA Processor API Library - Mapping Model - * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes. - * - * + * OData JPA Processor API Library - Mapping Model The JPA EDM Mapping model (XML document) + * is represented as JAXB annotated Java Classes. + * + * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.olingo.odata2.jpa.processor.api.model.mapping; diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index c8eb662a5..2c09c1faa 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ org.apache.olingo olingo-odata2-jpa-processor - 2.0.13 + 3.0.0-SNAPSHOT ../ @@ -68,10 +68,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.6 - 1.6 + 17 + 17 @@ -88,9 +87,8 @@ - org.eclipse.persistence - javax.persistence - ${version.javax.persistence} + jakarta.persistence + jakarta.persistence-api @@ -122,14 +120,13 @@ junit junit - 4.9 test - org.easymock - easymock - 3.1 - test + org.easymock + easymock + 5.2.0 + test @@ -138,7 +135,6 @@ org.slf4j slf4j-api - 1.7.2 test
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEmbeddableType property. + * + *
+ * getJPAEmbeddableType().add(newItem); + *
+ * Objects of the following type(s) are allowed in the list {@link JPAEmbeddableTypeMapType } + * + * + */ + public List getJPAEmbeddableType() { + if (jpaEmbeddableType == null) { + jpaEmbeddableType = new ArrayList(); + } + return jpaEmbeddableType; } - return jpaEmbeddableType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java index 22e181922..8c989234d 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypeMapType.java @@ -1,40 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * The default name for EDM - * entity type is derived from JPA entity type name. This can be - * overriden using JPAEntityTypeMapType. - * - * - * Java class for JPAEntityTypeMapType complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * + * + * The default name for EDM entity type is derived from JPA entity type name. This can be overriden + * using JPAEntityTypeMapType. + * + * + * + * Java class for JPAEntityTypeMapType complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypeMapType"> * <complexContent> @@ -53,161 +50,147 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypeMapType", propOrder = { "edmEntityType", "edmEntitySet", "jpaAttributes", - "jpaRelationships" }) +@XmlType(name = "JPAEntityTypeMapType", propOrder = {"edmEntityType", "edmEntitySet", "jpaAttributes", "jpaRelationships"}) public class JPAEntityTypeMapType { - @XmlElement(name = "EDMEntityType") - protected String edmEntityType; - @XmlElement(name = "EDMEntitySet") - protected String edmEntitySet; - @XmlElement(name = "JPAAttributes", required = true) - protected JPAAttributeMapType jpaAttributes; - @XmlElement(name = "JPARelationships", required = true) - protected JPARelationshipMapType jpaRelationships; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "exclude") - protected Boolean exclude; - - /** - * Gets the value of the edmEntityType property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntityType() { - return edmEntityType; - } - - /** - * Sets the value of the edmEntityType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntityType(final String value) { - edmEntityType = value; - } - - /** - * Gets the value of the edmEntitySet property. - * - * @return - * possible object is {@link String } - * - */ - public String getEDMEntitySet() { - return edmEntitySet; - } - - /** - * Sets the value of the edmEntitySet property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMEntitySet(final String value) { - edmEntitySet = value; - } - - /** - * Gets the value of the jpaAttributes property. - * - * @return - * possible object is {@link JPAAttributeMapType } - * - */ - public JPAAttributeMapType getJPAAttributes() { - return jpaAttributes; - } - - /** - * Sets the value of the jpaAttributes property. - * - * @param value - * allowed object is {@link JPAAttributeMapType } - * - */ - public void setJPAAttributes(final JPAAttributeMapType value) { - jpaAttributes = value; - } - - /** - * Gets the value of the jpaRelationships property. - * - * @return - * possible object is {@link JPARelationshipMapType } - * - */ - public JPARelationshipMapType getJPARelationships() { - return jpaRelationships; - } - - /** - * Sets the value of the jpaRelationships property. - * - * @param value - * allowed object is {@link JPARelationshipMapType } - * - */ - public void setJPARelationships(final JPARelationshipMapType value) { - jpaRelationships = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } - - /** - * Gets the value of the exclude property. - * - * @return - * possible object is {@link Boolean } - * - */ - public boolean isExclude() { - if (exclude == null) { - return false; - } else { - return exclude; + @XmlElement(name = "EDMEntityType") + protected String edmEntityType; + @XmlElement(name = "EDMEntitySet") + protected String edmEntitySet; + @XmlElement(name = "JPAAttributes", required = true) + protected JPAAttributeMapType jpaAttributes; + @XmlElement(name = "JPARelationships", required = true) + protected JPARelationshipMapType jpaRelationships; + @XmlAttribute(name = "name", required = true) + protected String name; + @XmlAttribute(name = "exclude") + protected Boolean exclude; + + /** + * Gets the value of the edmEntityType property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntityType() { + return edmEntityType; + } + + /** + * Sets the value of the edmEntityType property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntityType(final String value) { + edmEntityType = value; + } + + /** + * Gets the value of the edmEntitySet property. + * + * @return possible object is {@link String } + * + */ + public String getEDMEntitySet() { + return edmEntitySet; + } + + /** + * Sets the value of the edmEntitySet property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMEntitySet(final String value) { + edmEntitySet = value; + } + + /** + * Gets the value of the jpaAttributes property. + * + * @return possible object is {@link JPAAttributeMapType } + * + */ + public JPAAttributeMapType getJPAAttributes() { + return jpaAttributes; + } + + /** + * Sets the value of the jpaAttributes property. + * + * @param value allowed object is {@link JPAAttributeMapType } + * + */ + public void setJPAAttributes(final JPAAttributeMapType value) { + jpaAttributes = value; + } + + /** + * Gets the value of the jpaRelationships property. + * + * @return possible object is {@link JPARelationshipMapType } + * + */ + public JPARelationshipMapType getJPARelationships() { + return jpaRelationships; + } + + /** + * Sets the value of the jpaRelationships property. + * + * @param value allowed object is {@link JPARelationshipMapType } + * + */ + public void setJPARelationships(final JPARelationshipMapType value) { + jpaRelationships = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + /** + * Gets the value of the exclude property. + * + * @return possible object is {@link Boolean } + * + */ + public boolean isExclude() { + if (exclude == null) { + return false; + } + return exclude; + } + + /** + * Sets the value of the exclude property. + * + * @param value allowed object is {@link Boolean } + * + */ + public void setExclude(final Boolean value) { + exclude = value; } - } - - /** - * Sets the value of the exclude property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setExclude(final Boolean value) { - exclude = value; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java index 7a72e0848..afacaceca 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAEntityTypesMapType.java @@ -1,39 +1,33 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * * Java class for JPAEntityTypesMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAEntityTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAEntityTypesMapType", propOrder = { "jpaEntityType" }) +@XmlType(name = "JPAEntityTypesMapType", propOrder = {"jpaEntityType"}) public class JPAEntityTypesMapType { - @XmlElement(name = "JPAEntityType") - protected List jpaEntityType; + @XmlElement(name = "JPAEntityType") + protected List jpaEntityType; - /** - * Gets the value of the jpaEntityType property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEntityType property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPAEntityType().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } - * - * - */ - public List getJPAEntityType() { - if (jpaEntityType == null) { - jpaEntityType = new ArrayList(); + /** + * Gets the value of the jpaEntityType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEntityType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEntityType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } + * + * + */ + public List getJPAEntityType() { + if (jpaEntityType == null) { + jpaEntityType = new ArrayList(); + } + return jpaEntityType; } - return jpaEntityType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java index 22260eac1..7ce8c0aa0 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java @@ -1,42 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * By default Java Persistence Unit name is taken as EDM schema name. This can - * be overriden using JPAPersistenceUnitMapType. - * - * + * + * By default Java Persistence Unit name is taken as EDM schema name. This can be overriden using + * JPAPersistenceUnitMapType. + * + * * * Java class for JPAPersistenceUnitMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAPersistenceUnitMapType"> * <complexContent> @@ -53,105 +48,100 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAPersistenceUnitMapType", - propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" }) +@XmlType(name = "JPAPersistenceUnitMapType", propOrder = {"edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes"}) public class JPAPersistenceUnitMapType { - @XmlElement(name = "EDMSchemaNamespace") - protected String edmSchemaNamespace; - @XmlElement(name = "JPAEntityTypes", required = true) - protected JPAEntityTypesMapType jpaEntityTypes; - @XmlElement(name = "JPAEmbeddableTypes", required = true) - protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "EDMSchemaNamespace") + protected String edmSchemaNamespace; + @XmlElement(name = "JPAEntityTypes", required = true) + protected JPAEntityTypesMapType jpaEntityTypes; + @XmlElement(name = "JPAEmbeddableTypes", required = true) + protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; + @XmlAttribute(name = "name", required = true) + protected String name; - /** - * Gets the value of the edmSchemaNamespace property. - * - * @return possible object is {@link String } - * - */ - public String getEDMSchemaNamespace() { - return edmSchemaNamespace; - } + /** + * Gets the value of the edmSchemaNamespace property. + * + * @return possible object is {@link String } + * + */ + public String getEDMSchemaNamespace() { + return edmSchemaNamespace; + } - /** - * Sets the value of the edmSchemaNamespace property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMSchemaNamespace(final String value) { - edmSchemaNamespace = value; - } + /** + * Sets the value of the edmSchemaNamespace property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMSchemaNamespace(final String value) { + edmSchemaNamespace = value; + } - /** - * Gets the value of the jpaEntityTypes property. - * - * @return possible object is {@link JPAEntityTypesMapType } - * - */ - public JPAEntityTypesMapType getJPAEntityTypes() { - return jpaEntityTypes; - } + /** + * Gets the value of the jpaEntityTypes property. + * + * @return possible object is {@link JPAEntityTypesMapType } + * + */ + public JPAEntityTypesMapType getJPAEntityTypes() { + return jpaEntityTypes; + } - /** - * Sets the value of the jpaEntityTypes property. - * - * @param value - * allowed object is {@link JPAEntityTypesMapType } - * - */ - public void setJPAEntityTypes(final JPAEntityTypesMapType value) { - jpaEntityTypes = value; - } + /** + * Sets the value of the jpaEntityTypes property. + * + * @param value allowed object is {@link JPAEntityTypesMapType } + * + */ + public void setJPAEntityTypes(final JPAEntityTypesMapType value) { + jpaEntityTypes = value; + } - /** - * Gets the value of the jpaEmbeddableTypes property. - * - * @return possible object is {@link JPAEmbeddableTypesMapType } - * - */ - public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { - return jpaEmbeddableTypes; - } + /** + * Gets the value of the jpaEmbeddableTypes property. + * + * @return possible object is {@link JPAEmbeddableTypesMapType } + * + */ + public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { + return jpaEmbeddableTypes; + } - /** - * Sets the value of the jpaEmbeddableTypes property. - * - * @param value - * allowed object is {@link JPAEmbeddableTypesMapType } - * - */ - public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { - jpaEmbeddableTypes = value; - } + /** + * Sets the value of the jpaEmbeddableTypes property. + * + * @param value allowed object is {@link JPAEmbeddableTypesMapType } + * + */ + public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { + jpaEmbeddableTypes = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java index 25a2f9569..50970877e 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java @@ -1,46 +1,40 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** - * - * The default name for EDM navigation property is derived from JPA relationship - * name. This can be overriden using JPARelationshipMapType. - * - * + * + * The default name for EDM navigation property is derived from JPA relationship name. This can be + * overriden using JPARelationshipMapType. + * + * * * Java class for JPARelationshipMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPARelationshipMapType"> * <complexContent> @@ -60,116 +54,113 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPARelationshipMapType", propOrder = { "jpaRelationship" }) +@XmlType(name = "JPARelationshipMapType", propOrder = {"jpaRelationship"}) public class JPARelationshipMapType { - @XmlElement(name = "JPARelationship") - protected List jpaRelationship; - - /** - * Gets the value of the jpaRelationship property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaRelationship property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPARelationship().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship } - * - * - */ - public List getJPARelationship() { - if (jpaRelationship == null) { - jpaRelationship = new ArrayList(); - } - return jpaRelationship; - } - - /** - * - * Java class for anonymous complex type. - * - * - * The following schema fragment specifies the expected content contained - * within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPARelationship { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "JPARelationship") + protected List jpaRelationship; /** - * Gets the value of the value property. + * Gets the value of the jpaRelationship property. * - * @return possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaRelationship property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: * - * @param value - * allowed object is {@link String } + * + * getJPARelationship().add(newItem); + * * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. * - * @return possible object is {@link String } + * + * Objects of the following type(s) are allowed in the list + * {@link JPARelationshipMapType.JPARelationship } + * * */ - public String getName() { - return name; + public List getJPARelationship() { + if (jpaRelationship == null) { + jpaRelationship = new ArrayList(); + } + return jpaRelationship; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @param value - * allowed object is {@link String } * */ - public void setName(final String value) { - name = value; - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPARelationship { + + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java index 45a7c3f9b..ed06d3832 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java @@ -1,28 +1,24 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ /** - * OData JPA Processor API Library - Mapping Model - * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes. - * - * + * OData JPA Processor API Library - Mapping Model The JPA EDM Mapping model (XML document) + * is represented as JAXB annotated Java Classes. + * + * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.olingo.odata2.jpa.processor.api.model.mapping; diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index c8eb662a5..2c09c1faa 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ org.apache.olingo olingo-odata2-jpa-processor - 2.0.13 + 3.0.0-SNAPSHOT ../ @@ -68,10 +68,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.6 - 1.6 + 17 + 17 @@ -88,9 +87,8 @@ - org.eclipse.persistence - javax.persistence - ${version.javax.persistence} + jakarta.persistence + jakarta.persistence-api @@ -122,14 +120,13 @@ junit junit - 4.9 test - org.easymock - easymock - 3.1 - test + org.easymock + easymock + 5.2.0 + test @@ -138,7 +135,6 @@ org.slf4j slf4j-api - 1.7.2 test
Java class for JPAEntityTypeMapType complex type. - * - *
The following schema fragment specifies the expected content contained within this class. - * + * + * The default name for EDM entity type is derived from JPA entity type name. This can be overriden + * using JPAEntityTypeMapType. + * + * + *
+ * Java class for JPAEntityTypeMapType complex type. + * + *
* <complexType name="JPAEntityTypeMapType"> * <complexContent> @@ -53,161 +50,147 @@ * </complexContent> * </complexType> *
* Java class for JPAEntityTypesMapType complex type. - * + * *
* <complexType name="JPAEntityTypesMapType"> * <complexContent> @@ -47,43 +41,42 @@ * </complexContent> * </complexType> *
- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaEntityType property. - * - *
- * getJPAEntityType().add(newItem); - *
- * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } - * - * - */ - public List getJPAEntityType() { - if (jpaEntityType == null) { - jpaEntityType = new ArrayList(); + /** + * Gets the value of the jpaEntityType property. + * + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEntityType property. + * + * + * For example, to add a new item, do as follows: + * + * + * getJPAEntityType().add(newItem); + * + * + * + * + * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } + * + * + */ + public List getJPAEntityType() { + if (jpaEntityType == null) { + jpaEntityType = new ArrayList(); + } + return jpaEntityType; } - return jpaEntityType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java index 22260eac1..7ce8c0aa0 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java @@ -1,42 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * By default Java Persistence Unit name is taken as EDM schema name. This can - * be overriden using JPAPersistenceUnitMapType. - * - * + * + * By default Java Persistence Unit name is taken as EDM schema name. This can be overriden using + * JPAPersistenceUnitMapType. + * + * * * Java class for JPAPersistenceUnitMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAPersistenceUnitMapType"> * <complexContent> @@ -53,105 +48,100 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAPersistenceUnitMapType", - propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" }) +@XmlType(name = "JPAPersistenceUnitMapType", propOrder = {"edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes"}) public class JPAPersistenceUnitMapType { - @XmlElement(name = "EDMSchemaNamespace") - protected String edmSchemaNamespace; - @XmlElement(name = "JPAEntityTypes", required = true) - protected JPAEntityTypesMapType jpaEntityTypes; - @XmlElement(name = "JPAEmbeddableTypes", required = true) - protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "EDMSchemaNamespace") + protected String edmSchemaNamespace; + @XmlElement(name = "JPAEntityTypes", required = true) + protected JPAEntityTypesMapType jpaEntityTypes; + @XmlElement(name = "JPAEmbeddableTypes", required = true) + protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; + @XmlAttribute(name = "name", required = true) + protected String name; - /** - * Gets the value of the edmSchemaNamespace property. - * - * @return possible object is {@link String } - * - */ - public String getEDMSchemaNamespace() { - return edmSchemaNamespace; - } + /** + * Gets the value of the edmSchemaNamespace property. + * + * @return possible object is {@link String } + * + */ + public String getEDMSchemaNamespace() { + return edmSchemaNamespace; + } - /** - * Sets the value of the edmSchemaNamespace property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMSchemaNamespace(final String value) { - edmSchemaNamespace = value; - } + /** + * Sets the value of the edmSchemaNamespace property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMSchemaNamespace(final String value) { + edmSchemaNamespace = value; + } - /** - * Gets the value of the jpaEntityTypes property. - * - * @return possible object is {@link JPAEntityTypesMapType } - * - */ - public JPAEntityTypesMapType getJPAEntityTypes() { - return jpaEntityTypes; - } + /** + * Gets the value of the jpaEntityTypes property. + * + * @return possible object is {@link JPAEntityTypesMapType } + * + */ + public JPAEntityTypesMapType getJPAEntityTypes() { + return jpaEntityTypes; + } - /** - * Sets the value of the jpaEntityTypes property. - * - * @param value - * allowed object is {@link JPAEntityTypesMapType } - * - */ - public void setJPAEntityTypes(final JPAEntityTypesMapType value) { - jpaEntityTypes = value; - } + /** + * Sets the value of the jpaEntityTypes property. + * + * @param value allowed object is {@link JPAEntityTypesMapType } + * + */ + public void setJPAEntityTypes(final JPAEntityTypesMapType value) { + jpaEntityTypes = value; + } - /** - * Gets the value of the jpaEmbeddableTypes property. - * - * @return possible object is {@link JPAEmbeddableTypesMapType } - * - */ - public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { - return jpaEmbeddableTypes; - } + /** + * Gets the value of the jpaEmbeddableTypes property. + * + * @return possible object is {@link JPAEmbeddableTypesMapType } + * + */ + public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { + return jpaEmbeddableTypes; + } - /** - * Sets the value of the jpaEmbeddableTypes property. - * - * @param value - * allowed object is {@link JPAEmbeddableTypesMapType } - * - */ - public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { - jpaEmbeddableTypes = value; - } + /** + * Sets the value of the jpaEmbeddableTypes property. + * + * @param value allowed object is {@link JPAEmbeddableTypesMapType } + * + */ + public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { + jpaEmbeddableTypes = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java index 25a2f9569..50970877e 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java @@ -1,46 +1,40 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** - * - * The default name for EDM navigation property is derived from JPA relationship - * name. This can be overriden using JPARelationshipMapType. - * - * + * + * The default name for EDM navigation property is derived from JPA relationship name. This can be + * overriden using JPARelationshipMapType. + * + * * * Java class for JPARelationshipMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPARelationshipMapType"> * <complexContent> @@ -60,116 +54,113 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPARelationshipMapType", propOrder = { "jpaRelationship" }) +@XmlType(name = "JPARelationshipMapType", propOrder = {"jpaRelationship"}) public class JPARelationshipMapType { - @XmlElement(name = "JPARelationship") - protected List jpaRelationship; - - /** - * Gets the value of the jpaRelationship property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaRelationship property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPARelationship().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship } - * - * - */ - public List getJPARelationship() { - if (jpaRelationship == null) { - jpaRelationship = new ArrayList(); - } - return jpaRelationship; - } - - /** - * - * Java class for anonymous complex type. - * - * - * The following schema fragment specifies the expected content contained - * within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPARelationship { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "JPARelationship") + protected List jpaRelationship; /** - * Gets the value of the value property. + * Gets the value of the jpaRelationship property. * - * @return possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaRelationship property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: * - * @param value - * allowed object is {@link String } + * + * getJPARelationship().add(newItem); + * * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. * - * @return possible object is {@link String } + * + * Objects of the following type(s) are allowed in the list + * {@link JPARelationshipMapType.JPARelationship } + * * */ - public String getName() { - return name; + public List getJPARelationship() { + if (jpaRelationship == null) { + jpaRelationship = new ArrayList(); + } + return jpaRelationship; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @param value - * allowed object is {@link String } * */ - public void setName(final String value) { - name = value; - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPARelationship { + + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java index 45a7c3f9b..ed06d3832 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java @@ -1,28 +1,24 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ /** - * OData JPA Processor API Library - Mapping Model - * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes. - * - * + * OData JPA Processor API Library - Mapping Model The JPA EDM Mapping model (XML document) + * is represented as JAXB annotated Java Classes. + * + * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.olingo.odata2.jpa.processor.api.model.mapping; diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index c8eb662a5..2c09c1faa 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ org.apache.olingo olingo-odata2-jpa-processor - 2.0.13 + 3.0.0-SNAPSHOT ../ @@ -68,10 +68,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.6 - 1.6 + 17 + 17 @@ -88,9 +87,8 @@ - org.eclipse.persistence - javax.persistence - ${version.javax.persistence} + jakarta.persistence + jakarta.persistence-api @@ -122,14 +120,13 @@ junit junit - 4.9 test - org.easymock - easymock - 3.1 - test + org.easymock + easymock + 5.2.0 + test @@ -138,7 +135,6 @@ org.slf4j slf4j-api - 1.7.2 test
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaEntityType property. + * + *
+ * getJPAEntityType().add(newItem); + *
+ * Objects of the following type(s) are allowed in the list {@link JPAEntityTypeMapType } + * + * + */ + public List getJPAEntityType() { + if (jpaEntityType == null) { + jpaEntityType = new ArrayList(); + } + return jpaEntityType; } - return jpaEntityType; - } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java index 22260eac1..7ce8c0aa0 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPAPersistenceUnitMapType.java @@ -1,42 +1,37 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** - * - * By default Java Persistence Unit name is taken as EDM schema name. This can - * be overriden using JPAPersistenceUnitMapType. - * - * + * + * By default Java Persistence Unit name is taken as EDM schema name. This can be overriden using + * JPAPersistenceUnitMapType. + * + * * * Java class for JPAPersistenceUnitMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPAPersistenceUnitMapType"> * <complexContent> @@ -53,105 +48,100 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPAPersistenceUnitMapType", - propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" }) +@XmlType(name = "JPAPersistenceUnitMapType", propOrder = {"edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes"}) public class JPAPersistenceUnitMapType { - @XmlElement(name = "EDMSchemaNamespace") - protected String edmSchemaNamespace; - @XmlElement(name = "JPAEntityTypes", required = true) - protected JPAEntityTypesMapType jpaEntityTypes; - @XmlElement(name = "JPAEmbeddableTypes", required = true) - protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "EDMSchemaNamespace") + protected String edmSchemaNamespace; + @XmlElement(name = "JPAEntityTypes", required = true) + protected JPAEntityTypesMapType jpaEntityTypes; + @XmlElement(name = "JPAEmbeddableTypes", required = true) + protected JPAEmbeddableTypesMapType jpaEmbeddableTypes; + @XmlAttribute(name = "name", required = true) + protected String name; - /** - * Gets the value of the edmSchemaNamespace property. - * - * @return possible object is {@link String } - * - */ - public String getEDMSchemaNamespace() { - return edmSchemaNamespace; - } + /** + * Gets the value of the edmSchemaNamespace property. + * + * @return possible object is {@link String } + * + */ + public String getEDMSchemaNamespace() { + return edmSchemaNamespace; + } - /** - * Sets the value of the edmSchemaNamespace property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEDMSchemaNamespace(final String value) { - edmSchemaNamespace = value; - } + /** + * Sets the value of the edmSchemaNamespace property. + * + * @param value allowed object is {@link String } + * + */ + public void setEDMSchemaNamespace(final String value) { + edmSchemaNamespace = value; + } - /** - * Gets the value of the jpaEntityTypes property. - * - * @return possible object is {@link JPAEntityTypesMapType } - * - */ - public JPAEntityTypesMapType getJPAEntityTypes() { - return jpaEntityTypes; - } + /** + * Gets the value of the jpaEntityTypes property. + * + * @return possible object is {@link JPAEntityTypesMapType } + * + */ + public JPAEntityTypesMapType getJPAEntityTypes() { + return jpaEntityTypes; + } - /** - * Sets the value of the jpaEntityTypes property. - * - * @param value - * allowed object is {@link JPAEntityTypesMapType } - * - */ - public void setJPAEntityTypes(final JPAEntityTypesMapType value) { - jpaEntityTypes = value; - } + /** + * Sets the value of the jpaEntityTypes property. + * + * @param value allowed object is {@link JPAEntityTypesMapType } + * + */ + public void setJPAEntityTypes(final JPAEntityTypesMapType value) { + jpaEntityTypes = value; + } - /** - * Gets the value of the jpaEmbeddableTypes property. - * - * @return possible object is {@link JPAEmbeddableTypesMapType } - * - */ - public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { - return jpaEmbeddableTypes; - } + /** + * Gets the value of the jpaEmbeddableTypes property. + * + * @return possible object is {@link JPAEmbeddableTypesMapType } + * + */ + public JPAEmbeddableTypesMapType getJPAEmbeddableTypes() { + return jpaEmbeddableTypes; + } - /** - * Sets the value of the jpaEmbeddableTypes property. - * - * @param value - * allowed object is {@link JPAEmbeddableTypesMapType } - * - */ - public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { - jpaEmbeddableTypes = value; - } + /** + * Sets the value of the jpaEmbeddableTypes property. + * + * @param value allowed object is {@link JPAEmbeddableTypesMapType } + * + */ + public void setJPAEmbeddableTypes(final JPAEmbeddableTypesMapType value) { + jpaEmbeddableTypes = value; + } - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(final String value) { - name = value; - } + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java index 25a2f9569..50970877e 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/JPARelationshipMapType.java @@ -1,46 +1,40 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ package org.apache.olingo.odata2.jpa.processor.api.model.mapping; import java.util.ArrayList; import java.util.List; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlValue; /** - * - * The default name for EDM navigation property is derived from JPA relationship - * name. This can be overriden using JPARelationshipMapType. - * - * + * + * The default name for EDM navigation property is derived from JPA relationship name. This can be + * overriden using JPARelationshipMapType. + * + * * * Java class for JPARelationshipMapType complex type. - * + * * - * The following schema fragment specifies the expected content contained within - * this class. - * + * The following schema fragment specifies the expected content contained within this class. + * * * <complexType name="JPARelationshipMapType"> * <complexContent> @@ -60,116 +54,113 @@ * </complexContent> * </complexType> * - * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "JPARelationshipMapType", propOrder = { "jpaRelationship" }) +@XmlType(name = "JPARelationshipMapType", propOrder = {"jpaRelationship"}) public class JPARelationshipMapType { - @XmlElement(name = "JPARelationship") - protected List jpaRelationship; - - /** - * Gets the value of the jpaRelationship property. - * - * - * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaRelationship property. - * - * - * For example, to add a new item, do as follows: - * - * - * getJPARelationship().add(newItem); - * - * - * - * - * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship } - * - * - */ - public List getJPARelationship() { - if (jpaRelationship == null) { - jpaRelationship = new ArrayList(); - } - return jpaRelationship; - } - - /** - * - * Java class for anonymous complex type. - * - * - * The following schema fragment specifies the expected content contained - * within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPARelationship { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "JPARelationship") + protected List jpaRelationship; /** - * Gets the value of the value property. + * Gets the value of the jpaRelationship property. * - * @return possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaRelationship property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: * - * @param value - * allowed object is {@link String } + * + * getJPARelationship().add(newItem); + * * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. * - * @return possible object is {@link String } + * + * Objects of the following type(s) are allowed in the list + * {@link JPARelationshipMapType.JPARelationship } + * * */ - public String getName() { - return name; + public List getJPARelationship() { + if (jpaRelationship == null) { + jpaRelationship = new ArrayList(); + } + return jpaRelationship; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @param value - * allowed object is {@link String } * */ - public void setName(final String value) { - name = value; - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPARelationship { + + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java index 45a7c3f9b..ed06d3832 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java @@ -1,28 +1,24 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ /** - * OData JPA Processor API Library - Mapping Model - * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes. - * - * + * OData JPA Processor API Library - Mapping Model The JPA EDM Mapping model (XML document) + * is represented as JAXB annotated Java Classes. + * + * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.olingo.odata2.jpa.processor.api.model.mapping; diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index c8eb662a5..2c09c1faa 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ org.apache.olingo olingo-odata2-jpa-processor - 2.0.13 + 3.0.0-SNAPSHOT ../ @@ -68,10 +68,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.6 - 1.6 + 17 + 17 @@ -88,9 +87,8 @@ - org.eclipse.persistence - javax.persistence - ${version.javax.persistence} + jakarta.persistence + jakarta.persistence-api @@ -122,14 +120,13 @@ junit junit - 4.9 test - org.easymock - easymock - 3.1 - test + org.easymock + easymock + 5.2.0 + test @@ -138,7 +135,6 @@ org.slf4j slf4j-api - 1.7.2 test
* Java class for JPAPersistenceUnitMapType complex type. - * + * *
* <complexType name="JPAPersistenceUnitMapType"> * <complexContent> @@ -53,105 +48,100 @@ * </complexContent> * </complexType> *
* Java class for JPARelationshipMapType complex type. - * + * *
* <complexType name="JPARelationshipMapType"> * <complexContent> @@ -60,116 +54,113 @@ * </complexContent> * </complexType> *
- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the jpaRelationship property. - * - *
- * getJPARelationship().add(newItem); - *
- * Objects of the following type(s) are allowed in the list {@link JPARelationshipMapType.JPARelationship } - * - * - */ - public List getJPARelationship() { - if (jpaRelationship == null) { - jpaRelationship = new ArrayList(); - } - return jpaRelationship; - } - - /** - * - * Java class for anonymous complex type. - * - * - * The following schema fragment specifies the expected content contained - * within this class. - * - * - * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </extension> - * </simpleContent> - * </complexType> - * - * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { "value" }) - public static class JPARelationship { - - @XmlValue - protected String value; - @XmlAttribute(name = "name", required = true) - protected String name; + @XmlElement(name = "JPARelationship") + protected List jpaRelationship; /** - * Gets the value of the value property. + * Gets the value of the jpaRelationship property. * - * @return possible object is {@link String } + * + * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaRelationship property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + * + * For example, to add a new item, do as follows: * - * @param value - * allowed object is {@link String } + * + * getJPARelationship().add(newItem); + * * - */ - public void setValue(final String value) { - this.value = value; - } - - /** - * Gets the value of the name property. * - * @return possible object is {@link String } + * + * Objects of the following type(s) are allowed in the list + * {@link JPARelationshipMapType.JPARelationship } + * * */ - public String getName() { - return name; + public List getJPARelationship() { + if (jpaRelationship == null) { + jpaRelationship = new ArrayList(); + } + return jpaRelationship; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @param value - * allowed object is {@link String } * */ - public void setName(final String value) { - name = value; - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPARelationship { + + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java index 45a7c3f9b..ed06d3832 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java @@ -1,28 +1,24 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ /** - * OData JPA Processor API Library - Mapping Model - * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes. - * - * + * OData JPA Processor API Library - Mapping Model The JPA EDM Mapping model (XML document) + * is represented as JAXB annotated Java Classes. + * + * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.olingo.odata2.jpa.processor.api.model.mapping; diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index c8eb662a5..2c09c1faa 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ org.apache.olingo olingo-odata2-jpa-processor - 2.0.13 + 3.0.0-SNAPSHOT ../ @@ -68,10 +68,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.6 - 1.6 + 17 + 17 @@ -88,9 +87,8 @@ - org.eclipse.persistence - javax.persistence - ${version.javax.persistence} + jakarta.persistence + jakarta.persistence-api @@ -122,14 +120,13 @@ junit junit - 4.9 test - org.easymock - easymock - 3.1 - test + org.easymock + easymock + 5.2.0 + test @@ -138,7 +135,6 @@ org.slf4j slf4j-api - 1.7.2 test
- * Java class for anonymous complex type. - * - *
- * The following schema fragment specifies the expected content contained - * within this class. - * - *
- * <complexType> - * <simpleContent> - * <extension base="<http://www.w3.org/2001/XMLSchema>string"> - * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * </extension> - * </simpleContent> - * </complexType> - *
+ * This accessor method returns a reference to the live list, not a snapshot. Therefore any + * modification you make to the returned list will be present inside the JAXB object. This is why + * there is not a set method for the jpaRelationship property. * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. + *
+ * For example, to add a new item, do as follows: * - * @param value - * allowed object is {@link String } + *
+ * getJPARelationship().add(newItem); + *
+ * Objects of the following type(s) are allowed in the list + * {@link JPARelationshipMapType.JPARelationship } + * * */ - public String getName() { - return name; + public List getJPARelationship() { + if (jpaRelationship == null) { + jpaRelationship = new ArrayList(); + } + return jpaRelationship; } /** - * Sets the value of the name property. + * + * Java class for anonymous complex type. + * + * + * The following schema fragment specifies the expected content contained within this class. + * + * + * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + * * - * @param value - * allowed object is {@link String } * */ - public void setName(final String value) { - name = value; - } + @XmlAccessorType(XmlAccessType.FIELD) + @XmlType(name = "", propOrder = {"value"}) + public static class JPARelationship { + + @XmlValue + protected String value; + @XmlAttribute(name = "name", required = true) + protected String name; - } + /** + * Gets the value of the value property. + * + * @return possible object is {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value allowed object is {@link String } + * + */ + public void setValue(final String value) { + this.value = value; + } + + /** + * Gets the value of the name property. + * + * @return possible object is {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value allowed object is {@link String } + * + */ + public void setName(final String value) { + name = value; + } + + } } diff --git a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java index 45a7c3f9b..ed06d3832 100644 --- a/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java +++ b/odata2-jpa-processor/jpa-api/src/main/java/org/apache/olingo/odata2/jpa/processor/api/model/mapping/package-info.java @@ -1,28 +1,24 @@ /******************************************************************************* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 - * + * Licensed to the Apache Software Foundation (ASF) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for additional information regarding + * copyright ownership. The ASF licenses this file to you 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. + * + * 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. ******************************************************************************/ /** - * OData JPA Processor API Library - Mapping Model - * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes. - * - * + * OData JPA Processor API Library - Mapping Model The JPA EDM Mapping model (XML document) + * is represented as JAXB annotated Java Classes. + * + * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", - elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.apache.org/olingo/odata2/jpa/processor/api/model/mapping", + elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.apache.olingo.odata2.jpa.processor.api.model.mapping; diff --git a/odata2-jpa-processor/jpa-core/pom.xml b/odata2-jpa-processor/jpa-core/pom.xml index c8eb662a5..2c09c1faa 100644 --- a/odata2-jpa-processor/jpa-core/pom.xml +++ b/odata2-jpa-processor/jpa-core/pom.xml @@ -24,7 +24,7 @@ org.apache.olingo olingo-odata2-jpa-processor - 2.0.13 + 3.0.0-SNAPSHOT ../ @@ -68,10 +68,9 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.6 - 1.6 + 17 + 17 @@ -88,9 +87,8 @@ - org.eclipse.persistence - javax.persistence - ${version.javax.persistence} + jakarta.persistence + jakarta.persistence-api @@ -122,14 +120,13 @@ junit junit - 4.9 test - org.easymock - easymock - 3.1 - test + org.easymock + easymock + 5.2.0 + test @@ -138,7 +135,6 @@ org.slf4j slf4j-api - 1.7.2 test
+ * Java class for anonymous complex type. + * + *
+ * The following schema fragment specifies the expected content contained within this class. + * + *
+ * <complexType> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </simpleContent> + * </complexType> + *