diff options
3 files changed, 10 insertions, 9 deletions
diff --git a/src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java b/src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java index fed16b8..b309cfd 100644 --- a/src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java +++ b/src/main/java/org/onap/dcae/inventory/clients/DCAEControllerClient.java @@ -139,6 +139,11 @@ public class DCAEControllerClient { private final Client client; private final InventoryConfiguration.DCAEControllerConnectionConfiguration connectionConfiguration; + public DCAEControllerClient(Client client, + InventoryConfiguration.DCAEControllerConnectionConfiguration connectionConfiguration) { + this.client = client; + this.connectionConfiguration = connectionConfiguration; + } public URI constructResourceURI(String resourcePath) { // TODO: Better way to construct this? @@ -213,10 +218,6 @@ public class DCAEControllerClient { } } - public DCAEControllerClient(Client client, - InventoryConfiguration.DCAEControllerConnectionConfiguration connectionConfiguration) { - this.client = client; - this.connectionConfiguration = connectionConfiguration; - } + } diff --git a/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java b/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java index c2527e2..2bd17bf 100644 --- a/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java +++ b/src/main/java/org/onap/dcae/inventory/daos/InventoryDAOManager.java @@ -60,9 +60,9 @@ public final class InventoryDAOManager { } - private final static Logger LOG = LoggerFactory.getLogger(InventoryDAOManager.class); + private static final Logger LOG = LoggerFactory.getLogger(InventoryDAOManager.class); // WATCH! Table creation order matters where mapping tables refer to other tables for foreign keys. - private final static List<Class> DAO_CLASSES = Arrays.asList(DCAEServiceTypesDAO.class, DCAEServicesDAO.class, + private static final List<Class> DAO_CLASSES = Arrays.asList(DCAEServiceTypesDAO.class, DCAEServicesDAO.class, DCAEServiceComponentsDAO.class, DCAEServicesComponentsMapsDAO.class); private DBI jdbi; diff --git a/src/main/java/org/onap/dcae/inventory/dbthings/StringListArgument.java b/src/main/java/org/onap/dcae/inventory/dbthings/StringListArgument.java index 2e70550..aa41ac6 100644 --- a/src/main/java/org/onap/dcae/inventory/dbthings/StringListArgument.java +++ b/src/main/java/org/onap/dcae/inventory/dbthings/StringListArgument.java @@ -45,11 +45,11 @@ public class StringListArgument implements ArgumentFactory<List<String>> { @Override public Argument build(Class<?> expectedType, List<String> value, StatementContext statementContext) { - Argument argument = (int position, PreparedStatement statement, StatementContext ctx) -> { + return (int position, PreparedStatement statement, StatementContext ctx) -> { Array values = statement.getConnection().createArrayOf("varchar", value.toArray()); statement.setArray(position, values); }; - return argument; + } } |