This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 0726c79 Remove unnecessary constant
0726c79 is described below
commit 0726c7975c9308c8831a9b94a966d63c08607822
Author: Nikita Timofeev <[email protected]>
AuthorDate: Fri Nov 15 12:14:31 2019 +0300
Remove unnecessary constant
---
.../java/org/apache/cayenne/gen/CgenModule.java | 3 +--
.../cayenne/gen/DefaultToolsUtilsFactory.java | 3 +--
.../org/apache/cayenne/tools/ToolsConstants.java | 28 ----------------------
3 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenModule.java
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenModule.java
index 076a5b6..42391c8 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenModule.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenModule.java
@@ -32,7 +32,6 @@ import
org.apache.cayenne.gen.property.PropertyDescriptorCreator;
import org.apache.cayenne.gen.property.StringPropertyDescriptorCreator;
import org.apache.cayenne.gen.xml.CgenExtension;
import org.apache.cayenne.project.ProjectModule;
-import org.apache.cayenne.tools.ToolsConstants;
/**
* @since 4.1
@@ -55,6 +54,6 @@ public class CgenModule implements Module{
}
public static ListBuilder<PropertyDescriptorCreator>
contributeUserProperties(Binder binder) {
- return binder.bindList(PropertyDescriptorCreator.class,
ToolsConstants.CUSTOM_PROPERTIES);
+ return binder.bindList(PropertyDescriptorCreator.class);
}
}
diff --git
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultToolsUtilsFactory.java
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultToolsUtilsFactory.java
index 57a4d93..e8a28a4 100644
---
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultToolsUtilsFactory.java
+++
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultToolsUtilsFactory.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.cayenne.di.AdhocObjectFactory;
import org.apache.cayenne.di.Inject;
import org.apache.cayenne.gen.property.PropertyDescriptorCreator;
-import org.apache.cayenne.tools.ToolsConstants;
import org.slf4j.Logger;
/**
@@ -34,7 +33,7 @@ public class DefaultToolsUtilsFactory implements
ToolsUtilsFactory {
@Inject
private AdhocObjectFactory objectFactory;
- @Inject(ToolsConstants.CUSTOM_PROPERTIES)
+ @Inject
List<PropertyDescriptorCreator> propertyList;
@Override
diff --git
a/cayenne-cgen/src/main/java/org/apache/cayenne/tools/ToolsConstants.java
b/cayenne-cgen/src/main/java/org/apache/cayenne/tools/ToolsConstants.java
deleted file mode 100644
index 8f3687d..0000000
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/tools/ToolsConstants.java
+++ /dev/null
@@ -1,28 +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
- *
- * https://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.cayenne.tools;
-
-/**
- * @since 4.2
- */
-public interface ToolsConstants {
-
- String CUSTOM_PROPERTIES = "cayenne.cgen.properties";
-
-}
