Skip to content

Commit

Permalink
reformatted code
Browse files Browse the repository at this point in the history
  • Loading branch information
@clausnagel
clausnagel committed Sep 9, 2024
1 parent 6d66025 commit 17377fb
Show file tree
Hide file tree
Showing 147 changed files with 9,738 additions and 9,751 deletions.
650 changes: 316 additions & 334 deletions src/main/java/vcs/citydb/wfs/WFSService.java
View file

Large diffs are not rendered by default.

110 changes: 55 additions & 55 deletions src/main/java/vcs/citydb/wfs/config/Constants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,65 +5,65 @@
import java.util.List;

public class Constants {
public static final String DEFAULT_OWS_TITLE = "3DCityDB Web Feature Service";
public static final long UNKNOWN_NUMBER_MATCHED = Long.MAX_VALUE;
public static final long COUNT_DEFAULT = Long.MAX_VALUE;
public static final String DEFAULT_OWS_TITLE = "3DCityDB Web Feature Service";
public static final long UNKNOWN_NUMBER_MATCHED = Long.MAX_VALUE;
public static final long COUNT_DEFAULT = Long.MAX_VALUE;

public static final String CONFIG_FILE;
public static final String CONFIG_SCHEMA_PATH = "src/main/webapp/WEB-INF/schemas/config";
public static final String CONFIG_SCHEMA_FILE = CONFIG_SCHEMA_PATH + "/config.xsd";
public static final String STORED_QUERIES_PATH = "/WEB-INF/stored-queries";
public static final String ADE_EXTENSIONS_PATH;
public static final String XSLT_STYLESHEETS_PATH = "/WEB-INF/xslt-stylesheets";
public static final String SCHEMAS_PATH = "/WEB-INF/schemas";
public static final String CITYGML_1_0_SCHEMAS_PATH = SCHEMAS_PATH + "/ogc/citygml/1.0.0";
public static final String CITYGML_2_0_SCHEMAS_PATH = SCHEMAS_PATH + "/ogc/citygml/2.0.0";
public static final String CITYJSON_SCHEMA_PATH = SCHEMAS_PATH + "/cityjson";
public static final String LOG_PATH = "/WEB-INF";
public static final String LOG_FILE = "wfs.log";
public static final String CONFIG_FILE;
public static final String CONFIG_SCHEMA_PATH = "src/main/webapp/WEB-INF/schemas/config";
public static final String CONFIG_SCHEMA_FILE = CONFIG_SCHEMA_PATH + "/config.xsd";
public static final String STORED_QUERIES_PATH = "/WEB-INF/stored-queries";
public static final String ADE_EXTENSIONS_PATH;
public static final String XSLT_STYLESHEETS_PATH = "/WEB-INF/xslt-stylesheets";
public static final String SCHEMAS_PATH = "/WEB-INF/schemas";
public static final String CITYGML_1_0_SCHEMAS_PATH = SCHEMAS_PATH + "/ogc/citygml/1.0.0";
public static final String CITYGML_2_0_SCHEMAS_PATH = SCHEMAS_PATH + "/ogc/citygml/2.0.0";
public static final String CITYJSON_SCHEMA_PATH = SCHEMAS_PATH + "/cityjson";
public static final String LOG_PATH = "/WEB-INF";
public static final String LOG_FILE = "wfs.log";

public static final String INIT_ERROR_ATTRNAME = "init_error";

public static final String WFS_SERVICE_PATH = "/wfs";
public static final String WFS_SERVICE_STRING = "WFS";
public static final List<String> SUPPORTED_WFS_VERSIONS = new ArrayList<>(Arrays.asList("2.0.2", "2.0.0"));
public static String DEFAULT_WFS_VERSION = "2.0.2";

public static final String WFS_NAMESPACE_URI = "http://www.opengis.net/wfs/2.0";
public static final String WFS_NAMESPACE_PREFIX = "wfs";
public static final String WFS_SCHEMA_LOCATION = "http://schemas.opengis.net/wfs/2.0/wfs.xsd";
public static final String FES_NAMESPACE_URI = "http://www.opengis.net/fes/2.0";
public static final String FES_NAMESPACE_PREFIX = "fes";
public static final String FES_SCHEMA_LOCATION = "http://schemas.opengis.net/filter/2.0/filterAll.xsd";
public static final String OWS_NAMESPACE_URI = "http://www.opengis.net/ows/1.1";
public static final String OWS_NAMESPACE_PREFIX = "ows";
public static final String OWS_SCHEMA_LOCATION = "http://schemas.opengis.net/ows/1.1.0/owsAll.xsd";
public static final String GML_3_2_1_NAMESPACE_URI = "http://www.opengis.net/gml/3.2";
public static final String GML_3_3_NAMESPACE_URI = "http://www.opengis.net/gml/3.3";
public static final String INIT_ERROR_ATTRNAME = "init_error";

public static final String TEXTURE_SERVICE_PATH = "/texture";
public static final String TEXTURE_CACHE_PATH = "/WEB-INF/texture_cache";
public static final int TEXTURE_CACHE_BUCKETS = 1000;
public static final String WFS_SERVICE_PATH = "/wfs";
public static final String WFS_SERVICE_STRING = "WFS";
public static final List<String> SUPPORTED_WFS_VERSIONS = new ArrayList<>(Arrays.asList("2.0.2", "2.0.0"));
public static String DEFAULT_WFS_VERSION = "2.0.2";

public static final String MANAGEMENT_SERVICE_PATH = "/service";
public static final String WFS_NAMESPACE_URI = "http://www.opengis.net/wfs/2.0";
public static final String WFS_NAMESPACE_PREFIX = "wfs";
public static final String WFS_SCHEMA_LOCATION = "http://schemas.opengis.net/wfs/2.0/wfs.xsd";
public static final String FES_NAMESPACE_URI = "http://www.opengis.net/fes/2.0";
public static final String FES_NAMESPACE_PREFIX = "fes";
public static final String FES_SCHEMA_LOCATION = "http://schemas.opengis.net/filter/2.0/filterAll.xsd";
public static final String OWS_NAMESPACE_URI = "http://www.opengis.net/ows/1.1";
public static final String OWS_NAMESPACE_PREFIX = "ows";
public static final String OWS_SCHEMA_LOCATION = "http://schemas.opengis.net/ows/1.1.0/owsAll.xsd";
public static final String GML_3_2_1_NAMESPACE_URI = "http://www.opengis.net/gml/3.2";
public static final String GML_3_3_NAMESPACE_URI = "http://www.opengis.net/gml/3.3";

static {
if (System.getenv("WFS_CONFIG_FILE") != null) {
CONFIG_FILE = System.getenv("WFS_CONFIG_FILE");
} else if (System.getenv("VC_WFS_CONFIG_FILE") != null) {
// VC_WFS_CONFIG_FILE is deprecated but still supported for backwards compatibility
CONFIG_FILE = System.getenv("VC_WFS_CONFIG_FILE");
} else {
CONFIG_FILE = "WEB-INF/config.xml";
}
public static final String TEXTURE_SERVICE_PATH = "/texture";
public static final String TEXTURE_CACHE_PATH = "/WEB-INF/texture_cache";
public static final int TEXTURE_CACHE_BUCKETS = 1000;

if (System.getenv("WFS_ADE_EXTENSIONS_PATH") != null) {
ADE_EXTENSIONS_PATH = System.getenv("WFS_ADE_EXTENSIONS_PATH");
} else if (System.getenv("VC_WFS_ADE_EXTENSIONS_PATH") != null) {
// VC_WFS_ADE_EXTENSIONS_PATH is deprecated but still supported for backwards compatibility
ADE_EXTENSIONS_PATH = System.getenv("VC_WFS_ADE_EXTENSIONS_PATH");
} else {
ADE_EXTENSIONS_PATH = "WEB-INF/ade-extensions";
}
}
public static final String MANAGEMENT_SERVICE_PATH = "/service";

static {
if (System.getenv("WFS_CONFIG_FILE") != null) {
CONFIG_FILE = System.getenv("WFS_CONFIG_FILE");
} else if (System.getenv("VC_WFS_CONFIG_FILE") != null) {
// VC_WFS_CONFIG_FILE is deprecated but still supported for backwards compatibility
CONFIG_FILE = System.getenv("VC_WFS_CONFIG_FILE");
} else {
CONFIG_FILE = "WEB-INF/config.xml";
}

if (System.getenv("WFS_ADE_EXTENSIONS_PATH") != null) {
ADE_EXTENSIONS_PATH = System.getenv("WFS_ADE_EXTENSIONS_PATH");
} else if (System.getenv("VC_WFS_ADE_EXTENSIONS_PATH") != null) {
// VC_WFS_ADE_EXTENSIONS_PATH is deprecated but still supported for backwards compatibility
ADE_EXTENSIONS_PATH = System.getenv("VC_WFS_ADE_EXTENSIONS_PATH");
} else {
ADE_EXTENSIONS_PATH = "WEB-INF/ade-extensions";
}
}
}
218 changes: 109 additions & 109 deletions src/main/java/vcs/citydb/wfs/config/WFSConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,115 +14,115 @@
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;

@XmlRootElement(name="wfs")
@XmlType(name="WFSConfigType", propOrder={
"capabilities",
"featureTypes",
"operations",
"filterCapabilities",
"constraints",
"postProcessing",
"database",
"server",
"logging"
@XmlRootElement(name = "wfs")
@XmlType(name = "WFSConfigType", propOrder = {
"capabilities",
"featureTypes",
"operations",
"filterCapabilities",
"constraints",
"postProcessing",
"database",
"server",
"logging"
})
public class WFSConfig {
@XmlElement(required=true)
private Capabilities capabilities;
@XmlElement(required=true)
private FeatureTypes featureTypes;
private Operations operations;
private FilterCapabilities filterCapabilities;
private Constraints constraints;
private PostProcessing postProcessing;
@XmlElement(required=true)
private Database database;
@XmlElement(required=true)
private Server server;
private Logging logging;
public WFSConfig() {
capabilities = new Capabilities();
featureTypes = new FeatureTypes();
operations = new Operations();
filterCapabilities = new FilterCapabilities();
constraints = new Constraints();
postProcessing = new PostProcessing();
database = new Database();
server = new Server();
logging = new Logging();
}

public Capabilities getCapabilities() {
return capabilities;
}

public void setCapabilities(Capabilities capabilities) {
this.capabilities = capabilities;
}

public FeatureTypes getFeatureTypes() {
return featureTypes;
}

public void setFeatureTypes(FeatureTypes featureTypes) {
this.featureTypes = featureTypes;
}

public Operations getOperations() {
return operations;
}

public void setOperations(Operations operations) {
this.operations = operations;
}

public FilterCapabilities getFilterCapabilities() {
return filterCapabilities;
}

public void setFilterCapabilities(FilterCapabilities filterCapabilities) {
this.filterCapabilities = filterCapabilities;
}

public Constraints getConstraints() {
return constraints;
}

public void setConstraints(Constraints constraints) {
this.constraints = constraints;
}

public PostProcessing getPostProcessing() {
return postProcessing;
}

public void setPostProcessing(PostProcessing postProcessing) {
this.postProcessing = postProcessing;
}

public Database getDatabase() {
return database;
}

public void setDatabase(Database database) {
this.database = database;
}

public Server getServer() {
return server;
}

public void setServer(Server server) {
this.server = server;
}

public Logging getLogging() {
return logging;
}

public void setLogging(Logging logging) {
this.logging = logging;
}
@XmlElement(required = true)
private Capabilities capabilities;
@XmlElement(required = true)
private FeatureTypes featureTypes;
private Operations operations;
private FilterCapabilities filterCapabilities;
private Constraints constraints;
private PostProcessing postProcessing;
@XmlElement(required = true)
private Database database;
@XmlElement(required = true)
private Server server;
private Logging logging;

public WFSConfig() {
capabilities = new Capabilities();
featureTypes = new FeatureTypes();
operations = new Operations();
filterCapabilities = new FilterCapabilities();
constraints = new Constraints();
postProcessing = new PostProcessing();
database = new Database();
server = new Server();
logging = new Logging();
}

public Capabilities getCapabilities() {
return capabilities;
}

public void setCapabilities(Capabilities capabilities) {
this.capabilities = capabilities;
}

public FeatureTypes getFeatureTypes() {
return featureTypes;
}

public void setFeatureTypes(FeatureTypes featureTypes) {
this.featureTypes = featureTypes;
}

public Operations getOperations() {
return operations;
}

public void setOperations(Operations operations) {
this.operations = operations;
}

public FilterCapabilities getFilterCapabilities() {
return filterCapabilities;
}

public void setFilterCapabilities(FilterCapabilities filterCapabilities) {
this.filterCapabilities = filterCapabilities;
}

public Constraints getConstraints() {
return constraints;
}

public void setConstraints(Constraints constraints) {
this.constraints = constraints;
}

public PostProcessing getPostProcessing() {
return postProcessing;
}

public void setPostProcessing(PostProcessing postProcessing) {
this.postProcessing = postProcessing;
}

public Database getDatabase() {
return database;
}

public void setDatabase(Database database) {
this.database = database;
}

public Server getServer() {
return server;
}

public void setServer(Server server) {
this.server = server;
}

public Logging getLogging() {
return logging;
}

public void setLogging(Logging logging) {
this.logging = logging;
}

}
Loading

0 comments on commit 17377fb

Please sign in to comment.