Revert "feat: Added isShouldClearContext configuration to invoke clear() for EM"

This reverts commit c5ac022.

Author: igdianov

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaQueryDataFetcher.java

@@ -53,14 +53,12 @@ class GraphQLJpaQueryDataFetcher extends QraphQLJpaBaseDataFetcher {
     private final static Logger logger = LoggerFactory.getLogger(GraphQLJpaQueryDataFetcher.class);
 
     private boolean defaultDistinct = true;
-    private boolean isShouldClearContext = true;
 
     protected static final String HIBERNATE_QUERY_PASS_DISTINCT_THROUGH = "hibernate.query.passDistinctThrough";
     protected static final String ORG_HIBERNATE_CACHEABLE = "org.hibernate.cacheable";
     protected static final String ORG_HIBERNATE_FETCH_SIZE = "org.hibernate.fetchSize";
     protected static final String ORG_HIBERNATE_READ_ONLY = "org.hibernate.readOnly";
     protected static final String JAVAX_PERSISTENCE_FETCHGRAPH = "javax.persistence.fetchgraph";
-    protected static final String HIBERNATE_CACHE_USE_QUERY_CACHE = "hibernate.cache.use_query_cache";
 
     private GraphQLJpaQueryDataFetcher(EntityManager entityManager, EntityType<?> entityType, boolean toManyDefaultOptional) {
         super(entityManager, entityType, toManyDefaultOptional);
@@ -69,11 +67,9 @@ private GraphQLJpaQueryDataFetcher(EntityManager entityManager, EntityType<?> en
     public GraphQLJpaQueryDataFetcher(EntityManager entityManager, 
                                       EntityType<?> entityType, 
                                       boolean defaultDistinct,
-                                      boolean toManyDefaultOptional,
-                                      boolean isShouldClearContext) {
+                                      boolean toManyDefaultOptional) {
         super(entityManager, entityType, toManyDefaultOptional);
         this.defaultDistinct = defaultDistinct;
-        this.isShouldClearContext = isShouldClearContext;
     }
 
     public boolean isDefaultDistinct() {
@@ -130,24 +126,20 @@ public Object get(DataFetchingEnvironment environment) {
             // Let' try reduce overhead and disable all caching
             query.setHint(ORG_HIBERNATE_READ_ONLY, true);
             query.setHint(ORG_HIBERNATE_FETCH_SIZE, 1000);
-            query.setHint(ORG_HIBERNATE_CACHEABLE, true);
+            query.setHint(ORG_HIBERNATE_CACHEABLE, false);
 
             // Let's not pass distinct if enabled to have better performance
             if(isDistinct) {
                 query.setHint(HIBERNATE_QUERY_PASS_DISTINCT_THROUGH, false);
             }
 
-            if(isShouldClearContext) {
-                entityManager.clear();
-            }
-            
             if (logger.isDebugEnabled()) {
                 logger.info("JPQL Query String: {}", getJPQLQueryString(query));
             }
 
             // Let's execute query 
             List<?> resultList = query.getResultList(); 
-
+                            
             // Let's remove any duplicate references for root entities 
             if(isDistinct) {
                 resultList = resultList.stream()
@@ -258,10 +250,6 @@ public Page(Integer page, Integer size) {
         }
     }
 
-    public boolean isShouldClearContext() {
-        return isShouldClearContext;
-    }
-    
     protected String getJPQLQueryString(TypedQuery<?> query) {
         try {
             Object queryImpl = query.unwrap(TypedQuery.class);
@@ -273,11 +261,10 @@ protected String getJPQLQueryString(TypedQuery<?> query) {
 
             return queryStringField.get(queryImpl)
                                    .toString();
-            
         } catch (Exception ignored) {
             logger.error("Error getting JPQL string", ignored);
         }
 
-        return null;
+        return null;            
     }
 }

graphql-jpa-query-schema/src/main/java/com/introproventures/graphql/jpa/query/schema/impl/GraphQLJpaSchemaBuilder.java

@@ -114,8 +114,7 @@ public class GraphQLJpaSchemaBuilder implements GraphQLSchemaBuilder {
     private boolean isUseDistinctParameter = false;
     private boolean isDefaultDistinct = true;
     // the many end is a collection, and it is always optional by default (empty collection)
-    private boolean toManyDefaultOptional = true;
-    private boolean isShouldClearContext = true;
+    private boolean toManyDefaultOptional = true; 
 
     public GraphQLJpaSchemaBuilder(EntityManager entityManager) {
         this.entityManager = entityManager;
@@ -207,8 +206,7 @@ private GraphQLFieldDefinition getQueryFieldSelectDefinition(EntityType<?> entit
                 .dataFetcher(new GraphQLJpaQueryDataFetcher(entityManager, 
                                                             entityType, 
                                                             isDefaultDistinct, 
-                                                            toManyDefaultOptional,
-                                                            isShouldClearContext))
+                                                            toManyDefaultOptional))
                 .argument(paginationArgument)
                 .argument(getWhereArgument(entityType));
         if (isUseDistinctParameter) {
@@ -1165,9 +1163,5 @@ public boolean isToManyDefaultOptional() {
     public void setToManyDefaultOptional(boolean toManyDefaultOptional) {
         this.toManyDefaultOptional = toManyDefaultOptional;
     }
-
-    public void setShouldClearContext(boolean isShouldClearContext) {
-        this.isShouldClearContext = isShouldClearContext;
-    }
 
 }