Skip to content

Commit

Permalink
部分优化 格式整理
Browse files Browse the repository at this point in the history
  • Loading branch information
HbnKing committed Dec 2, 2023
1 parent c5858cf commit 5d57dd4
Show file tree
Hide file tree
Showing 221 changed files with 207 additions and 420 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import com.whaleal.icefrog.log.Log;
import com.whaleal.icefrog.log.LogFactory;
import com.whaleal.mars.core.internal.NotMappableException;

import org.bson.types.Binary;
import org.bson.types.ObjectId;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,14 @@
import com.mongodb.client.gridfs.codecs.GridFSFileCodecProvider;
import com.mongodb.client.model.geojson.codecs.GeoJsonCodecProvider;
import com.whaleal.mars.codecs.internal.JsonObjectCodecProvider;

import com.whaleal.mars.codecs.pojo.*;
import com.whaleal.mars.codecs.pojo.EnumCodecProvider;
import com.whaleal.mars.codecs.pojo.MarsCodecProvider;
import com.whaleal.mars.codecs.pojo.PropertyModel;
import com.whaleal.mars.codecs.pojo.*;
import com.whaleal.mars.codecs.pojo.annotations.Concern;
import com.whaleal.mars.codecs.pojo.annotations.Discriminator;
import com.whaleal.mars.codecs.pojo.annotations.Entity;
import com.whaleal.mars.codecs.reader.DocumentReader;
import com.whaleal.mars.codecs.writer.DocumentWriter;
import com.whaleal.mars.core.aggregation.codecs.AggregationCodecProvider;

import com.whaleal.mars.core.internal.NotMappableException;
import org.bson.Document;
import org.bson.codecs.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
*/
package com.whaleal.mars.codecs.internal;

import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.BsonInvalidOperationException;
import org.bson.BsonReader;
import org.bson.BsonType;
import org.bson.BsonWriter;
import org.bson.codecs.Codec;
import org.bson.codecs.DecoderContext;
import org.bson.codecs.EncoderContext;
import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.codecs.configuration.CodecConfigurationException;
import org.bson.types.Decimal128;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.bson.codecs.Codec;
import org.bson.codecs.DecoderContext;
import org.bson.codecs.EncoderContext;

import org.bson.codecs.configuration.CodecConfigurationException;
import org.bson.types.Decimal128;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@
import org.bson.codecs.DecoderContext;
import org.bson.codecs.EncoderContext;

import static java.lang.String.format;
import static com.whaleal.icefrog.core.lang.Precondition.notNull;
import static java.lang.String.format;


public class CharacterCodec implements Codec<Character> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
*/
package com.whaleal.mars.codecs.internal;

import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.BsonInvalidOperationException;
import org.bson.BsonReader;
import org.bson.BsonType;
import org.bson.BsonWriter;
import org.bson.codecs.Codec;
import org.bson.codecs.DecoderContext;
import org.bson.codecs.EncoderContext;
import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.codecs.configuration.CodecConfigurationException;
import org.bson.types.Decimal128;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
*/
package com.whaleal.mars.codecs.internal;

import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.BsonInvalidOperationException;
import org.bson.BsonReader;
import org.bson.BsonType;
import org.bson.BsonWriter;
import org.bson.codecs.Codec;
import org.bson.codecs.DecoderContext;
import org.bson.codecs.EncoderContext;
import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.codecs.configuration.CodecConfigurationException;
import org.bson.types.Decimal128;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
*/
package com.whaleal.mars.codecs.internal;

import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.BsonInvalidOperationException;
import org.bson.BsonReader;
import org.bson.BsonType;
import org.bson.BsonWriter;
import org.bson.codecs.Codec;
import org.bson.codecs.DecoderContext;
import org.bson.codecs.EncoderContext;
import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.codecs.configuration.CodecConfigurationException;
import org.bson.types.Decimal128;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
*/
package com.whaleal.mars.codecs.internal;

import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.BsonInvalidOperationException;
import org.bson.BsonReader;
import org.bson.BsonType;
import org.bson.BsonWriter;
import org.bson.codecs.Codec;
import org.bson.codecs.DecoderContext;
import org.bson.codecs.EncoderContext;
import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.codecs.configuration.CodecConfigurationException;
import org.bson.types.Decimal128;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
*/
package com.whaleal.mars.codecs.internal;

import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.BsonInvalidOperationException;
import org.bson.BsonReader;
import org.bson.BsonType;
import org.bson.BsonWriter;
import org.bson.codecs.Codec;
import org.bson.codecs.DecoderContext;
import org.bson.codecs.EncoderContext;
import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.codecs.configuration.CodecConfigurationException;
import org.bson.types.Decimal128;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
*/
package com.whaleal.mars.codecs.internal;

import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.BsonInvalidOperationException;
import org.bson.BsonReader;
import org.bson.BsonType;
import org.bson.BsonWriter;
import org.bson.codecs.Codec;
import org.bson.codecs.DecoderContext;
import org.bson.codecs.EncoderContext;
import com.whaleal.mars.codecs.RepresentationConfigurable;
import org.bson.codecs.configuration.CodecConfigurationException;
import org.bson.types.Decimal128;
import org.bson.types.ObjectId;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@
package com.whaleal.mars.codecs.pojo;



import com.whaleal.icefrog.core.util.ClassUtil;
import static com.whaleal.icefrog.core.lang.Precondition.notNull;

import java.lang.annotation.Annotation;
import java.lang.reflect.*;
import java.util.*;

import static com.whaleal.icefrog.core.lang.Precondition.notNull;
import static java.lang.String.format;
import static java.lang.reflect.Modifier.isProtected;
import static java.lang.reflect.Modifier.isPublic;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.bson.BsonType;
import org.bson.BsonValue;
import org.bson.BsonWriter;

import org.bson.codecs.Codec;
import org.bson.codecs.CollectibleCodec;
import org.bson.codecs.DecoderContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
import java.lang.annotation.Annotation;
import java.util.List;

import static com.whaleal.icefrog.core.lang.Precondition.notNull;
import static java.lang.String.format;
import static java.util.Collections.emptyList;
import static java.util.Collections.unmodifiableList;
import static com.whaleal.icefrog.core.lang.Precondition.notNull;

public final class PropertyModelBuilder<T> {
private String name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,13 @@
package com.whaleal.mars.codecs.pojo;


import com.whaleal.icefrog.core.util.ClassUtil;
import com.whaleal.icefrog.core.util.ReflectUtil;
import org.bson.codecs.pojo.TypeWithTypeParameters;

import java.lang.reflect.*;
import java.util.*;

import static java.lang.String.format;
import static com.whaleal.icefrog.core.lang.Precondition.notNull;
import static java.lang.String.format;


public final class TypeData< T > implements TypeWithTypeParameters< T > {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@


import com.whaleal.icefrog.core.lang.Pair;

import java.util.HashMap;
import java.util.Map;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@
* Optional. Enable the automatic deletion of documents in a time series collection by specifying the number of seconds
* after which documents expire. MongoDB deletes expired documents automatically. See Set up Automatic Removal for
* Time Series Collections (TTL) for more information.
* https://www.mongodb.com/docs/manual/core/timeseries/timeseries-automatic-removal/
* 此参数生效需要指定enableExpire有效
* @return expireAfterSeconds
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
package com.whaleal.mars.codecs.reader;

import com.mongodb.DBRef;

import org.bson.BsonBinary;
import org.bson.BsonType;
import org.bson.Document;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
package com.whaleal.mars.codecs.writer;

import com.mongodb.lang.Nullable;
import org.bson.Document;

import static com.whaleal.mars.codecs.writer.PendingValue.SLUG;
import static java.lang.String.format;
Expand Down
1 change: 0 additions & 1 deletion mars-core/src/main/java/com/whaleal/mars/core/Mars.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.mongodb.*;
import com.mongodb.client.MongoClient;
import com.mongodb.client.MongoClients;
import com.mongodb.client.MongoCollection;
import com.whaleal.mars.codecs.MongoMappingContext;
import com.whaleal.mars.session.DatastoreImpl;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@

import com.whaleal.mars.core.aggregation.expressions.impls.Expression;
import com.whaleal.mars.core.aggregation.stages.*;

import com.whaleal.mars.core.query.filters.Filter;
import com.whaleal.mars.session.option.AggregationOptions;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import com.whaleal.mars.core.aggregation.expressions.Expressions;
import com.whaleal.mars.core.aggregation.expressions.impls.Expression;
import com.whaleal.mars.core.aggregation.stages.*;

import com.whaleal.mars.core.query.filters.Filter;
import com.whaleal.mars.session.option.AggregationOptions;
import org.bson.Document;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@


import com.whaleal.mars.codecs.MongoMappingContext;
import com.whaleal.mars.core.aggregation.codecs.stages.AddFieldsCodec;
import com.whaleal.mars.core.aggregation.codecs.stages.*;
import com.whaleal.mars.core.aggregation.expressions.impls.Expression;
import com.whaleal.mars.core.aggregation.stages.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.whaleal.mars.core.aggregation.codecs;

import com.mongodb.lang.Nullable;


import com.whaleal.mars.codecs.MongoMappingContext;
import com.whaleal.mars.codecs.writer.DocumentWriter;
import com.whaleal.mars.core.aggregation.expressions.impls.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
package com.whaleal.mars.core.aggregation.codecs.stages;





import com.whaleal.mars.codecs.MongoMappingContext;
import com.whaleal.mars.core.aggregation.codecs.ExpressionHelper;
import com.whaleal.mars.core.aggregation.expressions.impls.DocumentExpression;
import com.whaleal.mars.core.aggregation.stages.AutoBucket;
import org.bson.BsonWriter;
import org.bson.codecs.EncoderContext;


import static com.whaleal.mars.core.aggregation.codecs.ExpressionHelper.*;
import static com.whaleal.mars.core.aggregation.codecs.ExpressionHelper.document;
import static com.whaleal.mars.core.aggregation.codecs.ExpressionHelper.expression;


public class AutoBucketCodec extends StageCodec< AutoBucket > {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,15 @@
package com.whaleal.mars.core.aggregation.codecs.stages;




import com.whaleal.mars.codecs.MongoMappingContext;

import com.whaleal.mars.core.aggregation.expressions.impls.Expression;
import com.whaleal.mars.core.aggregation.stages.ReplaceWith;
import org.bson.BsonWriter;
import org.bson.codecs.EncoderContext;

import static com.whaleal.mars.core.aggregation.codecs.ExpressionHelper.document;
import static com.whaleal.mars.core.aggregation.codecs.ExpressionHelper.wrapExpression;


import org.bson.BsonWriter;
import org.bson.codecs.EncoderContext;



public class ReplaceWithCodec extends StageCodec< ReplaceWith > {
public ReplaceWithCodec(MongoMappingContext mapper) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package com.whaleal.mars.core.aggregation.codecs.stages;

import com.mongodb.lang.Nullable;


import com.whaleal.mars.codecs.MongoMappingContext;
import com.whaleal.mars.core.aggregation.expressions.TimeUnit;
import com.whaleal.mars.core.aggregation.expressions.impls.Expression;
import com.whaleal.mars.core.aggregation.stages.SetWindowFields;

import com.whaleal.mars.core.domain.ISort;
import com.whaleal.mars.core.domain.SortType;
import com.whaleal.mars.core.query.Sort;
import org.bson.BsonWriter;
import org.bson.codecs.Codec;
import org.bson.codecs.EncoderContext;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package com.whaleal.mars.core.aggregation.expressions;






import com.whaleal.mars.core.aggregation.expressions.impls.*;

import java.util.ArrayList;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
package com.whaleal.mars.core.aggregation.expressions;











import com.whaleal.icefrog.core.collection.ListUtil;
import com.whaleal.mars.core.aggregation.expressions.impls.*;
import java.util.List;

import static java.util.Arrays.asList;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.whaleal.mars.core.aggregation.expressions;




import com.whaleal.mars.core.aggregation.expressions.impls.*;
import com.whaleal.mars.core.aggregation.expressions.impls.Expression;
import com.whaleal.mars.core.aggregation.expressions.impls.ExpressionList;

import static com.whaleal.mars.core.aggregation.expressions.impls.ExpressionList.coalesce;

Expand Down
Loading

0 comments on commit 5d57dd4

Please sign in to comment.