cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [6/6] cayenne git commit: Gradle plugin cleanup
Date Mon, 29 May 2017 13:37:37 GMT
Gradle plugin cleanup


Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/eb9a25a4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/eb9a25a4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/eb9a25a4

Branch: refs/heads/master
Commit: eb9a25a4a1816e1a53ebce8522c5f31b4cf1ec5e
Parents: c59789b
Author: Nikita Timofeev <stariy95@gmail.com>
Authored: Mon May 29 16:30:06 2017 +0300
Committer: Nikita Timofeev <stariy95@gmail.com>
Committed: Mon May 29 16:30:06 2017 +0300

----------------------------------------------------------------------
 cayenne-gradle-plugin/pom.xml                   | 28 ++++++++-----
 .../cayenne/tools/model/DbImportConfig.java     | 44 +++++++++++++-------
 .../cayenne/tools/model/IncludeTable.java       |  4 ++
 3 files changed, 52 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cayenne/blob/eb9a25a4/cayenne-gradle-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/cayenne-gradle-plugin/pom.xml b/cayenne-gradle-plugin/pom.xml
index 3b7fbe4..03f9435 100644
--- a/cayenne-gradle-plugin/pom.xml
+++ b/cayenne-gradle-plugin/pom.xml
@@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 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. -->
+<!--
+	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.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

http://git-wip-us.apache.org/repos/asf/cayenne/blob/eb9a25a4/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/DbImportConfig.java
----------------------------------------------------------------------
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/DbImportConfig.java
b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/DbImportConfig.java
index a29a38b..55b0735 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/DbImportConfig.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/DbImportConfig.java
@@ -151,10 +151,6 @@ public class DbImportConfig extends SchemaContainer {
         return reverseEngineering;
     }
 
-    public boolean getSkipRelationshipsLoading() {
-        return skipRelationshipsLoading;
-    }
-
     public boolean isSkipRelationshipsLoading() {
         return skipRelationshipsLoading;
     }
@@ -163,8 +159,8 @@ public class DbImportConfig extends SchemaContainer {
         this.skipRelationshipsLoading = skipRelationshipsLoading;
     }
 
-    public boolean getSkipPrimaryKeyLoading() {
-        return skipPrimaryKeyLoading;
+    public void skipRelationshipsLoading(boolean skipRelationshipsLoading) {
+        setSkipRelationshipsLoading(skipRelationshipsLoading);
     }
 
     public boolean isSkipPrimaryKeyLoading() {
@@ -175,6 +171,10 @@ public class DbImportConfig extends SchemaContainer {
         this.skipPrimaryKeyLoading = skipPrimaryKeyLoading;
     }
 
+    public void skipPrimaryKeyLoading(boolean skipPrimaryKeyLoading) {
+        setSkipPrimaryKeyLoading(skipPrimaryKeyLoading);
+    }
+
     public String getDefaultPackage() {
         return defaultPackage;
     }
@@ -183,8 +183,8 @@ public class DbImportConfig extends SchemaContainer {
         this.defaultPackage = defaultPackage;
     }
 
-    public boolean getForceDataMapCatalog() {
-        return forceDataMapCatalog;
+    public void defaultPackage(String defaultPackage) {
+        setDefaultPackage(defaultPackage);
     }
 
     public boolean isForceDataMapCatalog() {
@@ -195,8 +195,8 @@ public class DbImportConfig extends SchemaContainer {
         this.forceDataMapCatalog = forceDataMapCatalog;
     }
 
-    public boolean getForceDataMapSchema() {
-        return forceDataMapSchema;
+    public void forceDataMapCatalog(boolean forceDataMapCatalog) {
+        setForceDataMapCatalog(forceDataMapCatalog);
     }
 
     public boolean isForceDataMapSchema() {
@@ -207,6 +207,10 @@ public class DbImportConfig extends SchemaContainer {
         this.forceDataMapSchema = forceDataMapSchema;
     }
 
+    public void forceDataMapSchema(boolean forceDataMapSchema) {
+        setForceDataMapSchema(forceDataMapSchema);
+    }
+
     public String getMeaningfulPkTables() {
         return meaningfulPkTables;
     }
@@ -215,6 +219,10 @@ public class DbImportConfig extends SchemaContainer {
         this.meaningfulPkTables = meaningfulPkTables;
     }
 
+    public void meaningfulPkTables(String meaningfulPkTables) {
+        setMeaningfulPkTables(meaningfulPkTables);
+    }
+
     public String getNamingStrategy() {
         return namingStrategy;
     }
@@ -223,6 +231,10 @@ public class DbImportConfig extends SchemaContainer {
         this.namingStrategy = namingStrategy;
     }
 
+    public void namingStrategy(String namingStrategy) {
+        setNamingStrategy(namingStrategy);
+    }
+
     public String getStripFromTableNames() {
         return stripFromTableNames;
     }
@@ -231,8 +243,8 @@ public class DbImportConfig extends SchemaContainer {
         this.stripFromTableNames = stripFromTableNames;
     }
 
-    public boolean getUsePrimitives() {
-        return usePrimitives;
+    public void stripFromTableNames(String stripFromTableNames) {
+        setStripFromTableNames(stripFromTableNames);
     }
 
     public boolean isUsePrimitives() {
@@ -243,8 +255,8 @@ public class DbImportConfig extends SchemaContainer {
         this.usePrimitives = usePrimitives;
     }
 
-    public boolean getUseJava7Types() {
-        return useJava7Types;
+    public void usePrimitives(boolean usePrimitives) {
+        setUsePrimitives(usePrimitives);
     }
 
     public boolean isUseJava7Types() {
@@ -255,6 +267,10 @@ public class DbImportConfig extends SchemaContainer {
         this.useJava7Types = useJava7Types;
     }
 
+    public void useJava7Types(boolean useJava7Types) {
+        setUseJava7Types(useJava7Types);
+    }
+
     public Collection<String> getTableTypes() {
         return tableTypes;
     }

http://git-wip-us.apache.org/repos/asf/cayenne/blob/eb9a25a4/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/IncludeTable.java
----------------------------------------------------------------------
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/IncludeTable.java
b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/IncludeTable.java
index 137f0cd..5bd12b7 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/IncludeTable.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/model/IncludeTable.java
@@ -37,6 +37,10 @@ public class IncludeTable extends PatternParam {
         super(pattern);
     }
 
+    public void setName(String name) {
+        setPattern(name);
+    }
+
     public void name(String name) {
         setPattern(name);
     }


Mime
View raw message