From 0a0dd79870affc5dd94f98bfa64647872f25ff2f Mon Sep 17 00:00:00 2001 From: Lyn Elisa Goltz Date: Thu, 6 Jun 2024 13:03:29 +0200 Subject: [PATCH] #1654 - fixed weld warnings by removing annotations and adding default constuctor --- .../deegree/console/datastore/feature/FeatureStoreConfig.java | 4 ++++ .../deegree/console/datastore/feature/FeatureStoreLoader.java | 4 ++-- .../deegree/console/datastore/metadata/MetadataImporter.java | 4 ++-- .../console/datastore/metadata/MetadataStoreConfig.java | 4 ++++ .../src/main/java/org/deegree/console/generic/Connection.java | 4 ++-- .../java/org/deegree/console/webservices/ServiceConfig.java | 4 ++++ 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreConfig.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreConfig.java index 52425dd94a..b1d9d43744 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreConfig.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreConfig.java @@ -66,6 +66,10 @@ public class FeatureStoreConfig extends Config { + public FeatureStoreConfig() { + this(null, null); + } + public FeatureStoreConfig(ResourceMetadata metadata, ResourceManager resourceManager) { super(metadata, resourceManager, "/console/datastore/feature/index", true); } diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreLoader.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreLoader.java index 59844e7f5f..fb57819b5e 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreLoader.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreLoader.java @@ -63,8 +63,8 @@ * * @author Markus Schneider */ -@Named -@RequestScoped +// @Named +// @RequestScoped public class FeatureStoreLoader implements Serializable { private static final long serialVersionUID = 5091506903775758089L; diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataImporter.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataImporter.java index e3c59ef54f..354b319d81 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataImporter.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataImporter.java @@ -63,8 +63,8 @@ * * @author Steffen Thomas */ -@Named -@RequestScoped +// @Named +// @RequestScoped public class MetadataImporter implements Serializable { private static Logger LOG = LoggerFactory.getLogger(MetadataImporter.class); diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreConfig.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreConfig.java index fbd69fb0f4..49557547a6 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreConfig.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreConfig.java @@ -58,6 +58,10 @@ public class MetadataStoreConfig extends Config { + public MetadataStoreConfig() { + this(null, null); + } + public MetadataStoreConfig(ResourceMetadata state, ResourceManager resourceManager) { super(state, resourceManager, "/console/datastore/metadata/index", true); } diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/Connection.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/Connection.java index 2b209c9dd6..b7e24f895c 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/Connection.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/Connection.java @@ -51,8 +51,8 @@ * * @author Markus Schneider */ -@Named -@RequestScoped +// @Named +// @RequestScoped public class Connection implements Serializable { private static final long serialVersionUID = 6495856816506360039L; diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServiceConfig.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServiceConfig.java index 20066cf57a..8a04b6acc3 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServiceConfig.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServiceConfig.java @@ -48,6 +48,10 @@ public class ServiceConfig extends Config { private static final URL METADATA_EXAMPLE_URL = ServicesBean.class .getResource("/META-INF/schemas/services/metadata/example.xml"); + public ServiceConfig() { + this(null, null); + } + public ServiceConfig(ResourceMetadata metadata, ResourceManager resourceManager) { super(metadata, resourceManager, "/console/webservices/index", true); }