You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/11/20 01:57:03 UTC
[james-project] 35/49: [Refactoring] MockMailetConfig &
MockMatcherConfig are not used
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 86862beee1752cf04db0dbf4d7468fb11486d878
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Nov 17 20:00:31 2019 +0700
[Refactoring] MockMailetConfig & MockMatcherConfig are not used
---
.../smtpserver/mock/mailet/MockMailetConfig.java | 78 ----------------------
.../smtpserver/mock/mailet/MockMatcherConfig.java | 60 -----------------
2 files changed, 138 deletions(-)
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java
deleted file mode 100644
index 8ad7f6f..0000000
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java
+++ /dev/null
@@ -1,78 +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.smtpserver.mock.mailet;
-
-import java.util.Iterator;
-import java.util.Properties;
-
-import org.apache.mailet.MailetConfig;
-import org.apache.mailet.MailetContext;
-
-/**
- * MailetConfig over Properties
- */
-public class MockMailetConfig extends Properties implements MailetConfig {
-
- private final String mailetName;
- private final MailetContext mc;
-
- public MockMailetConfig(String mailetName, MailetContext mc) {
- super();
- this.mailetName = mailetName;
- this.mc = mc;
- }
-
- public MockMailetConfig(String mailetName, MailetContext mc, Properties arg0) {
- super(arg0);
- this.mailetName = mailetName;
- this.mc = mc;
- }
-
- @Override
- public String getInitParameter(String name) {
- return getProperty(name);
- }
-
- @Override
- public Iterator<String> getInitParameterNames() {
- return stringPropertyNames().iterator();
- }
-
- @Override
- public MailetContext getMailetContext() {
- return mc;
- }
-
- @Override
- public String getMailetName() {
- return mailetName;
- }
-
- // Override setProperty to work like it should in this MockMailetConfig
- @Override
- public Object setProperty(String key, String value) {
- String oldValue = getProperty(key);
- String newValue = value;
-
- if (oldValue != null) {
- newValue = oldValue + "," + value;
- }
- return super.setProperty(key, newValue);
- }
-}
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java
deleted file mode 100644
index 3eca11e..0000000
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java
+++ /dev/null
@@ -1,60 +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.smtpserver.mock.mailet;
-
-import org.apache.mailet.MailetContext;
-import org.apache.mailet.MatcherConfig;
-
-/**
- * MatcherConfig
- */
-public class MockMatcherConfig implements MatcherConfig {
-
- private final String matcherName;
- private final MailetContext mc;
-
- public MockMatcherConfig(String matcherName, MailetContext mc) {
- super();
- this.matcherName = matcherName;
- this.mc = mc;
- }
-
- @Override
- public String getCondition() {
- if (matcherName.contains("=")) {
- return matcherName.substring(getMatcherName().length() + 1);
- } else {
- return null;
- }
- }
-
- @Override
- public MailetContext getMailetContext() {
- return mc;
- }
-
- @Override
- public String getMatcherName() {
- if (matcherName.contains("=")) {
- return matcherName.split("=")[0];
- } else {
- return matcherName;
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org