Modify #1e9a3e5 changing "brand" to manufacturer.

Author: billsegall

sbe-benchmarks/src/main/cpp/SbeCarCodecBench.h

@@ -24,8 +24,8 @@ using namespace uk::co::real_logic::sbe::benchmarks;
 char VEHICLE_CODE[] = {'a', 'b', 'c', 'd', 'e', 'f'};
 uint32_t SOMENUMBERS[] = { 1, 2, 3, 4, 5 };
 char MANUFACTURER_CODE[] = {'1', '2', '3'};
-const char *BRAND = "Honda";
-int BRANDLEN = strlen(BRAND);
+const char *MANUFACTURER = "Honda";
+int MANUFACTURERLEN = strlen(MANUFACTURER);
 const char *MODEL = "Civic VTi";
 int MODELLEN = strlen(MODEL);
 
@@ -73,7 +73,7 @@ class SbeCarCodecBench : public CodecBench<SbeCarCodecBench>
  .next().mph(60).seconds(7.1f)
  .next().mph(100).seconds(11.8f);
 
- car.putBrand(BRAND, BRANDLEN);
+ car.putManufacturer(MANUFACTURER, MANUFACTURERLEN);
  car.putModel(MODEL, MODELLEN);
 
  return car.encodedLength();
@@ -130,7 +130,7 @@ class SbeCarCodecBench : public CodecBench<SbeCarCodecBench>
  }
  }
 
- tmpChar = car.brand();
+ tmpChar = car.manufacturer();
  tmpChar = car.model();
 
  return car.encodedLength();

sbe-benchmarks/src/main/java/uk/co/real_logic/sbe/CarBenchmark.java

@@ -24,7 +24,7 @@
 
 public class CarBenchmark
 {
- private static final byte[] BRAND;
+ private static final byte[] MANUFACTURER;
  private static final byte[] MODEL;
  private static final byte[] ENG_MAN_CODE;
  private static final byte[] VEHICLE_CODE;
@@ -33,7 +33,7 @@ public class CarBenchmark
  {
  try
  {
- BRAND = "BRAND".getBytes(CarEncoder.brandCharacterEncoding());
+ MANUFACTURER = "MANUFACTURER".getBytes(CarEncoder.manufacturerCharacterEncoding());
  MODEL = "MODEL".getBytes(CarEncoder.modelCharacterEncoding());
  ENG_MAN_CODE = "abc".getBytes(EngineEncoder.manufacturerCodeCharacterEncoding());
  VEHICLE_CODE = "abcdef".getBytes(CarEncoder.vehicleCodeCharacterEncoding());
@@ -141,7 +141,7 @@ public static void encode(
  .next().mph(60).seconds(7.1f)
  .next().mph(100).seconds(11.8f);
 
- car.putBrand(BRAND, 0, BRAND.length);
+ car.putManufacturer(MANUFACTURER, 0, MANUFACTURER.length);
  car.putModel(MODEL, 0, MODEL.length);
  }
 
@@ -207,7 +207,7 @@ private static void decode(
  }
  }
 
- car.getBrand(tempBuffer, 0, tempBuffer.length);
+ car.getManufacturer(tempBuffer, 0, tempBuffer.length);
  car.getModel(tempBuffer, 0, tempBuffer.length);
  }
 

sbe-benchmarks/src/main/resources/car.xml

@@ -69,7 +69,7 @@
  <field name="seconds" id="16" type="float"/>
  </group>
  </group>
- <data name="brand" id="17" type="varDataEncoding"/>
+ <data name="manufacturer" id="17" type="varDataEncoding"/>
  <data name="model" id="18" type="varDataEncoding"/>
  </sbe:message>
 </sbe:messageSchema>

sbe-samples/src/main/cpp/GeneratedStubExample.cpp

@@ -32,7 +32,7 @@ using namespace baseline;
 
 char VEHICLE_CODE[] = {'a', 'b', 'c', 'd', 'e', 'f'};
 char MANUFACTURER_CODE[] = {'1', '2', '3'};
-const char *BRAND = "Honda";
+const char *MANUFACTURER = "Honda";
 const char *MODEL = "Civic VTi";
 const int messageHeaderVersion = 0;
 
@@ -117,7 +117,7 @@ std::size_t encodeCar(Car &car, char *buffer, std::uint64_t offset, std::uint64_
  .next().mph(60).seconds(7.1f)
  .next().mph(100).seconds(11.8f);
 
- car.putBrand(BRAND, 5)
+ car.putManufacturer(MANUFACTURER, 5)
  .putModel(MODEL, 9)
  .putActivationCode("deadbeef", 8);
 
@@ -198,8 +198,8 @@ std::size_t decodeCar(
  std::cout << "\ncar.performanceFigures.accelerationId=" << Car::PerformanceFigures::accelerationId();
  std::cout << "\ncar.performanceFigures.acceleration.mphId=" << Car::PerformanceFigures::Acceleration::mphId();
  std::cout << "\ncar.performanceFigures.acceleration.secondsId=" << Car::PerformanceFigures::Acceleration::secondsId();
- std::cout << "\ncar.brandId=" << Car::brandId();
- std::cout << "\ncar.brandCharacterEncoding=" << Car::brandCharacterEncoding();
+ std::cout << "\ncar.manufacturerId=" << Car::manufacturerId();
+ std::cout << "\ncar.manufacturerCharacterEncoding=" << Car::manufacturerCharacterEncoding();
  std::cout << "\ncar.modelId=" << Car::modelId();
  std::cout << "\ncar.modelCharacterEncoding=" << Car::modelCharacterEncoding();
  std::cout << "\ncar.activationCodeId=" << Car::activationCodeId();
@@ -282,9 +282,9 @@ std::size_t decodeCar(
  }
  }
 
- bytesCopied = car.getBrand(tmp, sizeof(tmp));
- std::cout << "\ncar.brandLength=" << bytesCopied;
- std::cout << "\ncar.brand=" << std::string(tmp, bytesCopied);
+ bytesCopied = car.getManufacturer(tmp, sizeof(tmp));
+ std::cout << "\ncar.manufacturerLength=" << bytesCopied;
+ std::cout << "\ncar.manufacturer=" << std::string(tmp, bytesCopied);
 
  bytesCopied = car.getModel(tmp, sizeof(tmp));
  std::cout << "\ncar.modelLength=" << bytesCopied;

sbe-samples/src/main/cpp/OtfExample.cpp

@@ -315,7 +315,7 @@ static char MANUFACTURER_CODE[] = { '1', '2', '3' };
 static const char *FUEL_FIGURES_1_USAGE_DESCRIPTION = "Urban Cycle";
 static const char *FUEL_FIGURES_2_USAGE_DESCRIPTION = "Combined Cycle";
 static const char *FUEL_FIGURES_3_USAGE_DESCRIPTION = "Highway Cycle";
-static const char *BRAND = "Honda";
+static const char *MANUFACTURER = "Honda";
 static const char *MODEL = "Civic VTi";
 static const char *ACTIVATION_CODE = "deadbeef";
 
@@ -417,7 +417,7 @@ std::uint64_t encodeHdrAndCar(char *buffer, std::uint64_t length)
  .next().mph(perf2bMph).seconds(perf2bSeconds)
  .next().mph(perf2cMph).seconds(perf2cSeconds);
 
- car.putBrand(BRAND, static_cast<int>(strlen(BRAND)))
+ car.putManufacturer(MANUFACTURER, static_cast<int>(strlen(MANUFACTURER)))
  .putModel(MODEL, static_cast<int>(strlen(MODEL)))
  .putActivationCode(ACTIVATION_CODE, static_cast<int>(strlen(ACTIVATION_CODE)));
 

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStub.java

@@ -30,7 +30,7 @@ public class ExampleUsingGeneratedStub
  private static final String ENCODING_FILENAME = "sbe.encoding.filename";
  private static final byte[] VEHICLE_CODE;
  private static final byte[] MANUFACTURER_CODE;
- private static final byte[] BRAND;
+ private static final byte[] MANUFACTURER;
  private static final byte[] MODEL;
  private static final UnsafeBuffer ACTIVATION_CODE;
 
@@ -45,7 +45,7 @@ public class ExampleUsingGeneratedStub
  {
  VEHICLE_CODE = "abcdef".getBytes(CarEncoder.vehicleCodeCharacterEncoding());
  MANUFACTURER_CODE = "123".getBytes(EngineEncoder.manufacturerCodeCharacterEncoding());
- BRAND = "Honda".getBytes(CarEncoder.brandCharacterEncoding());
+ MANUFACTURER = "Honda".getBytes(CarEncoder.manufacturerCharacterEncoding());
  MODEL = "Civic VTi".getBytes(CarEncoder.modelCharacterEncoding());
  ACTIVATION_CODE = new UnsafeBuffer("abcdef".getBytes(CarEncoder.activationCodeCharacterEncoding()));
  }
@@ -158,7 +158,7 @@ public static int encode(final CarEncoder car, final UnsafeBuffer directBuffer,
 
  // An exception will be raised if the string length is larger than can be encoded in the varDataEncoding length field
  // Please use a suitable schema type for varDataEncoding.length: uint8 <= 254, uint16 <= 65534
- car.brand(new String(BRAND, StandardCharsets.UTF_8))
+ car.manufacturer(new String(MANUFACTURER, StandardCharsets.UTF_8))
  .putModel(MODEL, srcOffset, MODEL.length)
  .putActivationCode(ACTIVATION_CODE, 0, ACTIVATION_CODE.capacity());
 
@@ -238,7 +238,7 @@ public static void decode(
  }
  }
 
- sb.append("\ncar.brand=").append(car.brand());
+ sb.append("\ncar.manufacturer=").append(car.manufacturer());
 
  sb.append("\ncar.model=").append(
  new String(buffer, 0, car.getModel(buffer, 0, buffer.length), CarEncoder.modelCharacterEncoding()));

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStubExtension.java

@@ -31,7 +31,7 @@ public class ExampleUsingGeneratedStubExtension
  private static final String ENCODING_FILENAME = "sbe.encoding.filename";
  private static final byte[] VEHICLE_CODE;
  private static final byte[] MANUFACTURER_CODE;
- private static final byte[] BRAND;
+ private static final byte[] MANUFACTURER;
  private static final byte[] MODEL;
  private static final UnsafeBuffer ACTIVATION_CODE;
 
@@ -46,7 +46,7 @@ public class ExampleUsingGeneratedStubExtension
  {
  VEHICLE_CODE = "abcdef".getBytes(baseline.CarEncoder.vehicleCodeCharacterEncoding());
  MANUFACTURER_CODE = "123".getBytes(baseline.EngineEncoder.manufacturerCodeCharacterEncoding());
- BRAND = "Honda".getBytes(baseline.CarEncoder.brandCharacterEncoding());
+ MANUFACTURER = "Honda".getBytes(baseline.CarEncoder.manufacturerCharacterEncoding());
  MODEL = "Civic VTi".getBytes(baseline.CarEncoder.modelCharacterEncoding());
  ACTIVATION_CODE = new UnsafeBuffer("abcdef".getBytes(baseline.CarEncoder.activationCodeCharacterEncoding()));
  }
@@ -157,7 +157,7 @@ public static int encode(final baseline.CarEncoder car, final UnsafeBuffer direc
  .next().mph(60).seconds(7.1f)
  .next().mph(100).seconds(11.8f);
 
- car.putBrand(BRAND, srcOffset, BRAND.length)
+ car.putManufacturer(MANUFACTURER, srcOffset, MANUFACTURER.length)
  .putModel(MODEL, srcOffset, MODEL.length)
  .putActivationCode(ACTIVATION_CODE, 0, ACTIVATION_CODE.capacity());
 
@@ -240,8 +240,9 @@ public static void decode(
  }
  }
 
- sb.append("\ncar.brand=").append(
- new String(buffer, 0, car.getBrand(buffer, 0, buffer.length), extension.CarEncoder.brandCharacterEncoding()));
+ sb.append("\ncar.manufacturer=").append(
+ new String(buffer, 0, car.getManufacturer(
+ buffer, 0, buffer.length), extension.CarEncoder.manufacturerCharacterEncoding()));
 
  sb.append("\ncar.model=").append(
  new String(buffer, 0, car.getModel(buffer, 0, buffer.length), extension.CarEncoder.modelCharacterEncoding()));

sbe-samples/src/main/resources/example-extension-schema.xml

@@ -83,7 +83,7 @@
  <field name="seconds" id="17" type="float"/>
  </group>
  </group>
- <data name="brand" id="18" type="varDataEncoding"/>
+ <data name="manufacturer" id="18" type="varDataEncoding"/>
  <data name="model" id="19" type="varDataEncoding"/>
  <data name="activationCode" id="20" type="varDataEncoding"/>
  </sbe:message>

sbe-samples/src/main/resources/example-schema.xml

@@ -81,7 +81,7 @@
  <field name="seconds" id="17" type="float"/>
  </group>
  </group>
- <data name="brand" id="18" type="varDataEncoding"/>
+ <data name="manufacturer" id="18" type="varDataEncoding"/>
  <data name="model" id="19" type="varDataEncoding"/>
  <data name="activationCode" id="20" type="varDataEncoding"/>
  </sbe:message>

sbe-tool/src/test/cpp/BoundsCheckTest.cpp

@@ -34,7 +34,7 @@ using namespace code::generation::test;
 
 static char VEHICLE_CODE[] = { 'a', 'b', 'c', 'd', 'e', 'f' };
 static char MANUFACTURER_CODE[] = { '1', '2', '3' };
-static const char *BRAND = "Honda";
+static const char *MANUFACTURER = "Honda";
 static const char *MODEL = "Civic VTi";
 static const char *ACTIVATION_CODE = "deadbeef";
 
@@ -136,9 +136,9 @@ class BoundsCheckTest : public testing::Test
  return m_car.encodedLength();
  }
 
- virtual std::uint64_t encodeCarBrandModelAndActivationCode()
+ virtual std::uint64_t encodeCarManufacturerModelAndActivationCode()
  {
- m_car.putBrand(BRAND, static_cast<int>(strlen(BRAND)));
+ m_car.putManufacturer(MANUFACTURER, static_cast<int>(strlen(MANUFACTURER)));
  m_car.putModel(MODEL, static_cast<int>(strlen(MODEL)));
  m_car.putActivationCode(ACTIVATION_CODE, static_cast<int>(strlen(ACTIVATION_CODE)));
 
@@ -259,11 +259,11 @@ class BoundsCheckTest : public testing::Test
  return m_carDecoder.encodedLength();
  }
 
- virtual std::uint64_t decodeCarBrandModelAndActivationCode()
+ virtual std::uint64_t decodeCarManufacturerModelAndActivationCode()
  {
  char tmp[256];
 
- EXPECT_EQ(m_carDecoder.getBrand(tmp, sizeof(tmp)), 5u);
+ EXPECT_EQ(m_carDecoder.getManufacturer(tmp, sizeof(tmp)), 5u);
  EXPECT_EQ(std::string(tmp, 5), "Honda");
 
  EXPECT_EQ(m_carDecoder.getModel(tmp, sizeof(tmp)), 9u);
@@ -332,7 +332,7 @@ TEST_P(MessageBoundsCheckTest, shouldExceptionWhenBufferTooShortForEncodeOfMessa
  encodeCarRoot(buffer.get(), 0, length);
  encodeCarFuelFigures();
  encodeCarPerformanceFigures();
- encodeCarBrandModelAndActivationCode();
+ encodeCarManufacturerModelAndActivationCode();
  }, std::runtime_error);
 }
 
@@ -345,15 +345,15 @@ TEST_P(MessageBoundsCheckTest, shouldExceptionWhenBufferTooShortForDecodeOfMessa
  encodeCarRoot(encodeBuffer, 0, sizeof(encodeBuffer));
  encodeCarFuelFigures();
  encodeCarPerformanceFigures();
- encodeCarBrandModelAndActivationCode();
+ encodeCarManufacturerModelAndActivationCode();
 
  EXPECT_THROW(
  {
  std::memcpy(buffer.get(), encodeBuffer, length);
  decodeCarRoot(buffer.get(), 0, length);
  decodeCarFuelFigures();
  decodeCarPerformanceFigures();
- decodeCarBrandModelAndActivationCode();
+ decodeCarManufacturerModelAndActivationCode();
  }, std::runtime_error);
 }