Fixes #159 : Adds dict support for DefaultFilter #344

gabru-md · 2019-06-25T06:17:43Z

Fixes #159

Adds a method for processing the dictionary type in DefaultFilter.

Problem : Arguments were being converted to String [] before being processed by the DefaultFilter

Solution : Created a new method for processing the Object [], incase any arg is of type PyWrapper. Implemented the function and created tests for the same.

😄

gabru-md · 2019-06-25T06:25:53Z

boulter

Thanks @gabru-md!

I have a bunch of style comments and some implementation related comments. Let me know if you have any questions. Thanks again!

boulter · 2019-06-25T21:59:34Z

src/main/java/com/hubspot/jinjava/lib/filter/AbsFilter.java

@@ -15,16 +15,16 @@
 **********************************************************************/
 package com.hubspot.jinjava.lib.filter;

-import java.math.BigDecimal;


could you update your import order settings? java imports first is our preference

boulter · 2019-06-25T22:00:18Z

src/main/java/com/hubspot/jinjava/lib/filter/AddFilter.java

 import com.hubspot.jinjava.interpret.InvalidReason;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.TemplateSyntaxException;
+import com.hubspot.jinjava.interpret.InvalidInputException;


this was moved out of alphabetical order

boulter · 2019-06-25T22:02:05Z

src/test/java/com/hubspot/jinjava/lib/filter/DefaultFilterTest.java

+ * Created by manishdevgan on 25/06/19.
+ */
+public class DefaultFilterTest {
+    Jinjava jinjava;


our indentation standard is 2 spaces. Could you adjust?

boulter · 2019-06-25T22:02:56Z

src/test/java/com/hubspot/jinjava/lib/filter/DefaultFilterTest.java

+
+    @Test
+    public void itSetsDefaultStringValues() {
+        assertThat(jinjava.render("{% set d=d | default(\"some random value\") %}{{ d }}", new HashMap<>())).isEqualTo("some random value");


Could you either leave these as long lines or hard-wrap them on a logical boundary, like , (preferred)?

boulter · 2019-06-25T22:10:10Z

src/main/java/com/hubspot/jinjava/lib/filter/Filter.java

@@ -55,6 +68,9 @@ default Object filter(Object var, JinjavaInterpreter interpreter, Object[] args,
    List<String> stringArgs = new ArrayList<>();

    for (Object arg : allArgs) {
+      if(arg instanceof PyWrapper) {


space after if please

src/main/java/com/hubspot/jinjava/lib/filter/DefaultFilter.java

gabru-md · 2019-06-26T05:51:41Z

@boulter I've made changes to the files.
please review again 😄

gabru-md · 2019-06-28T12:26:01Z

cc : @boulter

boulter

Looks like some of the issue have been addressed, but there's still a lot of import ordering changes and diffs that are unnecessary. Could you address those? That should dramatically decrease the number of changes here and it make it easier to review.

boulter · 2019-06-28T14:13:12Z

src/main/java/com/hubspot/jinjava/lib/filter/AbsFilter.java

@@ -25,6 +25,8 @@
 import com.hubspot.jinjava.interpret.InvalidReason;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;

+


can you remove extra space here?

boulter · 2019-06-28T14:13:44Z

src/main/java/com/hubspot/jinjava/lib/filter/AdvancedFilter.java

@@ -15,11 +15,12 @@
 **********************************************************************/
 package com.hubspot.jinjava.lib.filter;

+import java.util.HashMap;


still some lingering import reordering...

boulter · 2019-06-28T14:14:15Z

src/main/java/com/hubspot/jinjava/lib/filter/AttrFilter.java


    if (args.length < 1) {
      throw new TemplateSyntaxException(interpreter, getName(), "requires 1 argument (attribute name to use)");
    }

-    return interpreter.resolveProperty(var, args[0]);
+    return interpreter.resolveProperty(var, args[0].toString());


Objects.toString is safer

boulter · 2019-06-28T14:14:54Z

src/main/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilter.java

@@ -27,10 +32,17 @@ public String getName() {

  @Override
  public Object filter(Object var, JinjavaInterpreter interpreter,
-      String... args) {
-
+      Object... args) {


can you join this with the previous line?

boulter · 2019-06-28T14:15:13Z

src/main/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilter.java

-
+      Object... args) {
+    List<String> stringArgs = new ArrayList<>();
+    for(Object arg: args) {


space after for and before : please

boulter · 2019-06-28T14:16:12Z

src/main/java/com/hubspot/jinjava/lib/filter/DateTimeFormatFilter.java

+      Object... args) {
+    List<String> stringArgs = new ArrayList<>();
+    for(Object arg: args) {
+      stringArgs.add(arg == null ? null : Objects.toString(arg));


Objects.toString(arg) will handle nulls for you.

boulter · 2019-06-28T14:17:16Z

src/main/java/com/hubspot/jinjava/lib/filter/UnixTimestampFilter.java

-  public String getName() {
-    return "unixtimestamp";
-  }
+    @Override


please restore original indentation

boulter · 2019-06-28T14:17:50Z

src/main/java/com/hubspot/jinjava/lib/filter/SafeFilter.java

@@ -26,7 +26,7 @@ public String getName() {

  @Override
  public Object filter(Object var, JinjavaInterpreter interpreter,
-      String... args) {
+                       Object... args) {


can join with previous line

gabru-md · 2019-06-30T17:36:21Z

sure! will do the necessary changes

gabru-md · 2019-07-01T10:04:55Z

@boulter I've added changes. please review again 🙏

boulter

I noticed a bunch of small changes, but there are many more instances that I didn't get to. Can you clean these up first and then I'll take a look when the diffs are smaller? Thanks.

boulter · 2019-07-01T13:55:31Z

src/main/java/com/hubspot/jinjava/lib/filter/DivideFilter.java

    if (arg.length < 1) {
      throw new TemplateSyntaxException(interpreter, getName(), "requires 1 number (divisor) argument");
    }
-    String toMul = arg[0];
+    String toMul = (arg[0] == null) ? null : Objects.toString(arg[0]);


Objects.toString will take care of nulls for you.

boulter · 2019-07-01T13:55:50Z

src/main/java/com/hubspot/jinjava/lib/filter/AddFilter.java

@@ -26,6 +27,8 @@
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.TemplateSyntaxException;

+


remove extra newlines please

boulter · 2019-07-01T13:56:11Z

src/main/java/com/hubspot/jinjava/lib/filter/BatchFilter.java


 import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
 import com.hubspot.jinjava.doc.annotations.JinjavaParam;
 import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.util.ForLoop;
 import com.hubspot.jinjava.util.ObjectIterator;
+import org.apache.commons.lang3.math.NumberUtils;


fix reordered import

boulter · 2019-07-01T13:56:20Z

src/main/java/com/hubspot/jinjava/lib/filter/BetweenTimesFilter.java

@@ -16,6 +17,7 @@
 import com.hubspot.jinjava.lib.fn.Functions;
 import com.hubspot.jinjava.objects.date.PyishDate;

+


extra space

boulter · 2019-07-01T13:56:27Z

src/main/java/com/hubspot/jinjava/lib/filter/BoolFilter.java

@@ -49,5 +49,6 @@ public Object filter(Object var, JinjavaInterpreter interpreter,
        return str.equals("1") ? Boolean.TRUE : BooleanUtils.toBoolean(str);
    }

+


extra space

boulter · 2019-07-01T13:56:40Z

src/main/java/com/hubspot/jinjava/lib/filter/CutFilter.java

 import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
 import com.hubspot.jinjava.doc.annotations.JinjavaParam;
 import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
 import com.hubspot.jinjava.interpret.TemplateSyntaxException;
+import org.apache.commons.lang3.StringUtils;


import order

boulter · 2019-07-01T13:57:23Z

src/main/java/com/hubspot/jinjava/lib/filter/DictSortFilter.java


 import com.google.common.collect.Lists;
 import com.hubspot.jinjava.doc.annotations.JinjavaDoc;
 import com.hubspot.jinjava.doc.annotations.JinjavaParam;
 import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;
+import org.apache.commons.lang3.BooleanUtils;


import order

boulter · 2019-07-01T13:57:42Z

src/main/java/com/hubspot/jinjava/lib/filter/DifferenceFilter.java

@@ -9,6 +9,7 @@
 import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
 import com.hubspot.jinjava.interpret.JinjavaInterpreter;

+


extra space

boulter · 2019-07-01T13:58:05Z

src/main/java/com/hubspot/jinjava/lib/filter/DifferenceFilter.java

@@ -21,7 +22,12 @@
    })
 public class DifferenceFilter extends AbstractSetFilter {

-  @Override
+    @Override


indentation is off here.

gabru-md · 2019-07-14T10:22:54Z

@boulter I'll add changes to this PR in the weekend.
I'm a bit busy with some stuff. Writing it down so that this PR doesn't get closed for inactivity.
cheers!

raomuyang · 2019-07-23T05:15:50Z

@boulter I've created a checkstyle configuration to cover some scenarios as much as possible: #353

gabru-md · 2020-01-15T21:10:01Z

opening a different PR for the same.

gabru-md added 2 commits June 25, 2019 11:42

Adds dict support for DefaultFilter

65dfa79

adds docstring

a5f6228

might fix tests

c74e60e

boulter requested changes Jun 25, 2019

View reviewed changes

adds changes

471e869

boulter requested changes Jun 28, 2019

View reviewed changes

fix

8906d2f

boulter requested changes Jul 1, 2019

View reviewed changes

raomuyang mentioned this pull request Jul 22, 2019

Add codeStyleChecker for jinjava #353

Merged

gabru-md closed this Jan 15, 2020

gabru-md mentioned this pull request Jan 15, 2020

Fixes #159: Adds dict support for DefaultFilter #386

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #159 : Adds dict support for DefaultFilter #344

Fixes #159 : Adds dict support for DefaultFilter #344

gabru-md commented Jun 25, 2019

gabru-md commented Jun 25, 2019

boulter left a comment

boulter Jun 25, 2019

boulter Jun 25, 2019

boulter Jun 25, 2019

boulter Jun 25, 2019

boulter Jun 25, 2019

gabru-md commented Jun 26, 2019

gabru-md commented Jun 28, 2019

boulter left a comment

boulter Jun 28, 2019

boulter Jun 28, 2019

boulter Jun 28, 2019

boulter Jun 28, 2019

boulter Jun 28, 2019

boulter Jun 28, 2019

boulter Jun 28, 2019

boulter Jun 28, 2019

gabru-md commented Jun 30, 2019

gabru-md commented Jul 1, 2019

boulter left a comment

boulter Jul 1, 2019

boulter Jul 1, 2019

boulter Jul 1, 2019

boulter Jul 1, 2019

boulter Jul 1, 2019

boulter Jul 1, 2019

boulter Jul 1, 2019

boulter Jul 1, 2019

boulter Jul 1, 2019

gabru-md commented Jul 14, 2019

raomuyang commented Jul 23, 2019

gabru-md commented Jan 15, 2020

		@@ -25,6 +25,8 @@
		import com.hubspot.jinjava.interpret.InvalidReason;
		import com.hubspot.jinjava.interpret.JinjavaInterpreter;

		@@ -26,6 +27,8 @@
		import com.hubspot.jinjava.interpret.JinjavaInterpreter;
		import com.hubspot.jinjava.interpret.TemplateSyntaxException;

		@@ -16,6 +17,7 @@
		import com.hubspot.jinjava.lib.fn.Functions;
		import com.hubspot.jinjava.objects.date.PyishDate;

		@@ -49,5 +49,6 @@ public Object filter(Object var, JinjavaInterpreter interpreter,
		return str.equals("1") ? Boolean.TRUE : BooleanUtils.toBoolean(str);
		}

		@@ -9,6 +9,7 @@
		import com.hubspot.jinjava.doc.annotations.JinjavaSnippet;
		import com.hubspot.jinjava.interpret.JinjavaInterpreter;

Fixes #159 : Adds dict support for DefaultFilter #344

Fixes #159 : Adds dict support for DefaultFilter #344

Conversation

gabru-md commented Jun 25, 2019

gabru-md commented Jun 25, 2019

boulter left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabru-md commented Jun 26, 2019

gabru-md commented Jun 28, 2019

boulter left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabru-md commented Jun 30, 2019

gabru-md commented Jul 1, 2019

boulter left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gabru-md commented Jul 14, 2019

raomuyang commented Jul 23, 2019

gabru-md commented Jan 15, 2020