OZG-4453 adjust properties naming

ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchProperties.java

@@ -15,7 +15,7 @@ public class OzgCloudElasticsearchProperties {
 	private String secretCredentialsName;
 	private String certificateSecretName;
 
-	private OzgCloudElasticsearchServerProperties serverProperties;
+	private OzgCloudElasticsearchServerProperties server;
 
 	@Getter
 	@Setter

ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelper.java

@@ -37,7 +37,7 @@ public class OzgCloudElasticsearchSecretHelper {
 	}
 	
 	private String buildSecretAddress() {
-		return String.format("%s:%s", properties.getServerProperties().getHost(), properties.getServerProperties().getPort());
+		return String.format("%s:%s", properties.getServer().getHost(), properties.getServer().getPort());
 	}
 	
 	private String generatePassword() {

ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/OzgCloudElasticsearchService.java

@@ -135,13 +135,13 @@ public class OzgCloudElasticsearchService {
 	}
 	
 	void createCredentialSecret(String namespace, Resource<Secret> secretResource) {
-		var serverSecretResource = kubernetesService.getSecretResource(properties.getServerProperties().getNamespace(), properties.getServerProperties().getCertificateSecretName());
+		var serverSecretResource = kubernetesService.getSecretResource(properties.getServer().getNamespace(), properties.getServer().getCertificateSecretName());
 		
 		createAdapter(secretResource).create(secretHelper.buildCertificateSecret(namespace, getSecretData(serverSecretResource.get())));
 	}
 	
 	private String getSecretData(Secret secret) {
-		return MapUtils.getString(secret.getStringData(), properties.getServerProperties().getCertificateSecretDataKey());
+		return MapUtils.getString(secret.getStringData(), properties.getServer().getCertificateSecretDataKey());
 	}
 	
 	ResourceAdapter<Secret> createAdapter(Resource<Secret> resource) {

ozgcloud-elasticsearch-operator/src/main/java/de/ozgcloud/operator/common/elasticsearch/ElasticsearchClientConfiguration.java

@@ -28,7 +28,7 @@ public class ElasticsearchClientConfiguration {
 	@Bean
 	@Scope("singleton")
 	ElasticsearchClient createElasticsearchClient() {
-		var credentialsProvider = createCredentialsProvider(elasticSearchProperties.getServerProperties().getSecretDataKey(), getPassword());
+		var credentialsProvider = createCredentialsProvider(elasticSearchProperties.getServer().getSecretDataKey(), getPassword());
 		var restClient = buildRestClient(credentialsProvider);
 		var transport = createRestClientTransport(restClient);
 		return new ElasticsearchClient(transport);
@@ -47,7 +47,7 @@ public class ElasticsearchClientConfiguration {
 	}
 
 	private HttpHost createHttpHost() {
-		return new HttpHost(elasticSearchProperties.getServerProperties().getHost(), elasticSearchProperties.getServerProperties().getPort(), elasticSearchProperties.getServerProperties().getScheme());
+		return new HttpHost(elasticSearchProperties.getServer().getHost(), elasticSearchProperties.getServer().getPort(), elasticSearchProperties.getServer().getScheme());
 	}
 
 	private RestClientTransport createRestClientTransport(RestClient restClient) {
@@ -55,8 +55,8 @@ public class ElasticsearchClientConfiguration {
 	}
 
 	String getPassword() {
-		var resource = kubernetesService.getSecretResource(elasticSearchProperties.getServerProperties().getNamespace(), elasticSearchProperties.getServerProperties().getSecretName());
-		var password = MapUtils.getString(resource.get().getStringData(), elasticSearchProperties.getServerProperties().getSecretDataKey());
+		var resource = kubernetesService.getSecretResource(elasticSearchProperties.getServer().getNamespace(), elasticSearchProperties.getServer().getSecretName());
+		var password = MapUtils.getString(resource.get().getStringData(), elasticSearchProperties.getServer().getSecretDataKey());
 		return password;
 	}
 }
\ No newline at end of file

ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchSecretHelperTest.java

@@ -38,7 +38,7 @@ class OzgCloudElasticsearchSecretHelperTest {
 		
 		@BeforeEach
 		void mockProperties() {
-			when(properties.getServerProperties()).thenReturn(serverProperties);
+			when(properties.getServer()).thenReturn(serverProperties);
 			when(serverProperties.getHost()).thenReturn(HOST);
 			when(serverProperties.getPort()).thenReturn(PORT);
 		}

ozgcloud-elasticsearch-operator/src/test/java/de/ozgcloud/operator/OzgCloudElasticsearchServiceTest.java

@@ -381,7 +381,7 @@ class OzgCloudElasticsearchServiceTest {
 			
 			@BeforeEach
 			void mock() {
-				when(properties.getServerProperties()).thenReturn(serverProperties);
+				when(properties.getServer()).thenReturn(serverProperties);
 				when(serverProperties.getNamespace()).thenReturn(SERVER_NAMESPACE);
 				when(serverProperties.getCertificateSecretName()).thenReturn(SERVER_CERTIFICATE_SECRET_NAME);
 				when(serverProperties.getCertificateSecretDataKey()).thenReturn(SERVER_CERTIFICATE_SECRET_DATA_KEY);