Skip to content

Commit

Permalink
code refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@charliemaiors
charliemaiors committed Apr 13, 2016
1 parent d7bed19 commit 7aca94f
Show file tree
Hide file tree
Showing 26 changed files with 25 additions and 70 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ project.ext {
/**
* gradle Related Vars
*/
mainClass = 'org.project.openbaton.nubomedia.api.Main'
mainClass = 'org.project.openbaton.nubomedia.api.core.Main'
//------------------------------------------------//
}

Expand Down
2 changes: 1 addition & 1 deletion ...project/openbaton/nubomedia/api/Main.java → ...ct/openbaton/nubomedia/api/core/Main.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api;
package org.project.openbaton.nubomedia.api.core;

import org.project.openbaton.nubomedia.api.openshift.beans.OpenshiftConfiguration;
import org.springframework.boot.SpringApplication;
Expand Down
4 changes: 1 addition & 3 deletions ...on/nubomedia/api/NubomediaAppManager.java → ...bomedia/api/core/NubomediaAppManager.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package org.project.openbaton.nubomedia.api;
package org.project.openbaton.nubomedia.api.core;

import org.openbaton.catalogue.mano.common.Ip;
import org.openbaton.catalogue.mano.descriptor.VirtualDeploymentUnit;
import org.openbaton.catalogue.mano.record.VNFCInstance;
import org.openbaton.catalogue.mano.record.VirtualNetworkFunctionRecord;
import org.openbaton.catalogue.nfvo.Action;
import org.openbaton.catalogue.nfvo.Configuration;
import org.openbaton.catalogue.nfvo.ConfigurationParameter;
import org.openbaton.sdk.api.exception.SDKException;
import org.project.openbaton.nubomedia.api.configuration.PaaSProperties;
import org.project.openbaton.nubomedia.api.exceptions.ApplicationNotFoundException;
Expand Down
2 changes: 1 addition & 1 deletion ...omedia/api/NubomediaExceptionHandler.java → ...a/api/core/NubomediaExceptionHandler.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api;
package org.project.openbaton.nubomedia.api.core;

import org.project.openbaton.nubomedia.api.exceptions.ApplicationNotFoundException;
import org.project.openbaton.nubomedia.api.messages.NubomediaAppNotFoundMessage;
Expand Down
2 changes: 1 addition & 1 deletion ...baton/nubomedia/api/OpenbatonManager.java → .../nubomedia/api/core/OpenbatonManager.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api;
package org.project.openbaton.nubomedia.api.core;

import org.openbaton.catalogue.mano.common.*;
import org.openbaton.catalogue.mano.descriptor.InternalVirtualLink;
Expand Down
2 changes: 1 addition & 1 deletion ...baton/nubomedia/api/OpenshiftManager.java → .../nubomedia/api/core/OpenshiftManager.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api;
package org.project.openbaton.nubomedia.api.core;


import com.google.gson.Gson;
Expand Down
2 changes: 1 addition & 1 deletion ...baton/nubomedia/api/SimpleCorsFilter.java → .../nubomedia/api/core/SimpleCorsFilter.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api;
package org.project.openbaton.nubomedia.api.core;

import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
Expand Down
2 changes: 1 addition & 1 deletion ...ct/openbaton/nubomedia/api/WebConfig.java → ...enbaton/nubomedia/api/core/WebConfig.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api;
package org.project.openbaton.nubomedia.api.core;

import org.springframework.stereotype.Controller;

Expand Down
32 changes: 0 additions & 32 deletions src/main/java/org/project/openbaton/nubomedia/api/openshift/ConfigReader.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/java/org/project/openbaton/nubomedia/api/openshift/beans/BuildConfigManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.project.openbaton.nubomedia.api.openshift.beans;

import com.google.gson.Gson;
import org.project.openbaton.nubomedia.api.openshift.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.builders.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.exceptions.DuplicatedException;
import org.project.openbaton.nubomedia.api.openshift.exceptions.UnauthorizedException;
import org.project.openbaton.nubomedia.api.openshift.json.BuildConfig;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/project/openbaton/nubomedia/api/openshift/beans/DeploymentManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.google.gson.Gson;
import org.project.openbaton.nubomedia.api.messages.BuildingStatus;
import org.project.openbaton.nubomedia.api.openshift.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.builders.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.exceptions.DuplicatedException;
import org.project.openbaton.nubomedia.api.openshift.exceptions.UnauthorizedException;
import org.project.openbaton.nubomedia.api.openshift.json.DeploymentConfig;
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/org/project/openbaton/nubomedia/api/openshift/beans/ImageStreamManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
package org.project.openbaton.nubomedia.api.openshift.beans;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.project.openbaton.nubomedia.api.openshift.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.builders.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.exceptions.DuplicatedException;
import org.project.openbaton.nubomedia.api.openshift.exceptions.UnauthorizedException;
import org.project.openbaton.nubomedia.api.openshift.json.ImageStreamConfig;
import org.project.openbaton.nubomedia.api.openshift.json.Metadata;
import org.project.openbaton.nubomedia.api.openshift.json.MetadataTypeAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.*;
import org.springframework.stereotype.Service;
import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.RestTemplate;

import javax.annotation.PostConstruct;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/project/openbaton/nubomedia/api/openshift/beans/ProjectManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.project.openbaton.nubomedia.api.openshift.beans;

import com.google.gson.Gson;
import org.project.openbaton.nubomedia.api.openshift.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.builders.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.exceptions.UnauthorizedException;
import org.project.openbaton.nubomedia.api.openshift.json.Project;
import org.project.openbaton.nubomedia.api.openshift.json.ProjectRequest;
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/org/project/openbaton/nubomedia/api/openshift/beans/RouteManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package org.project.openbaton.nubomedia.api.openshift.beans;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.project.openbaton.nubomedia.api.openshift.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.builders.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.exceptions.DuplicatedException;
import org.project.openbaton.nubomedia.api.openshift.exceptions.UnauthorizedException;
import org.project.openbaton.nubomedia.api.openshift.json.Metadata;
import org.project.openbaton.nubomedia.api.openshift.json.MetadataTypeAdapter;
import org.project.openbaton.nubomedia.api.openshift.json.RouteConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/project/openbaton/nubomedia/api/openshift/beans/SecretManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package org.project.openbaton.nubomedia.api.openshift.beans;

import com.google.gson.Gson;
import org.mockito.internal.util.collections.ArrayUtils;
import org.project.openbaton.nubomedia.api.openshift.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.builders.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.exceptions.UnauthorizedException;
import org.project.openbaton.nubomedia.api.openshift.json.*;
import org.slf4j.Logger;
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/org/project/openbaton/nubomedia/api/openshift/beans/ServiceManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package org.project.openbaton.nubomedia.api.openshift.beans;

import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.project.openbaton.nubomedia.api.openshift.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.builders.MessageBuilderFactory;
import org.project.openbaton.nubomedia.api.openshift.exceptions.DuplicatedException;
import org.project.openbaton.nubomedia.api.openshift.exceptions.UnauthorizedException;
import org.project.openbaton.nubomedia.api.openshift.json.Metadata;
import org.project.openbaton.nubomedia.api.openshift.json.MetadataTypeAdapter;
import org.project.openbaton.nubomedia.api.openshift.json.ServiceConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...ia/api/openshift/BuildMessageBuilder.java → ...enshift/builders/BuildMessageBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.*;

Expand Down
2 changes: 1 addition & 1 deletion ...i/openshift/DeploymentMessageBuilder.java → ...ft/builders/DeploymentMessageBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.*;

Expand Down
2 changes: 1 addition & 1 deletion ...orizontalPodAutoscalerMessageBuilder.java → ...orizontalPodAutoscalerMessageBuilder.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.HPASpec;
import org.project.openbaton.nubomedia.api.openshift.json.HPASpecCpuMetrics;
Expand Down
2 changes: 1 addition & 1 deletion .../openshift/ImageStreamMessageBuilder.java → ...t/builders/ImageStreamMessageBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.ImageStreamConfig;
import org.project.openbaton.nubomedia.api.openshift.json.Metadata;
Expand Down
2 changes: 1 addition & 1 deletion .../api/openshift/MessageBuilderFactory.java → ...shift/builders/MessageBuilderFactory.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.*;

Expand Down
2 changes: 1 addition & 1 deletion .../api/openshift/ProjectRequestBuilder.java → ...shift/builders/ProjectRequestBuilder.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.Metadata;
import org.project.openbaton.nubomedia.api.openshift.json.ProjectRequest;
Expand Down
2 changes: 1 addition & 1 deletion ...ia/api/openshift/RouteMessageBuilder.java → ...enshift/builders/RouteMessageBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.*;

Expand Down
2 changes: 1 addition & 1 deletion ...nshift/SecretChallengeMessageBuilder.java → ...ilders/SecretChallengeMessageBuilder.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.Metadata;
import org.project.openbaton.nubomedia.api.openshift.json.SecretConfig;
Expand Down
2 changes: 1 addition & 1 deletion ...pi/openshift/SecretKeyMessageBuilder.java → ...ift/builders/SecretKeyMessageBuilder.java
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.Metadata;
import org.project.openbaton.nubomedia.api.openshift.json.SecretConfig;
Expand Down
2 changes: 1 addition & 1 deletion .../api/openshift/ServiceMessageBuilder.java → ...shift/builders/ServiceMessageBuilder.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.project.openbaton.nubomedia.api.openshift;
package org.project.openbaton.nubomedia.api.openshift.builders;

import org.project.openbaton.nubomedia.api.openshift.json.Metadata;
import org.project.openbaton.nubomedia.api.openshift.json.Selector;
Expand Down

0 comments on commit 7aca94f

Please sign in to comment.