Projects >> sensei >>b58129f3dc31206dd1d326061de51975e754fb17

Chunk
Conflicting content
      protoParams.addLongParam(paramBuilder.build());
    }

<<<<<<< HEAD
=======
    for (String paramName : facetHandlerInitializerParam.getBooleanParamNames()) {
      SenseiProtos.StringParams.Builder paramBuilder = SenseiProtos.StringParams.newBuilder();
      paramBuilder.setKey(paramName);
      List param = facetHandlerInitializerParam.getStringParam(paramName);
      if (param != null) {
        for (int i = 0; i < param.size(); i++) {
          paramBuilder.addValue(param.get(i));
        }
      } else {
        paramBuilder.setIsNull(true);
      }

      protoParams.addStringParam(paramBuilder.build());
    }

>>>>>>> 996113d565840365eae7107e79e376fdcd49f481
    for (String paramName : facetHandlerInitializerParam.getDoubleParamNames()) {
      SenseiProtos.DoubleParams.Builder paramBuilder = SenseiProtos.DoubleParams.newBuilder();
      paramBuilder.setKey(paramName);
Solution content
      protoParams.addLongParam(paramBuilder.build());
    }

    for (String paramName : facetHandlerInitializerParam.getDoubleParamNames()) {
      SenseiProtos.DoubleParams.Builder paramBuilder = SenseiProtos.DoubleParams.newBuilder();
      paramBuilder.setKey(paramName);
File
SenseiRequestProtoSerializer.java
Developer's decision
Version 1
Kind of conflict
For statement