refactor(core/deployment/persitence): refactored package structure

Author: Johannes Hiemer

osb-core

@@ -6,7 +6,7 @@
 import de.evoila.cf.broker.exception.ServiceBrokerException;
 import de.evoila.cf.broker.exception.ServiceDefinitionDoesNotExistException;
 import de.evoila.cf.broker.exception.ServiceInstanceDoesNotExistException;
-import de.evoila.cf.broker.model.Plan;
+import de.evoila.cf.broker.model.catalog.plan.Plan;
 import de.evoila.cf.broker.model.ServiceInstance;
 import de.evoila.cf.broker.repository.ServiceDefinitionRepository;
 import de.evoila.cf.broker.repository.ServiceInstanceRepository;

osb-deployment

@@ -6,6 +6,9 @@
 import com.jcraft.jsch.JSchException;
 import de.evoila.cf.broker.exception.ServiceBrokerException;
 import de.evoila.cf.broker.model.*;
+import de.evoila.cf.broker.model.catalog.plan.Plan;
+import de.evoila.cf.broker.model.RouteBinding;
+import de.evoila.cf.broker.model.catalog.ServerAddress;
 import de.evoila.cf.broker.repository.BindingRepository;
 import de.evoila.cf.broker.repository.RouteBindingRepository;
 import de.evoila.cf.broker.repository.ServiceDefinitionRepository;
@@ -136,7 +139,7 @@ protected Map<String, Object> createCredentials(String bindingId, ServiceInstanc
         List<ServerAddress> pgpool_hosts = serviceInstance.getHosts();
         String ingressInstanceGroup = plan.getMetadata().getIngressInstanceGroup();
         if (ingressInstanceGroup != null && ingressInstanceGroup.length() > 0) {
-            pgpool_hosts = ServiceInstanceUtils.filteredServerAddress(serviceInstance.getHosts(),ingressInstanceGroup);
+            pgpool_hosts = ServiceInstanceUtils.filteredServerAddress(serviceInstance.getHosts(), ingressInstanceGroup);
         }
 
         String endpoint = ServiceInstanceUtils.connectionUrl(pgpool_hosts);

osb-persistence

@@ -4,9 +4,9 @@
 package de.evoila.cf.broker.custom.postgres;
 
 import de.evoila.cf.broker.bean.ExistingEndpointBean;
-import de.evoila.cf.broker.model.Plan;
+import de.evoila.cf.broker.model.catalog.plan.Plan;
 import de.evoila.cf.broker.model.Platform;
-import de.evoila.cf.broker.model.ServerAddress;
+import de.evoila.cf.broker.model.catalog.ServerAddress;
 import de.evoila.cf.broker.model.ServiceInstance;
 import de.evoila.cf.broker.util.ServiceInstanceUtils;
 import de.evoila.cf.cpi.bosh.PostgresBoshPlatformService;

osb-service/src/main/java/de/evoila/cf/broker/backup/BackupCustomServiceImpl.java

@@ -3,7 +3,7 @@
  */
 package de.evoila.cf.broker.custom.postgres;
 
-import de.evoila.cf.broker.model.ServerAddress;
+import de.evoila.cf.broker.model.catalog.ServerAddress;
 import de.evoila.cf.broker.util.ServiceInstanceUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

osb-service/src/main/java/de/evoila/cf/broker/custom/postgres/PostgreSQLBindingService.java

@@ -5,7 +5,7 @@
 
 import de.evoila.cf.broker.bean.HAProxyConfiguration;
 import de.evoila.cf.broker.model.Mode;
-import de.evoila.cf.broker.model.ServerAddress;
+import de.evoila.cf.broker.model.catalog.ServerAddress;
 import de.evoila.cf.broker.service.HAProxyService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.stereotype.Service;

osb-service/src/main/java/de/evoila/cf/broker/custom/postgres/PostgresCustomImplementation.java

@@ -4,23 +4,20 @@
 import com.jcraft.jsch.JSchException;
 import com.jcraft.jsch.Session;
 import de.evoila.cf.broker.bean.BoshProperties;
-import de.evoila.cf.broker.exception.PlatformException;
 import de.evoila.cf.broker.model.DashboardClient;
-import de.evoila.cf.broker.model.Plan;
-import de.evoila.cf.broker.model.ServerAddress;
+import de.evoila.cf.broker.model.catalog.plan.Plan;
+import de.evoila.cf.broker.model.catalog.ServerAddress;
 import de.evoila.cf.broker.model.ServiceInstance;
 import de.evoila.cf.broker.repository.PlatformRepository;
 import de.evoila.cf.broker.service.CatalogService;
 import de.evoila.cf.broker.service.availability.ServicePortAvailabilityVerifier;
 import de.evoila.cf.cpi.bosh.deployment.manifest.InstanceGroup;
 import de.evoila.cf.cpi.bosh.deployment.manifest.Manifest;
 import io.bosh.client.deployments.Deployment;
-import io.bosh.client.errands.ErrandSummary;
 import io.bosh.client.vms.Vm;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
-import rx.Observable;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -45,41 +42,14 @@ public class PostgresBoshPlatformService extends BoshPlatformService {
                 new PostgresDeploymentManager(boshProperties, environment));
     }
 
-    @Override
-    protected void runCreateErrands(ServiceInstance instance, Plan plan, Deployment deployment,
-                                    Observable<List<ErrandSummary>> errands) throws PlatformException {}
-
-    @Override
-    protected void runUpdateErrands(ServiceInstance instance, Plan plan, Deployment deployment,
-                                    Observable<List<ErrandSummary>> errands) throws PlatformException { }
-
     @Override
     protected void updateHosts(ServiceInstance serviceInstance, Plan plan, Deployment deployment) {
         List<Vm> vms = super.getVms(serviceInstance);
         serviceInstance.getHosts().clear();
 
-        vms.forEach(vm -> serviceInstance.getHosts().add(super.toServerAddress(vm, defaultPort)));
-    }
-
-
-    @Override
-    public ServiceInstance postCreateInstance(ServiceInstance serviceInstance, Plan plan) throws PlatformException {
-        boolean available;
-        try {
-            available = portAvailabilityVerifier.verifyServiceAvailability(serviceInstance, false);
-        } catch (Exception e) {
-            throw new PlatformException("Service instance is not reachable. Service may not be started on instance.",
-                    e);
-        }
-
-        if (!available) {
-            throw new PlatformException("Service instance is not reachable. Service may not be started on instance.");
-        }
-
-        return serviceInstance;
+        vms.forEach(vm -> serviceInstance.getHosts().add(super.toServerAddress(vm, defaultPort, plan)));
     }
 
-
     @Override
     public void postDeleteInstance(ServiceInstance serviceInstance) { }
 

osb-service/src/main/java/de/evoila/cf/broker/custom/postgres/PostgresDbService.java

@@ -1,7 +1,7 @@
 package de.evoila.cf.cpi.bosh;
 
 import de.evoila.cf.broker.bean.BoshProperties;
-import de.evoila.cf.broker.model.Plan;
+import de.evoila.cf.broker.model.catalog.plan.Plan;
 import de.evoila.cf.broker.model.ServiceInstance;
 import de.evoila.cf.broker.util.RandomString;
 import de.evoila.cf.cpi.bosh.deployment.DeploymentManager;