Skip to content

Commit 3eb12cf

Browse files
HectorBstHectorBst
committed
Refacto - Changed project package
1 parent 7afba82 commit 3eb12cf

File tree

17 files changed

+61
-43
lines changed

17 files changed

+61
-43
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ Here is an example of how the extension can be added to the jsonschema2pojo Mave
328328
...
329329
<!-- Extension RuleFactory -->
330330
<customRuleFactory>
331-
org.jsonschema2pojo.springframework.data.couchbase.rules.SpringDataCouchbaseRuleFactory
331+
io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.SpringDataCouchbaseRuleFactory
332332
</customRuleFactory>
333333
</configuration>
334334
</execution>

‎example/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<maven.compiler.target>11</maven.compiler.target>
1414
<jsonschema2pojo.version>1.0.2</jsonschema2pojo.version>
1515
<spring-boot.version>2.3.4.RELEASE</spring-boot.version>
16-
<jsonschema2pojo-spring-data-couchbase.version>0.1.1</jsonschema2pojo-spring-data-couchbase.version>
16+
<jsonschema2pojo-spring-data-couchbase.version>0.2.0</jsonschema2pojo-spring-data-couchbase.version>
1717
</properties>
1818

1919
<dependencies>
@@ -59,7 +59,7 @@
5959
<real>java.math.BigDecimal</real>
6060
</formatTypeMapping>
6161
<customRuleFactory>
62-
org.jsonschema2pojo.springframework.data.couchbase.rules.SpringDataCouchbaseRuleFactory
62+
io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.SpringDataCouchbaseRuleFactory
6363
</customRuleFactory>
6464
</configuration>
6565
</execution>

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@
140140
</goals>
141141
<configuration>
142142
<sourceDirectory>${basedir}/src/main/resources/schema</sourceDirectory>
143-
<targetPackage>org.jsonschema2pojo.springframework.data.couchbase.definitions
143+
<targetPackage>
144+
io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions
144145
</targetPackage>
145146
<classNameSuffix>Def</classNameSuffix>
146147
<generateBuilders>false</generateBuilders>

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/rules/SpringDataCouchbaseRuleFactory.java renamed to src/main/java/io/github/hectorbst/jsonschema2pojo/springframework/data/couchbase/SpringDataCouchbaseRuleFactory.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
1-
package org.jsonschema2pojo.springframework.data.couchbase.rules;
1+
package io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import com.fasterxml.jackson.databind.module.SimpleModule;
55
import com.sun.codemodel.JDefinedClass;
66
import com.sun.codemodel.JFieldVar;
77
import com.sun.codemodel.JPackage;
88
import com.sun.codemodel.JType;
9+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.deser.DefaultDefinitionDeserializerModifier;
10+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules.CouchbaseCasRule;
11+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules.CouchbaseDocumentRule;
12+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules.CouchbaseFieldRule;
13+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules.CouchbaseIdRule;
14+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules.CouchbaseJoinRule;
15+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules.SpringDataCouchbaseObjectRule;
16+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules.SpringDataCouchbasePropertyRule;
917
import org.jsonschema2pojo.rules.Rule;
1018
import org.jsonschema2pojo.rules.RuleFactory;
11-
import org.jsonschema2pojo.springframework.data.couchbase.deser.DefaultDefinitionDeserializerModifier;
1219
import org.jsonschema2pojo.util.ParcelableHelper;
1320

1421
/**

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/deser/DefaultDefinitionDeserializer.java renamed to src/main/java/io/github/hectorbst/jsonschema2pojo/springframework/data/couchbase/deser/DefaultDefinitionDeserializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.jsonschema2pojo.springframework.data.couchbase.deser;
1+
package io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.deser;
22

33
import com.fasterxml.jackson.core.JsonParser;
44
import com.fasterxml.jackson.databind.DeserializationContext;

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/deser/DefaultDefinitionDeserializerModifier.java renamed to src/main/java/io/github/hectorbst/jsonschema2pojo/springframework/data/couchbase/deser/DefaultDefinitionDeserializerModifier.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package org.jsonschema2pojo.springframework.data.couchbase.deser;
1+
package io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.deser;
22

33
import com.fasterxml.jackson.databind.BeanDescription;
44
import com.fasterxml.jackson.databind.DeserializationConfig;
55
import com.fasterxml.jackson.databind.JsonDeserializer;
66
import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
77
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
8-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.CasDef;
9-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.DocumentDef;
10-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.FieldDef;
11-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.GeneratedDef;
12-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.IdAttributeDef;
13-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.IdDef;
14-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.IdPrefixDef;
15-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.IdSuffixDef;
16-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.IndexDef;
8+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.CasDef;
9+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.DocumentDef;
10+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.FieldDef;
11+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.GeneratedDef;
12+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.IdAttributeDef;
13+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.IdDef;
14+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.IdPrefixDef;
15+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.IdSuffixDef;
16+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.IndexDef;
1717

1818
import java.io.Serializable;
1919
import java.lang.reflect.InvocationTargetException;

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseCasRule.java renamed to src/main/java/io/github/hectorbst/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseCasRule.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
package org.jsonschema2pojo.springframework.data.couchbase.rules;
1+
package io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules;
22

33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.sun.codemodel.JFieldVar;
5+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.SpringDataCouchbaseRuleFactory;
6+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.CasDef;
57
import org.jsonschema2pojo.Schema;
68
import org.jsonschema2pojo.rules.Rule;
7-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.CasDef;
89
import org.springframework.data.annotation.Version;
910

1011
import java.util.Optional;
1112

12-
import static org.jsonschema2pojo.springframework.data.couchbase.util.SpringDataCouchbaseHelper.handleFieldMetadataExclusivity;
13+
import static io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.util.SpringDataCouchbaseHelper.handleFieldMetadataExclusivity;
1314

1415
/**
1516
* @author Hector Basset

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseDocumentRule.java renamed to src/main/java/io/github/hectorbst/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseDocumentRule.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package org.jsonschema2pojo.springframework.data.couchbase.rules;
1+
package io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules;
22

33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.sun.codemodel.JAnnotationArrayMember;
55
import com.sun.codemodel.JAnnotationUse;
66
import com.sun.codemodel.JDefinedClass;
7+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.SpringDataCouchbaseRuleFactory;
8+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.CompositeIndexDef;
9+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.DocumentDef;
710
import org.jsonschema2pojo.Schema;
811
import org.jsonschema2pojo.rules.Rule;
9-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.CompositeIndexDef;
10-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.DocumentDef;
1112
import org.springframework.data.couchbase.core.index.CompositeQueryIndex;
1213
import org.springframework.data.couchbase.core.mapping.Document;
1314

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseFieldRule.java renamed to src/main/java/io/github/hectorbst/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseFieldRule.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package org.jsonschema2pojo.springframework.data.couchbase.rules;
1+
package io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules;
22

33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.sun.codemodel.JAnnotationUse;
55
import com.sun.codemodel.JCodeModel;
66
import com.sun.codemodel.JFieldVar;
7+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.SpringDataCouchbaseRuleFactory;
8+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.FieldDef;
9+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.IndexDef;
710
import org.jsonschema2pojo.Schema;
811
import org.jsonschema2pojo.rules.Rule;
9-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.FieldDef;
10-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.IndexDef;
1112
import org.springframework.data.couchbase.core.index.QueryIndexDirection;
1213
import org.springframework.data.couchbase.core.index.QueryIndexed;
1314
import org.springframework.data.couchbase.core.mapping.Field;
@@ -17,8 +18,8 @@
1718

1819
import java.util.Optional;
1920

20-
import static org.jsonschema2pojo.springframework.data.couchbase.util.SpringDataCouchbaseHelper.JSON_KEY_INTERNAL_FIELD_EXCLUSIVITY;
21-
import static org.jsonschema2pojo.springframework.data.couchbase.util.SpringDataCouchbaseHelper.handleFieldMetadataExclusivity;
21+
import static io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.util.SpringDataCouchbaseHelper.JSON_KEY_INTERNAL_FIELD_EXCLUSIVITY;
22+
import static io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.util.SpringDataCouchbaseHelper.handleFieldMetadataExclusivity;
2223

2324
/**
2425
* @author Hector Basset

src/main/java/org/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseIdRule.java renamed to src/main/java/io/github/hectorbst/jsonschema2pojo/springframework/data/couchbase/rules/CouchbaseIdRule.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
package org.jsonschema2pojo.springframework.data.couchbase.rules;
1+
package io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.rules;
22

33
import com.fasterxml.jackson.databind.JsonNode;
44
import com.sun.codemodel.JAnnotationUse;
55
import com.sun.codemodel.JCodeModel;
66
import com.sun.codemodel.JFieldVar;
7+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.SpringDataCouchbaseRuleFactory;
8+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.GeneratedDef;
9+
import io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.definitions.IdDef;
710
import org.jsonschema2pojo.Schema;
811
import org.jsonschema2pojo.rules.Rule;
9-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.GeneratedDef;
10-
import org.jsonschema2pojo.springframework.data.couchbase.definitions.IdDef;
1112
import org.springframework.data.annotation.Id;
1213
import org.springframework.data.couchbase.core.mapping.id.GeneratedValue;
1314
import org.springframework.data.couchbase.core.mapping.id.GenerationStrategy;
1415

1516
import java.util.Optional;
1617

17-
import static org.jsonschema2pojo.springframework.data.couchbase.util.SpringDataCouchbaseHelper.handleFieldMetadataExclusivity;
18+
import static io.github.hectorbst.jsonschema2pojo.springframework.data.couchbase.util.SpringDataCouchbaseHelper.handleFieldMetadataExclusivity;
1819

1920
/**
2021
* @author Hector Basset

0 commit comments

Comments
 (0)