Updated to Energy ADE 3

build.gradle

@@ -116,7 +116,7 @@ publishing {
             pom {
                 name = project.name
                 description = project.description
-                url = 'https://github.com/citygml4j'
+                url = 'https://transfer.hft-stuttgart.de/gitlab/energy-ade/energy-ade-3-citygml4j'
                 licenses {
                     license {
                         name = 'The Apache License, Version 2.0'
@@ -126,16 +126,16 @@ publishing {
                 }
                 developers {
                     developer {
-                        id = 'clausnagel'
-                        name = 'Claus Nagel'
-                        email = 'claus.nagel@gmail.com'
-                        roles = ['architect', 'developer']
+                        id = 'rushipadsala'
+                        name = 'Rushikesh Padsala'
+                        email = 'ruhikesh.padsala@hft-stuttgart.de'
+                        roles = ['manager', 'developer']
                         timezone = '+1'
                     }
                 }
                 scm {
-                    url = 'https://github.com/citygml4j/energy-ade-citygml4j'
-                    connection = 'scm:git:https://github.com/citygml4j/energy-ade-citygml4j.git'
+                    url = 'https://transfer.hft-stuttgart.de/gitlab/energy-ade/energy-ade-3-citygml4j'
+                    connection = 'scm:git:https://transfer.hft-stuttgart.de/gitlab/energy-ade/energy-ade-3-citygml4j.git'
                 }
             }
         }

src/main/java/org/citygml4j/ade/energy/EnergyADEContext.java → src/main/java/org/citygml4j/ade/energy3/EnergyADEContext.java

-package org.citygml4j.ade.energy;
+package org.citygml4j.ade.energy3;
 
-import org.citygml4j.ade.energy.bind.EnergyADEMarshaller;
-import org.citygml4j.ade.energy.bind.EnergyADEUnmarshaller;
-import org.citygml4j.ade.energy.model.module.EnergyADEModule;
-import org.citygml4j.ade.energy.walker.EnergyADEFeatureWalker;
+import org.citygml4j.ade.energy3.bind.EnergyADEMarshaller;
+import org.citygml4j.ade.energy3.bind.EnergyADEUnmarshaller;
+import org.citygml4j.ade.energy3.model.module.EnergyADEModule;
+import org.citygml4j.ade.energy3.walker.EnergyADEFeatureWalker;
 import org.citygml4j.model.citygml.ade.binding.ADEContext;
 import org.citygml4j.model.citygml.ade.binding.ADEMarshaller;
 import org.citygml4j.model.citygml.ade.binding.ADEUnmarshaller;
@@ -16,7 +16,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class EnergyADEContext implements ADEContext {
-    private final List<ADEModule> modules = Collections.singletonList(EnergyADEModule.v2_0);
+    private final List<ADEModule> modules = Collections.singletonList(EnergyADEModule.v3_0);
 
     @Override
     public List<ADEModule> getADEModules() {
@@ -25,8 +25,8 @@ public class EnergyADEContext implements ADEContext {
 
     @Override
     public List<String> getModelPackageNames() {
-        return Arrays.asList("org.citygml4j.ade.energy.model.core",
-                "org.citygml4j.ade.energy.model.supportingClasses");
+        return Arrays.asList("org.citygml4j.ade.energy3.model.core",
+                "org.citygml4j.ade.energy3.model.supportingClasses");
     }
 
     @Override

src/main/java/org/citygml4j/ade/energy/bind/EnergyADEMarshaller.java → src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEMarshaller.java

-package org.citygml4j.ade.energy.bind;
+package org.citygml4j.ade.energy3.bind;
 
 import lombok.SneakyThrows;
 import net.opengis.gml.*;
-import org.citygml4j.ade.energy.model.core.*;
-import org.citygml4j.ade.energy.model.supportingClasses.*;
+import org.citygml4j.ade.energy3.model.core.*;
+import org.citygml4j.ade.energy3.model.supportingClasses.*;
 import org.citygml4j.builder.jaxb.marshal.citygml.ade.ADEMarshallerHelper;
 import org.citygml4j.model.citygml.ade.binding.ADEMarshaller;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
@@ -21,7 +21,6 @@ import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZonedDateTime;

src/main/java/org/citygml4j/ade/energy/bind/EnergyADEUnmarshaller.java → src/main/java/org/citygml4j/ade/energy3/bind/EnergyADEUnmarshaller.java

-package org.citygml4j.ade.energy.bind;
+package org.citygml4j.ade.energy3.bind;
 
 import lombok.SneakyThrows;
 import net.opengis.gml.*;
-import org.citygml4j.ade.energy.model.core.*;
-import org.citygml4j.ade.energy.model.supportingClasses.*;
+import org.citygml4j.ade.energy3.model.core.*;
+import org.citygml4j.ade.energy3.model.supportingClasses.*;
 import org.citygml4j.builder.jaxb.unmarshal.citygml.ade.ADEUnmarshallerHelper;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.model.citygml.ade.binding.ADEUnmarshaller;
@@ -23,7 +23,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import java.sql.Timestamp;
 import java.time.LocalTime;
 import java.time.ZonedDateTime;
 import java.util.concurrent.locks.ReentrantLock;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuilding.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuilding.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
-import org.citygml4j.model.citygml.core.AbstractCityObject;
 import org.citygml4j.model.common.visitor.FeatureFunctor;
 import org.citygml4j.model.common.visitor.FeatureVisitor;
 import org.citygml4j.model.common.visitor.GMLFunctor;
 import org.citygml4j.model.common.visitor.GMLVisitor;
-import org.citygml4j.model.gml.base.AbstractGML;
 import org.citygml4j.model.gml.basicTypes.Code;
 import org.citygml4j.model.gml.feature.AbstractFeature;
 

src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartition.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartition.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import net.opengis.gml.SolidPropertyType;
 import org.citygml4j.builder.copy.CopyBuilder;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingPartitionProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingPartitionProperty.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractBuildingProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractBuildingProperty.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractDataType.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDataType.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.model.common.association.Associable;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractDevice.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDevice.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import lombok.Getter;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractDeviceProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractDeviceProperty.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstruction.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstruction.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractLayeredConstructionProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLayeredConstructionProperty.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
-import org.citygml4j.ade.energy.model.core.AbstractLayeredConstruction;
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.model.gml.base.AssociationByRepOrRef;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibrary.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibrary.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractLibraryProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractLibraryProperty.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttribute.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttribute.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.model.citygml.ade.binding.ADEModelObject;
 import org.citygml4j.model.gml.base.AbstractGML;

src/main/java/org/citygml4j/ade/energy/model/core/AbstractQualifiedAttributeProperty.java → src/main/java/org/citygml4j/ade/energy3/model/core/AbstractQualifiedAttributeProperty.java

-package org.citygml4j.ade.energy.model.core;
+package org.citygml4j.ade.energy3.model.core;
 
 import org.citygml4j.builder.copy.CopyBuilder;
 import org.citygml4j.model.citygml.ade.binding.ADEGenericApplicationProperty;