From ab339ea76e694ac737b981179aab2b94c82c1cda Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Thu, 22 Feb 2018 14:48:38 +0100 Subject: Removal of classes Removal of useless classes as they have been moved somewhere else. Issue-ID: CLAMP-85 Change-Id: Ibbafa7b51f35d9f6fab462a9a0fc5dee77f4ff16 Signed-off-by: Determe, Sebastien (sd378r) --- .../onap/clamp/clds/config/CldsConfiguration.java | 74 ------------ .../clamp/clds/config/CldsSecurityConfigUsers.java | 127 --------------------- .../clds/exception/DcaeDeploymentException.java | 61 ---------- .../clds/exception/SdcCommunicationException.java | 61 ---------- 4 files changed, 323 deletions(-) delete mode 100644 src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java delete mode 100644 src/main/java/org/onap/clamp/clds/config/CldsSecurityConfigUsers.java delete mode 100644 src/main/java/org/onap/clamp/clds/exception/DcaeDeploymentException.java delete mode 100644 src/main/java/org/onap/clamp/clds/exception/SdcCommunicationException.java (limited to 'src/main/java/org') diff --git a/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java b/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java deleted file mode 100644 index ae9704109..000000000 --- a/src/main/java/org/onap/clamp/clds/config/CldsConfiguration.java +++ /dev/null @@ -1,74 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - * =================================================================== - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ - -package org.onap.clamp.clds.config; - -import javax.sql.DataSource; -import javax.xml.transform.TransformerConfigurationException; - -import org.onap.clamp.clds.dao.CldsDao; -import org.onap.clamp.clds.transform.XslTransformer; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.beans.factory.config.PropertiesFactoryBean; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.core.io.ClassPathResource; - -@Configuration -@Profile("clamp-default") -public class CldsConfiguration { - - /** - * Clds Identity database DataSource configuration - * - * @return - */ - @Bean(name = "cldsDataSource") - @ConfigurationProperties(prefix = "spring.datasource.cldsdb") - public DataSource cldsDataSource() { - return new EncodedPasswordBasicDataSource(); - } - - @Bean(name = "mapper") - public PropertiesFactoryBean mapper() { - PropertiesFactoryBean bean = new PropertiesFactoryBean(); - bean.setLocation(new ClassPathResource("system.properties")); - return bean; - } - - @Bean(name = "cldsDao") - public CldsDao getCldsDao(@Qualifier("cldsDataSource") DataSource dataSource) { - CldsDao cldsDao = new CldsDao(); - cldsDao.setDataSource(dataSource); - return cldsDao; - } - - @Bean(name = "cldsBpmnTransformer") - public XslTransformer getCldsBpmnXslTransformer() throws TransformerConfigurationException { - XslTransformer xslTransformer = new XslTransformer(); - xslTransformer.setXslResourceName("xsl/clds-bpmn-transformer.xsl"); - return xslTransformer; - } -} \ No newline at end of file diff --git a/src/main/java/org/onap/clamp/clds/config/CldsSecurityConfigUsers.java b/src/main/java/org/onap/clamp/clds/config/CldsSecurityConfigUsers.java deleted file mode 100644 index db99dbaf4..000000000 --- a/src/main/java/org/onap/clamp/clds/config/CldsSecurityConfigUsers.java +++ /dev/null @@ -1,127 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - * =================================================================== - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ - -package org.onap.clamp.clds.config; - -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; - -import java.io.IOException; - -import org.onap.clamp.clds.exception.CldsUsersException; -import org.onap.clamp.clds.service.CldsUser; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; - -/** - * This class is used to enable the HTTP authentication to login. It requires a - * specific JSON file containing the user definition - * (classpath:etc/config/clds/clds-users.json). - * - */ -@Configuration -@EnableWebSecurity -@Profile("clamp-spring-authentication") -public class CldsSecurityConfigUsers extends WebSecurityConfigurerAdapter { - - protected static final EELFLogger logger = EELFManager.getInstance() - .getLogger(CldsSecurityConfigUsers.class); - protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger(); - - @Autowired - private ApplicationContext appContext; - - @Value("${org.onap.clamp.config.files.cldsUsers:'classpath:etc/config/clds/clds-users.json'}") - private String cldsUsersFile; - - @Value("${CLDS_PERMISSION_TYPE_CL:permission-type-cl}") - private String cldsPersmissionTypeCl; - - @Value("${CLDS_PERMISSION_INSTANCE:dev}") - private String cldsPermissionInstance; - - /** - * This method configures on which URL the authorization will be enabled. - */ - @Override - protected void configure(HttpSecurity http) { - try { - http.csrf().disable().httpBasic().and().authorizeRequests().antMatchers("/restservices/clds/v1/user/**") - .authenticated().anyRequest().permitAll().and().logout(); - } catch (Exception e) { - logger.error("Exception occurred during the setup of the Web users in memory", e); - throw new CldsUsersException("Exception occurred during the setup of the Web users in memory", e); - } - } - - /** - * This method is called by the framework and is used to load all the users - * defined in cldsUsersFile variable (this file path can be configured in - * the application.properties). - * - * @param auth - */ - @Autowired - public void configureGlobal(AuthenticationManagerBuilder auth) { - try { - CldsUser[] usersList = loadUsers(); - - // no users defined - if (null == usersList) { - logger.warn("No users defined. Users should be defined under " + cldsUsersFile); - return; - } - - for (CldsUser user : usersList) { - auth.inMemoryAuthentication().withUser(user.getUser()).password(user.getPassword()) - .roles(user.getPermissionsString()); - } - } catch (Exception e) { - logger.error("Exception occurred during the setup of the Web users in memory", e); - throw new CldsUsersException("Exception occurred during the setup of the Web users in memory", e); - } - } - - /** - * This method loads physically the JSON file and convert it to an Array of - * CldsUser. - * - * @return The array of CldsUser - */ - private CldsUser[] loadUsers() { - try { - logger.info("Load from clds-users.properties"); - return CldsUserJsonDecoder.decodeJson(appContext.getResource(cldsUsersFile).getInputStream()); - } catch (IOException e) { - logger.error("Unable to decode the User Json file", e); - throw new CldsUsersException("Load from clds-users.properties", e); - } - } -} diff --git a/src/main/java/org/onap/clamp/clds/exception/DcaeDeploymentException.java b/src/main/java/org/onap/clamp/clds/exception/DcaeDeploymentException.java deleted file mode 100644 index 6a60ac9d9..000000000 --- a/src/main/java/org/onap/clamp/clds/exception/DcaeDeploymentException.java +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - * =================================================================== - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ - -package org.onap.clamp.clds.exception; - -/** - * New exception to capture DCAE communication errors. - * - */ -public class DcaeDeploymentException extends RuntimeException { - - /** - * Generated ID - */ - private static final long serialVersionUID = 8452294782552680243L; - - /** - * This constructor can be used to create a new DcaeDeploymentException. - * - * @param message - * A string message detailing the problem - * @param e - * The exception sent by the code - */ - public DcaeDeploymentException(String message, Throwable e) { - super(message, e); - } - - /** - * This constructor can be used to create a new DcaeDeploymentException. Use - * this constructor only if you are creating a new exception stack, not if - * an exception was already raised by another code. - * - * @param message - * A string message detailing the problem - */ - public DcaeDeploymentException(String message) { - super(message); - } - -} diff --git a/src/main/java/org/onap/clamp/clds/exception/SdcCommunicationException.java b/src/main/java/org/onap/clamp/clds/exception/SdcCommunicationException.java deleted file mode 100644 index 429ab8dff..000000000 --- a/src/main/java/org/onap/clamp/clds/exception/SdcCommunicationException.java +++ /dev/null @@ -1,61 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END============================================ - * =================================================================== - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ - -package org.onap.clamp.clds.exception; - -/** - * New exception to capture SDC communication errors. - * - */ -public class SdcCommunicationException extends RuntimeException { - - /** - * Generated ID - */ - private static final long serialVersionUID = 8452294782552680243L; - - /** - * This constructor can be used to create a new SdcCommunicationException. - * - * @param message - * A string message detailing the problem - * @param e - * The exception sent by the code - */ - public SdcCommunicationException(String message, Throwable e) { - super(message, e); - } - - /** - * This constructor can be used to create a new SdcCommunicationException. - * Use this constructor only if you are creating a new exception stack, not - * if an exception was already raised by another code. - * - * @param message - * A string message detailing the problem - */ - public SdcCommunicationException(String message) { - super(message); - } - -} -- cgit 1.2.3-korg