This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 62d610b4efa9b22e9e27e0cc6b58bcef2360a104
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Tue Sep 10 10:08:18 2019 +0700
JAMES-2703 Remove JDBCRecipientRewriteTable
---
.../james/rrt/jdbc/JDBCRecipientRewriteTable.java | 429 ---------------------
.../rrt/jdbc/JDBCRecipientRewriteTableTest.java | 66 ----
.../org/apache/james/rrt/jdbc/JDBCStepdefs.java | 68 ----
.../apache/james/rrt/jdbc/RewriteTablesTest.java | 32 --
4 files changed, 595 deletions(-)
diff --git
a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
b/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
deleted file mode 100644
index 40f03ef..0000000
---
a/server/data/data-jdbc/src/main/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTable.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you 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. *
- ****************************************************************/
-package org.apache.james.rrt.jdbc;
-
-import java.io.InputStream;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.sql.DataSource;
-
-import org.apache.commons.configuration2.HierarchicalConfiguration;
-import org.apache.commons.configuration2.ex.ConfigurationException;
-import org.apache.commons.configuration2.tree.ImmutableNode;
-import org.apache.james.core.Domain;
-import org.apache.james.filesystem.api.FileSystem;
-import org.apache.james.rrt.api.RecipientRewriteTableException;
-import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
-import org.apache.james.rrt.lib.Mapping;
-import org.apache.james.rrt.lib.MappingSource;
-import org.apache.james.rrt.lib.Mappings;
-import org.apache.james.rrt.lib.MappingsImpl;
-import org.apache.james.util.sql.JDBCUtil;
-import org.apache.james.util.sql.SqlResources;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableMap;
-
-/**
- * Class responsible to implement the Virtual User Table in database with JDBC
- * access.
- *
- * @deprecated use JPARecipientRewriteTable
- *
- * JAMES-2703 This class is deprecated and will be removed straight after
upcoming James 3.4.0 release, unless it finds a maintainer
- */
-@Deprecated
-public class JDBCRecipientRewriteTable extends AbstractRecipientRewriteTable {
- private static final Logger LOGGER =
LoggerFactory.getLogger(JDBCRecipientRewriteTable.class);
-
- private DataSource dataSource = null;
-
- private String tableName = "RecipientRewriteTable";
-
- /**
- * Contains all of the sql strings for this component.
- */
- private SqlResources sqlQueries;
-
- /**
- * The name of the SQL configuration file to be used to configure this
- * repository.
- */
- private String sqlFileName;
-
- private FileSystem fileSystem;
-
- /**
- * The JDBCUtil helper class
- */
- private final JDBCUtil theJDBCUtil = new JDBCUtil();
-
- @PostConstruct
- public void init() throws Exception {
-
- LOGGER.debug("{}.initialize()", getClass().getName());
-
- // Test the connection to the database, by getting the
DatabaseMetaData.
- Connection conn = dataSource.getConnection();
- PreparedStatement createStatement = null;
-
- try {
- // Initialise the sql strings.
-
- InputStream sqlFile;
-
- try {
- sqlFile = fileSystem.getResource(sqlFileName);
- } catch (Exception e) {
- LOGGER.error(e.getMessage(), e);
- throw e;
- }
-
- LOGGER.debug("Reading SQL resources from file: {}, section {}.",
sqlFileName, getClass().getName());
-
- // Build the statement parameters
- Map<String, String> sqlParameters = new HashMap<>();
- if (tableName != null) {
- sqlParameters.put("table", tableName);
- }
-
- sqlQueries = new SqlResources();
- sqlQueries.init(sqlFile, this.getClass().getName(), conn,
sqlParameters);
-
- // Check if the required table exists. If not, create it.
- DatabaseMetaData dbMetaData = conn.getMetaData();
-
- // Need to ask in the case that identifiers are stored, ask the
- // DatabaseMetaInfo.
- // Try UPPER, lower, and MixedCase, to see if the table is there.
- if (!(theJDBCUtil.tableExists(dbMetaData, tableName))) {
-
- // Users table doesn't exist - create it.
- createStatement =
conn.prepareStatement(sqlQueries.getSqlString("createTable", true));
- createStatement.execute();
-
- LOGGER.info("JdbcVirtalUserTable: Created table '{}'.",
tableName);
- }
-
- } finally {
- theJDBCUtil.closeJDBCStatement(createStatement);
- theJDBCUtil.closeJDBCConnection(conn);
- }
- }
-
- @Inject
- public void setFileSystem(FileSystem fileSystem) {
- this.fileSystem = fileSystem;
- }
-
- @Inject
- public void setDataSource(DataSource dataSource) {
- this.dataSource = dataSource;
- }
-
- @Override
- protected void doConfigure(HierarchicalConfiguration<ImmutableNode> conf)
throws ConfigurationException {
-
- String destination = conf.getString("[@destinationURL]", null);
-
- if (destination == null) {
- throw new ConfigurationException("destinationURL must configured");
- }
-
- // normalize the destination, to simplify processing.
- if (!destination.endsWith("/")) {
- destination += "/";
- }
- // Parse the DestinationURL for the name of the datasource,
- // the table to use, and the (optional) repository Key.
- // Split on "/", starting after "db://"
- List<String> urlParams = new ArrayList<>();
- int start = 5;
-
- int end = destination.indexOf('/', start);
- while (end > -1) {
- urlParams.add(destination.substring(start, end));
- start = end + 1;
- end = destination.indexOf('/', start);
- }
-
- // Build SqlParameters and get datasource name from URL parameters
- if (urlParams.size() == 0) {
- String exceptionBuffer = "Malformed destinationURL - Must be of
the format '" + "db://<data-source>'. Was passed " +
conf.getString("[@destinationURL]");
- throw new ConfigurationException(exceptionBuffer);
- }
-
- if (urlParams.size() >= 2) {
- tableName = urlParams.get(1);
- }
-
- LOGGER.debug("Parsed URL: table = '{}'", tableName);
-
- sqlFileName = conf.getString("sqlFile");
-
- }
-
- @Override
- public void addMapping(MappingSource source, Mapping mapping) throws
RecipientRewriteTableException {
- Mappings map = getStoredMappings(source);
- if (!map.isEmpty()) {
- Mappings updatedMappings =
MappingsImpl.from(map).add(mapping).build();
- doUpdateMapping(source, updatedMappings.serialize());
- }
- doAddMapping(source, mapping.asString());
- }
-
- @Override
- protected Mappings mapAddress(String user, Domain domain) throws
RecipientRewriteTableException {
- Connection conn = null;
- PreparedStatement mappingStmt = null;
- try {
- conn = dataSource.getConnection();
- mappingStmt =
conn.prepareStatement(sqlQueries.getSqlString("selectMappings", true));
-
- ResultSet mappingRS = null;
- try {
- mappingStmt.setString(1, user);
- mappingStmt.setString(2, domain.asString());
- mappingRS = mappingStmt.executeQuery();
- if (mappingRS.next()) {
- return MappingsImpl.fromRawString(mappingRS.getString(1));
- }
- } finally {
- theJDBCUtil.closeJDBCResultSet(mappingRS);
- }
-
- } catch (SQLException sqle) {
- LOGGER.error("Error accessing database", sqle);
- throw new RecipientRewriteTableException("Error accessing
database", sqle);
- } finally {
- theJDBCUtil.closeJDBCStatement(mappingStmt);
- theJDBCUtil.closeJDBCConnection(conn);
- }
- return MappingsImpl.empty();
- }
-
- @Override
- public Mappings getStoredMappings(MappingSource source) throws
RecipientRewriteTableException {
- Connection conn = null;
- PreparedStatement mappingStmt = null;
- try {
- conn = dataSource.getConnection();
- mappingStmt =
conn.prepareStatement(sqlQueries.getSqlString("selectUserDomainMapping", true));
- ResultSet mappingRS = null;
- try {
- mappingStmt.setString(1, source.getFixedUser());
- mappingStmt.setString(2, source.getFixedDomain());
- mappingRS = mappingStmt.executeQuery();
- if (mappingRS.next()) {
- return MappingsImpl.fromRawString(mappingRS.getString(1));
- }
- } finally {
- theJDBCUtil.closeJDBCResultSet(mappingRS);
- }
- } catch (SQLException sqle) {
- LOGGER.error("Error accessing database", sqle);
- throw new RecipientRewriteTableException("Error accessing
database", sqle);
- } finally {
- theJDBCUtil.closeJDBCStatement(mappingStmt);
- theJDBCUtil.closeJDBCConnection(conn);
- }
- return MappingsImpl.empty();
- }
-
- @Override
- public Map<MappingSource, Mappings> getAllMappings() throws
RecipientRewriteTableException {
- Connection conn = null;
- PreparedStatement mappingStmt = null;
- Map<MappingSource, Mappings> mapping = new HashMap<>();
- try {
- conn = dataSource.getConnection();
- mappingStmt =
conn.prepareStatement(sqlQueries.getSqlString("selectAllMappings", true));
- ResultSet mappingRS = null;
- try {
- mappingRS = mappingStmt.executeQuery();
- while (mappingRS.next()) {
- String user = mappingRS.getString(1);
- Domain domain = Domain.of(mappingRS.getString(2));
- String map = mappingRS.getString(3);
- mapping.put(MappingSource.fromUser(user, domain),
MappingsImpl.fromRawString(map));
- }
- if (mapping.size() > 0) {
- return mapping;
- }
- } finally {
- theJDBCUtil.closeJDBCResultSet(mappingRS);
- }
-
- } catch (SQLException sqle) {
- LOGGER.error("Error accessing database", sqle);
- throw new RecipientRewriteTableException("Error accessing
database", sqle);
- } finally {
- theJDBCUtil.closeJDBCStatement(mappingStmt);
- theJDBCUtil.closeJDBCConnection(conn);
- }
- return ImmutableMap.of();
- }
-
- @Override
- public void removeMapping(MappingSource source, Mapping mapping) throws
RecipientRewriteTableException {
- Mappings map = getStoredMappings(source);
- if (map.size() > 1) {
- Mappings updatedMappings = map.remove(mapping);
- doUpdateMapping(source, updatedMappings.serialize());
- } else {
- doRemoveMapping(source, mapping.asString());
- }
- }
-
- /**
- * Update the mapping for the given user and domain
- *
- * @param user
- * the user
- * @param domain
- * the domain
- * @param mapping
- * the mapping
- * @return true if update was successfully
- * @throws RecipientRewriteTableException
- */
- private void doUpdateMapping(MappingSource source, String mapping) throws
RecipientRewriteTableException {
- Connection conn = null;
- PreparedStatement mappingStmt = null;
-
- try {
- conn = dataSource.getConnection();
- mappingStmt =
conn.prepareStatement(sqlQueries.getSqlString("updateMapping", true));
-
- ResultSet mappingRS = null;
- try {
- mappingStmt.setString(1, mapping);
- mappingStmt.setString(2, source.getFixedUser());
- mappingStmt.setString(3, source.getFixedDomain());
-
- if (mappingStmt.executeUpdate() < 1) {
- throw new RecipientRewriteTableException("Mapping not
found");
- }
- } finally {
- theJDBCUtil.closeJDBCResultSet(mappingRS);
- }
-
- } catch (SQLException sqle) {
- LOGGER.error("Error accessing database", sqle);
- throw new RecipientRewriteTableException("Error accessing
database", sqle);
- } finally {
- theJDBCUtil.closeJDBCStatement(mappingStmt);
- theJDBCUtil.closeJDBCConnection(conn);
- }
- }
-
- /**
- * Remove a mapping for the given user and domain
- *
- * @param user
- * the user
- * @param domain
- * the domain
- * @param mapping
- * the mapping
- * @return true if succesfully
- * @throws RecipientRewriteTableException
- */
- private void doRemoveMapping(MappingSource source, String mapping) throws
RecipientRewriteTableException {
- Connection conn = null;
- PreparedStatement mappingStmt = null;
-
- try {
- conn = dataSource.getConnection();
- mappingStmt =
conn.prepareStatement(sqlQueries.getSqlString("deleteMapping", true));
-
- ResultSet mappingRS = null;
- try {
- mappingStmt.setString(1, source.getFixedUser());
- mappingStmt.setString(2, source.getFixedDomain());
- mappingStmt.setString(3, mapping);
- if (mappingStmt.executeUpdate() < 1) {
- throw new RecipientRewriteTableException("Mapping not
found");
- }
- } finally {
- theJDBCUtil.closeJDBCResultSet(mappingRS);
- }
-
- } catch (SQLException sqle) {
- LOGGER.error("Error accessing database", sqle);
- } finally {
- theJDBCUtil.closeJDBCStatement(mappingStmt);
- theJDBCUtil.closeJDBCConnection(conn);
- }
- }
-
- /**
- * Add mapping for given user and domain
- *
- * @param user
- * the user
- * @param domain
- * the domain
- * @param mapping
- * the mapping
- * @return true if successfully
- * @throws RecipientRewriteTableException
- */
- private void doAddMapping(MappingSource source, String mapping) throws
RecipientRewriteTableException {
- Connection conn = null;
- PreparedStatement mappingStmt = null;
-
- try {
- conn = dataSource.getConnection();
- mappingStmt =
conn.prepareStatement(sqlQueries.getSqlString("addMapping", true));
-
- ResultSet mappingRS = null;
- try {
- mappingStmt.setString(1, source.getFixedUser());
- mappingStmt.setString(2, source.getFixedDomain());
- mappingStmt.setString(3, mapping);
-
- if (mappingStmt.executeUpdate() < 1) {
- throw new RecipientRewriteTableException("Mapping not
found");
- }
- } finally {
- theJDBCUtil.closeJDBCResultSet(mappingRS);
- }
-
- } catch (SQLException sqle) {
- LOGGER.error("Error accessing database", sqle);
- } finally {
- theJDBCUtil.closeJDBCStatement(mappingStmt);
- theJDBCUtil.closeJDBCConnection(conn);
- }
- }
-
-}
diff --git
a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
deleted file mode 100644
index eb47663..0000000
---
a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCRecipientRewriteTableTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you 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. *
- ****************************************************************/
-package org.apache.james.rrt.jdbc;
-
-import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.derby.jdbc.EmbeddedDriver;
-import org.apache.james.filesystem.api.mock.MockFileSystem;
-import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
-import org.apache.james.rrt.lib.AbstractRecipientRewriteTableTest;
-import org.junit.After;
-import org.junit.Before;
-
-public class JDBCRecipientRewriteTableTest extends
AbstractRecipientRewriteTableTest {
-
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
- }
-
- @Override
- @After
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
- @SuppressWarnings("deprecation")
- @Override
- protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws
Exception {
- JDBCRecipientRewriteTable localVirtualUserTable = new
JDBCRecipientRewriteTable();
- localVirtualUserTable.setDataSource(getDataSource());
- localVirtualUserTable.setFileSystem(new MockFileSystem());
- BaseHierarchicalConfiguration defaultConfiguration = new
BaseHierarchicalConfiguration();
- defaultConfiguration.addProperty("[@destinationURL]",
"db://maildb/RecipientRewriteTable");
- defaultConfiguration.addProperty("sqlFile",
"file://conf/sqlResources.xml");
- localVirtualUserTable.configure(defaultConfiguration);
- localVirtualUserTable.init();
- return localVirtualUserTable;
- }
-
- private BasicDataSource getDataSource() {
- BasicDataSource ds = new BasicDataSource();
- ds.setDriverClassName(EmbeddedDriver.class.getName());
- ds.setUrl("jdbc:derby:target/testdb;create=true");
- ds.setUsername("james");
- ds.setPassword("james");
- return ds;
- }
-}
diff --git
a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java
b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java
deleted file mode 100644
index b09158f..0000000
---
a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/JDBCStepdefs.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you 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. *
- ****************************************************************/
-package org.apache.james.rrt.jdbc;
-
-import java.util.UUID;
-
-import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.derby.jdbc.EmbeddedDriver;
-import org.apache.james.filesystem.api.mock.MockFileSystem;
-import org.apache.james.rrt.lib.AbstractRecipientRewriteTable;
-import org.apache.james.rrt.lib.RecipientRewriteTableFixture;
-import org.apache.james.rrt.lib.RewriteTablesStepdefs;
-
-import cucumber.api.java.Before;
-
-public class JDBCStepdefs {
-
- private final RewriteTablesStepdefs mainStepdefs;
-
- public JDBCStepdefs(RewriteTablesStepdefs mainStepdefs) {
- this.mainStepdefs = mainStepdefs;
- }
-
- @Before
- public void setup() throws Throwable {
- mainStepdefs.rewriteTable = getRecipientRewriteTable();
- }
-
- @SuppressWarnings("deprecation")
- protected AbstractRecipientRewriteTable getRecipientRewriteTable() throws
Exception {
- JDBCRecipientRewriteTable localVirtualUserTable = new
JDBCRecipientRewriteTable();
- localVirtualUserTable.setDataSource(getDataSource());
- localVirtualUserTable.setFileSystem(new MockFileSystem());
- BaseHierarchicalConfiguration defaultConfiguration = new
BaseHierarchicalConfiguration();
- defaultConfiguration.addProperty("[@destinationURL]",
"db://maildb/RecipientRewriteTable");
- defaultConfiguration.addProperty("sqlFile",
"file://conf/sqlResources.xml");
- localVirtualUserTable.configure(defaultConfiguration);
-
localVirtualUserTable.setDomainList(RecipientRewriteTableFixture.domainListForCucumberTests());
- localVirtualUserTable.init();
- return localVirtualUserTable;
- }
-
- private BasicDataSource getDataSource() {
- BasicDataSource ds = new BasicDataSource();
- ds.setDriverClassName(EmbeddedDriver.class.getName());
- ds.setUrl("jdbc:derby:target/" + UUID.randomUUID() + ";create=true");
- ds.setUsername("james");
- ds.setPassword("james");
- return ds;
- }
-}
diff --git
a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/RewriteTablesTest.java
b/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/RewriteTablesTest.java
deleted file mode 100644
index 7732555..0000000
---
a/server/data/data-jdbc/src/test/java/org/apache/james/rrt/jdbc/RewriteTablesTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you 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. *
- ****************************************************************/
-package org.apache.james.rrt.jdbc;
-
-import org.junit.runner.RunWith;
-
-import cucumber.api.CucumberOptions;
-import cucumber.api.junit.Cucumber;
-
-@RunWith(Cucumber.class)
-@CucumberOptions(
- features = { "classpath:cucumber/" },
- glue = { "org.apache.james.rrt.lib", "org.apache.james.rrt.jdbc" }
- )
-public class RewriteTablesTest {
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
